sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-31 00:01:57 -04:00
Code Issues Projects Releases Wiki Activity

Add positive defense against dropped columns, per suggestion from

Browse Source 
Christopher Kings-Lynne.  Also fix a couple more schema-awareness issues.
This commit is contained in:
Tom Lane 2003-09-24 05:38:38 +00:00
parent a9e9abebd9
commit 03858c078b
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
contrib/vacuumlo/vacuumlo.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.24 2003/08/08 21:41:25 momjian Exp $ * $Header: /cvsroot/pgsql/contrib/vacuumlo/vacuumlo.c,v 1.25 2003/09/24 05:38:38 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -98,10 +98,13 @@ vacuumlo(char *database, struct _param * param)
fprintf(stdout, "Test run: no large objects will be removed!\n"); fprintf(stdout, "Test run: no large objects will be removed!\n");
} }
res = PQexec(conn, "SET search_path = public"); /*
* Don't get fooled by any non-system catalogs
*/
res = PQexec(conn, "SET search_path = pg_catalog");
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
fprintf(stderr, "Failed to set search_path on:\n"); fprintf(stderr, "Failed to set search_path:\n");
fprintf(stderr, "%s", PQerrorMessage(conn)); fprintf(stderr, "%s", PQerrorMessage(conn));
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
@ -113,9 +116,8 @@ vacuumlo(char *database, struct _param * param)
* First we create and populate the LO temp table * First we create and populate the LO temp table
*/ */
buf[0] = '\0'; buf[0] = '\0';
strcat(buf, "SELECT DISTINCT loid AS lo "); strcat(buf, "CREATE TEMP TABLE vacuum_l AS ");
strcat(buf, "INTO TEMP TABLE vacuum_l "); strcat(buf, "SELECT DISTINCT loid AS lo FROM pg_largeobject ");
strcat(buf, "FROM pg_largeobject ");
res = PQexec(conn, buf); res = PQexec(conn, buf);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
@ -132,7 +134,7 @@ vacuumlo(char *database, struct _param * param)
* for the DELETEs below. * for the DELETEs below.
*/ */
buf[0] = '\0'; buf[0] = '\0';
strcat(buf, "VACUUM ANALYZE vacuum_l "); strcat(buf, "VACUUM ANALYZE vacuum_l");
res = PQexec(conn, buf); res = PQexec(conn, buf);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
@ -145,7 +147,7 @@ vacuumlo(char *database, struct _param * param)
PQclear(res); PQclear(res);
/* /*
* Now find any candidate tables who have columns of type oid. * Now find any candidate tables that have columns of type oid.
* *
* NOTE: we ignore system tables and temp tables by the expedient of * NOTE: we ignore system tables and temp tables by the expedient of
* rejecting tables in schemas named 'pg_*'. In particular, the temp * rejecting tables in schemas named 'pg_*'. In particular, the temp
@ -157,9 +159,9 @@ vacuumlo(char *database, struct _param * param)
* shouldn't matter for correctness, but it saves time. * shouldn't matter for correctness, but it saves time.
*/ */
buf[0] = '\0'; buf[0] = '\0';
strcat(buf, "SELECT c.relname, a.attname "); strcat(buf, "SELECT s.nspname, c.relname, a.attname ");
strcat(buf, "FROM pg_class c, pg_attribute a, pg_namespace s, pg_type t "); strcat(buf, "FROM pg_class c, pg_attribute a, pg_namespace s, pg_type t ");
strcat(buf, "WHERE a.attnum > 0 "); strcat(buf, "WHERE a.attnum > 0 AND NOT a.attisdropped ");
strcat(buf, " AND a.attrelid = c.oid "); strcat(buf, " AND a.attrelid = c.oid ");
strcat(buf, " AND a.atttypid = t.oid "); strcat(buf, " AND a.atttypid = t.oid ");
strcat(buf, " AND c.relnamespace = s.oid "); strcat(buf, " AND c.relnamespace = s.oid ");
@ -178,14 +180,16 @@ vacuumlo(char *database, struct _param * param)
for (i = 0; i < PQntuples(res); i++) for (i = 0; i < PQntuples(res); i++)
{ {
char *table, char *schema,
*table,
*field; *field;
table = PQgetvalue(res, i, 0); schema = PQgetvalue(res, i, 0);
field = PQgetvalue(res, i, 1); table = PQgetvalue(res, i, 1);
field = PQgetvalue(res, i, 2);
if (param->verbose) if (param->verbose)
fprintf(stdout, "Checking %s in %s\n", field, table); fprintf(stdout, "Checking %s in %s.%s\n", field, schema, table);
/* /*
* The "IN" construct used here was horribly inefficient before * The "IN" construct used here was horribly inefficient before
@ -194,13 +198,13 @@ vacuumlo(char *database, struct _param * param)
*/ */
snprintf(buf, BUFSIZE, snprintf(buf, BUFSIZE,
"DELETE FROM vacuum_l " "DELETE FROM vacuum_l "
"WHERE lo IN (SELECT \"%s\" FROM \"%s\")", "WHERE lo IN (SELECT \"%s\" FROM \"%s\".\"%s\")",
field, table); field, schema, table);
res2 = PQexec(conn, buf); res2 = PQexec(conn, buf);
if (PQresultStatus(res2) != PGRES_COMMAND_OK) if (PQresultStatus(res2) != PGRES_COMMAND_OK)
{ {
fprintf(stderr, "Failed to check %s in table %s:\n", fprintf(stderr, "Failed to check %s in table %s.%s:\n",
field, table); field, schema, table);
fprintf(stderr, "%s", PQerrorMessage(conn)); fprintf(stderr, "%s", PQerrorMessage(conn));
PQclear(res2); PQclear(res2);
PQclear(res); PQclear(res);