vacuumdb: Schema-qualify operator in catalog query's WHERE clause.
authorNathan Bossart <[email protected]>
Mon, 7 Oct 2024 21:49:20 +0000 (16:49 -0500)
committerNathan Bossart <[email protected]>
Mon, 7 Oct 2024 21:49:20 +0000 (16:49 -0500)
Commit 1ab67c9dfa, which modified this catalog query so that it
doesn't return temporary relations, forgot to schema-qualify the
operator.  A comment earlier in the function implores us to fully
qualify everything in the query:

 * Since we execute the constructed query with the default search_path
 * (which could be unsafe), everything in this query MUST be fully
 * qualified.

This commit fixes that.  While at it, add a newline for consistency
with surrounding code.

Reviewed-by: Noah Misch
Discussion: https://postgr.es/m/ZwQJYcuPPUsF0reU%40nathan
Backpatch-through: 12

src/bin/scripts/vacuumdb.c

index 249622068a088ed85ddc71530b51c1b6739c8102..d07ab7d67e9c4fe19e3f9fdb02229f41f5c54276 100644 (file)
@@ -684,7 +684,8 @@ vacuum_one_database(ConnParams *cparams,
     * Exclude temporary tables, beginning the WHERE clause.
     */
    appendPQExpBufferStr(&catalog_query,
-                        " WHERE c.relpersistence != " CppAsString2(RELPERSISTENCE_TEMP));
+                        " WHERE c.relpersistence OPERATOR(pg_catalog.!=) "
+                        CppAsString2(RELPERSISTENCE_TEMP) "\n");
 
    /*
     * Used to match the tables or schemas listed by the user, for the WHERE