farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for COLLATE to index keys

Browse Source
This commit is contained in:
Daniele Varrazzo
2012-12-09 12:02:49 +00:00
parent 4bcb7641c9
commit 13cf8679db
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/repack.c
View File

@ -473,14 +473,13 @@ parse_indexdef(IndexDef *stmt, Oid index, Oid table)
}
/*
* Parse the trailing ... [ DESC ] [ NULLS { FIRST | LAST } ] from an index
* Parse the trailing ... [ COLLATE X ] [ DESC ] [ NULLS { FIRST | LAST } ] from an index
* definition column.
* Returned values point to token. \0's are inserted to separate parsed parts.
*/
static void
parse_desc_nulls(char *token, char **desc, char **nulls)
parse_indexdef_col(char *token, char **desc, char **nulls, char **collate)
{
#if PG_VERSION_NUM >= 80300
char *pos;
/* easier to walk backwards than to parse quotes and escapes... */
@ -499,7 +498,11 @@ parse_desc_nulls(char *token, char **desc, char **nulls)
*desc = pos + 1;
*pos = '\0';
}
#endif
if (NULL != (pos = strstr(token, " COLLATE ")))
{
*collate = pos + 1;
*pos = '\0';
}
}
/**
@ -543,14 +546,17 @@ repack_get_order_by(PG_FUNCTION_ARGS)
char *opcname;
char *coldesc = NULL;
char *colnulls = NULL;
char *colcollate = NULL;
token = next;
while (isspace((unsigned char) *token))
token++;
next = skip_until(index, next, ',');
parse_desc_nulls(token, &coldesc, &colnulls);
parse_indexdef_col(token, &coldesc, &colnulls, &colcollate);
opcname = skip_until(index, token, ' ');
appendStringInfoString(&str, token);
if (colcollate)
appendStringInfo(&str, " %s", colcollate);
if (coldesc)
appendStringInfo(&str, " %s", coldesc);
if (opcname)