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

Fix bogus use of table name parameters.

Browse Source 
Mimic the original code, which used execute_elevel() with params to
pass in table names which are assumed to be quoted already by the user.
This commit is contained in:
Josh Kupershmidt 2012-11-14 15:27:54 -05:00 committed by Daniele Varrazzo
parent 00ddb1edf9
commit 34605aef27
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bin/pg_repack.c
View File

@ -116,6 +116,7 @@ static Oid getoid(PGresult *res, int row, int col);
static bool lock_exclusive(PGconn *conn, const char *relid, const char *lock_query, bool start_xact); static bool lock_exclusive(PGconn *conn, const char *relid, const char *lock_query, bool start_xact);
static bool kill_ddl(PGconn *conn, Oid relid, bool terminate); static bool kill_ddl(PGconn *conn, Oid relid, bool terminate);
static bool lock_access_share(PGconn *conn, Oid relid, const char *target_name); static bool lock_access_share(PGconn *conn, Oid relid, const char *target_name);
static size_t simple_string_list_size(SimpleStringList string_list);
#define SQLSTATE_INVALID_SCHEMA_NAME "3F000" #define SQLSTATE_INVALID_SCHEMA_NAME "3F000"
#define SQLSTATE_QUERY_CANCELED "57014" #define SQLSTATE_QUERY_CANCELED "57014"
@ -247,6 +248,22 @@ getoid(PGresult *res, int row, int col)
return (Oid)strtoul(PQgetvalue(res, row, col), NULL, 10); return (Oid)strtoul(PQgetvalue(res, row, col), NULL, 10);
} }
/* Returns the number of elements in the given SimpleStringList */
static size_t
simple_string_list_size(SimpleStringList string_list)
{
size_t i = 0;
SimpleStringListCell *cell = table_list.head;
while (cell)
{
cell = cell->next;
i++;
}
return i;
}
/* /*
* Call repack_one_table for the target table or each table in a database. * Call repack_one_table for the target table or each table in a database.
*/ */
@ -259,6 +276,11 @@ repack_one_database(const char *orderby)
int num; int num;
StringInfoData sql; StringInfoData sql;
SimpleStringListCell *cell; SimpleStringListCell *cell;
const char **params = NULL;
size_t num_params = simple_string_list_size(table_list);
if (num_params)
params = pgut_malloc(num_params * sizeof(char *));
initStringInfo(&sql); initStringInfo(&sql);
@ -275,18 +297,19 @@ repack_one_database(const char *orderby)
/* acquire target tables */ /* acquire target tables */
appendStringInfoString(&sql, "SELECT * FROM repack.tables WHERE "); appendStringInfoString(&sql, "SELECT * FROM repack.tables WHERE ");
if (table_list.head) if (num_params)
{ {
appendStringInfoString(&sql, "( "); appendStringInfoString(&sql, "(");
for (cell = table_list.head; cell; cell = cell->next) for (i = 0, cell = table_list.head; cell; cell = cell->next, i++)
{ {
/* FIXME: bogus table quoting */ /* Construct table name placeholders to be used by PQexecParams */
appendStringInfo(&sql, "relid = '%s'::regclass", cell->val); appendStringInfo(&sql, "relid = $%d::regclass", i + 1);
params[i] = cell->val;
if (cell->next) if (cell->next)
appendStringInfoString(&sql, " OR "); appendStringInfoString(&sql, " OR ");
} }
appendStringInfoString(&sql, " )"); appendStringInfoString(&sql, ")");
res = execute_elevel(sql.data, 0, NULL, DEBUG2); res = execute_elevel(sql.data, (int) num_params, params, DEBUG2);
} }
else else
{ {