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

Fixed index definition tokenization

Browse Source 
In the previous commit skip_const was going ahead the space thus removing the
starting quote. Also fixed (and tested) trailing part after the tablespace
name, e.g. the WHERE clause.
This commit is contained in:
Daniele Varrazzo
2013-04-16 23:23:26 +01:00
parent 83fdb2a9e0
commit d98a14bb55
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/repack.c
View File

@ -653,8 +653,7 @@ repack_indexdef(PG_FUNCTION_ARGS)
}
else
{
const char *pos;
if (NULL == (pos = strstr(stmt.options, " TABLESPACE ")))
if (NULL == strstr(stmt.options, "TABLESPACE"))
{
/* tablespace is to append */
appendStringInfoString(&str, " TABLESPACE ");
@ -662,16 +661,14 @@ repack_indexdef(PG_FUNCTION_ARGS)
}
else
{
char *tmp;
/* tablespace is to replace */
tmp = skip_const(index, stmt.options, " TABLESPACE ", NULL);
char *tmp;
tmp = skip_const(index, stmt.options, " TABLESPACE", NULL);
appendStringInfoString(&str, stmt.options);
appendStringInfoString(&str, NameStr(*tablespace));
/* FIXME: not working if original ts has a space. But skip_ident
* should deal with that. Stupid mistake somewhere? */
appendStringInfo(&str, " %s", NameStr(*tablespace));
tmp = skip_ident(index, tmp);
appendStringInfoString(&str, tmp);
if (*tmp)
appendStringInfo(&str, " %s", tmp);
}
}