public inbox for [email protected]
help / color / mirror / Atom feedFrom: Álvaro Herrera <[email protected]>
Subject: [PATCH 2/3] replace CppAsString2(RELKIND_x) with RELKIND_x_STR
Date: Mon, 2 Feb 2026 00:45:58 +0100
---
contrib/oid2name/oid2name.c | 18 +++---
contrib/postgres_fdw/postgres_fdw.c | 10 +--
contrib/vacuumlo/vacuumlo.c | 2 +-
src/backend/commands/subscriptioncmds.c | 4 +-
src/backend/utils/adt/xml.c | 12 ++--
src/bin/initdb/initdb.c | 20 +++---
src/bin/pg_amcheck/pg_amcheck.c | 32 ++++-----
src/bin/pg_dump/pg_dump.c | 36 +++++------
src/bin/pg_upgrade/check.c | 6 +-
src/bin/pg_upgrade/info.c | 6 +-
src/bin/pg_upgrade/pg_upgrade.c | 12 ++--
src/bin/psql/describe.c | 74 ++++++++++-----------
src/bin/psql/tab-complete.in.c | 86 ++++++++++++-------------
src/bin/scripts/reindexdb.c | 8 +--
src/bin/scripts/vacuuming.c | 14 ++--
15 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 51802907138..463bdfae320 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -477,8 +477,8 @@ sql_exec_dumpalltables(PGconn *conn, struct options *opts)
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace "
" LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),"
" pg_catalog.pg_tablespace t "
- "WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_MATVIEW) "%s%s) AND "
+ "WHERE relkind IN (" RELKIND_RELATION_STR ","
+ RELKIND_MATVIEW_STR "%s%s) AND "
" %s"
" t.oid = CASE"
" WHEN reltablespace <> 0 THEN reltablespace"
@@ -486,8 +486,8 @@ sql_exec_dumpalltables(PGconn *conn, struct options *opts)
" END "
"ORDER BY relname",
opts->extended ? addfields : "",
- opts->indexes ? "," CppAsString2(RELKIND_INDEX) "," CppAsString2(RELKIND_SEQUENCE) : "",
- opts->systables ? "," CppAsString2(RELKIND_TOASTVALUE) : "",
+ opts->indexes ? "," RELKIND_INDEX_STR "," RELKIND_SEQUENCE_STR : "",
+ opts->systables ? "," RELKIND_TOASTVALUE_STR : "",
opts->systables ? "" : "n.nspname NOT IN ('pg_catalog', 'information_schema') AND n.nspname !~ '^pg_toast' AND");
sql_exec(conn, todo, opts->quiet);
@@ -548,11 +548,11 @@ sql_exec_searchtables(PGconn *conn, struct options *opts)
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
" LEFT JOIN pg_catalog.pg_database d ON d.datname = pg_catalog.current_database(),\n"
" pg_catalog.pg_tablespace t\n"
- "WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_INDEX) ","
- CppAsString2(RELKIND_SEQUENCE) ","
- CppAsString2(RELKIND_TOASTVALUE) ") AND\n"
+ "WHERE relkind IN (" RELKIND_RELATION_STR ","
+ RELKIND_MATVIEW_STR ","
+ RELKIND_INDEX_STR ","
+ RELKIND_SEQUENCE_STR ","
+ RELKIND_TOASTVALUE_STR ") AND\n"
" t.oid = CASE\n"
" WHEN reltablespace <> 0 THEN reltablespace\n"
" ELSE dattablespace\n"
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 3572689e33b..e0457bb1253 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -5496,11 +5496,11 @@ postgresImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid)
appendStringInfoString(&buf,
"WHERE c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_VIEW) ","
- CppAsString2(RELKIND_FOREIGN_TABLE) ","
- CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_PARTITIONED_TABLE) ") "
+ RELKIND_RELATION_STR ","
+ RELKIND_VIEW_STR ","
+ RELKIND_FOREIGN_TABLE_STR ","
+ RELKIND_MATVIEW_STR ","
+ RELKIND_PARTITIONED_TABLE_STR ") "
" AND n.nspname = ");
deparseStringLiteral(&buf, stmt->remote_schema);
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index 8102569466b..343dae9bc20 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -198,7 +198,7 @@ vacuumlo(const char *database, const struct _param *param)
strcat(buf, " AND a.atttypid = t.oid ");
strcat(buf, " AND c.relnamespace = s.oid ");
strcat(buf, " AND t.typname in ('oid', 'lo') ");
- strcat(buf, " AND c.relkind in (" CppAsString2(RELKIND_RELATION) ", " CppAsString2(RELKIND_MATVIEW) ")");
+ strcat(buf, " AND c.relkind in ('" RELKIND_RELATION_STR "', " RELKIND_MATVIEW_STR ")");
strcat(buf, " AND s.nspname !~ '^pg_'");
res = PQexec(conn, buf);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 0b3c8499b49..33e3c25a50c 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -2921,7 +2921,7 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
if (server_version >= 190000)
appendStringInfo(&cmd,
"UNION ALL\n"
- " SELECT DISTINCT s.schemaname, s.sequencename, " CppAsString2(RELKIND_SEQUENCE) "::\"char\" AS relkind, NULL::int2vector AS attrs\n"
+ " SELECT DISTINCT s.schemaname, s.sequencename, " RELKIND_SEQUENCE_STR "::\"char\" AS relkind, NULL::int2vector AS attrs\n"
" FROM pg_catalog.pg_publication_sequences s\n"
" WHERE s.pubname IN ( %s )",
pub_names.data);
@@ -2929,7 +2929,7 @@ fetch_relation_list(WalReceiverConn *wrconn, List *publications)
else
{
tableRow[3] = NAMEARRAYOID;
- appendStringInfoString(&cmd, "SELECT DISTINCT t.schemaname, t.tablename, " CppAsString2(RELKIND_RELATION) "::\"char\" AS relkind \n");
+ appendStringInfoString(&cmd, "SELECT DISTINCT t.schemaname, t.tablename, " RELKIND_RELATION_STR "::\"char\" AS relkind \n");
/* Get column lists for each relation if the publisher supports it */
if (check_columnlist)
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index f69dc68286c..7de019a7402 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -2857,9 +2857,9 @@ schema_get_xml_visible_tables(Oid nspid)
initStringInfo(&query);
appendStringInfo(&query, "SELECT oid FROM pg_catalog.pg_class"
" WHERE relnamespace = %u AND relkind IN ("
- CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_VIEW) ")"
+ RELKIND_RELATION_STR ","
+ RELKIND_MATVIEW_STR ","
+ RELKIND_VIEW_STR ")"
" AND pg_catalog.has_table_privilege (oid, 'SELECT')"
" ORDER BY relname;", nspid);
@@ -2889,9 +2889,9 @@ database_get_xml_visible_tables(void)
/* At the moment there is no order required here. */
return query_to_oid_list("SELECT oid FROM pg_catalog.pg_class"
" WHERE relkind IN ("
- CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_VIEW) ")"
+ RELKIND_RELATION_STR ","
+ RELKIND_MATVIEW_STR ","
+ RELKIND_VIEW_STR ")"
" AND pg_catalog.has_table_privilege(pg_class.oid, 'SELECT')"
" AND relnamespace IN (" XML_VISIBLE_SCHEMAS ");");
}
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index a3980e5535f..11bfdd31cbf 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -1806,12 +1806,12 @@ setup_privileges(FILE *cmdfd)
" SET relacl = (SELECT array_agg(a.acl) FROM "
" (SELECT E'=r/\"%s\"' as acl "
" UNION SELECT unnest(pg_catalog.acldefault("
- " CASE WHEN relkind = " CppAsString2(RELKIND_SEQUENCE) " THEN 's' "
+ " CASE WHEN relkind = " RELKIND_SEQUENCE_STR " THEN 's' "
" ELSE 'r' END::\"char\"," CppAsString2(BOOTSTRAP_SUPERUSERID) "::oid))"
" ) as a) "
- " WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_VIEW) ", " CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_SEQUENCE) ")"
+ " WHERE relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_VIEW_STR ", " RELKIND_MATVIEW_STR ", "
+ RELKIND_SEQUENCE_STR ")"
" AND relacl IS NULL;\n\n",
escape_quotes(username));
PG_CMD_PUTS("GRANT USAGE ON SCHEMA pg_catalog, public TO PUBLIC;\n\n");
@@ -1828,9 +1828,9 @@ setup_privileges(FILE *cmdfd)
" pg_class"
" WHERE"
" relacl IS NOT NULL"
- " AND relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_VIEW) ", " CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_SEQUENCE) ");\n\n");
+ " AND relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_VIEW_STR ", " RELKIND_MATVIEW_STR ", "
+ RELKIND_SEQUENCE_STR ");\n\n");
PG_CMD_PUTS("INSERT INTO pg_init_privs "
" (objoid, classoid, objsubid, initprivs, privtype)"
" SELECT"
@@ -1844,9 +1844,9 @@ setup_privileges(FILE *cmdfd)
" JOIN pg_attribute ON (pg_class.oid = pg_attribute.attrelid)"
" WHERE"
" pg_attribute.attacl IS NOT NULL"
- " AND pg_class.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_VIEW) ", " CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_SEQUENCE) ");\n\n");
+ " AND pg_class.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_VIEW_STR ", " RELKIND_MATVIEW_STR ", "
+ RELKIND_SEQUENCE_STR ");\n\n");
PG_CMD_PUTS("INSERT INTO pg_init_privs "
" (objoid, classoid, objsubid, initprivs, privtype)"
" SELECT"
diff --git a/src/bin/pg_amcheck/pg_amcheck.c b/src/bin/pg_amcheck/pg_amcheck.c
index 03e24a2577c..72bfcd2c813 100644
--- a/src/bin/pg_amcheck/pg_amcheck.c
+++ b/src/bin/pg_amcheck/pg_amcheck.c
@@ -1976,28 +1976,28 @@ compile_relation_list_one_db(PGconn *conn, SimplePtrList *relations,
appendPQExpBuffer(&sql,
" AND c.relam = %u "
"AND c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_SEQUENCE) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_TOASTVALUE) ") "
+ RELKIND_RELATION_STR ", "
+ RELKIND_SEQUENCE_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_TOASTVALUE_STR ") "
"AND c.relnamespace != %u",
HEAP_TABLE_AM_OID, PG_TOAST_NAMESPACE);
else
appendPQExpBuffer(&sql,
" AND c.relam IN (%u, %u)"
"AND c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_SEQUENCE) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_TOASTVALUE) ", "
- CppAsString2(RELKIND_INDEX) ") "
+ RELKIND_RELATION_STR ", "
+ RELKIND_SEQUENCE_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_TOASTVALUE_STR ", "
+ RELKIND_INDEX_STR ") "
"AND ((c.relam = %u AND c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_SEQUENCE) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_TOASTVALUE) ")) OR "
+ RELKIND_RELATION_STR ", "
+ RELKIND_SEQUENCE_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_TOASTVALUE_STR ")) OR "
"(c.relam = %u AND c.relkind = "
- CppAsString2(RELKIND_INDEX) "))",
+ RELKIND_INDEX_STR "))",
HEAP_TABLE_AM_OID, BTREE_AM_OID,
HEAP_TABLE_AM_OID, BTREE_AM_OID);
@@ -2058,7 +2058,7 @@ compile_relation_list_one_db(PGconn *conn, SimplePtrList *relations,
"\nWHERE true");
appendPQExpBuffer(&sql,
" AND c.relam = %u "
- "AND c.relkind = " CppAsString2(RELKIND_INDEX),
+ "AND c.relkind = " RELKIND_INDEX_STR,
BTREE_AM_OID);
if (opts.no_toast_expansion)
appendPQExpBuffer(&sql,
@@ -2095,7 +2095,7 @@ compile_relation_list_one_db(PGconn *conn, SimplePtrList *relations,
"\nWHERE true");
appendPQExpBuffer(&sql,
" AND c.relam = %u"
- " AND c.relkind = " CppAsString2(RELKIND_INDEX) ")",
+ " AND c.relkind = " RELKIND_INDEX_STR ")",
BTREE_AM_OID);
}
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 2bebefd0ba2..cdccccc1820 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -3158,14 +3158,14 @@ buildMatViewRefreshDependencies(Archive *fout)
"SELECT d1.objid, d2.refobjid, c2.relkind AS refrelkind "
"FROM pg_depend d1 "
"JOIN pg_class c1 ON c1.oid = d1.objid "
- "AND c1.relkind = " CppAsString2(RELKIND_MATVIEW)
+ "AND c1.relkind = " RELKIND_MATVIEW_STR
" JOIN pg_rewrite r1 ON r1.ev_class = d1.objid "
"JOIN pg_depend d2 ON d2.classid = 'pg_rewrite'::regclass "
"AND d2.objid = r1.oid "
"AND d2.refobjid <> d1.objid "
"JOIN pg_class c2 ON c2.oid = d2.refobjid "
- "AND c2.relkind IN (" CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_VIEW) ") "
+ "AND c2.relkind IN (" RELKIND_MATVIEW_STR ","
+ RELKIND_VIEW_STR ") "
"WHERE d1.classid = 'pg_class'::regclass "
"UNION "
"SELECT w.objid, d3.refobjid, c3.relkind "
@@ -3175,12 +3175,12 @@ buildMatViewRefreshDependencies(Archive *fout)
"AND d3.objid = r3.oid "
"AND d3.refobjid <> w.refobjid "
"JOIN pg_class c3 ON c3.oid = d3.refobjid "
- "AND c3.relkind IN (" CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_VIEW) ") "
+ "AND c3.relkind IN (" RELKIND_MATVIEW_STR ","
+ RELKIND_VIEW_STR ") "
") "
"SELECT 'pg_class'::regclass::oid AS classid, objid, refobjid "
"FROM w "
- "WHERE refrelkind = " CppAsString2(RELKIND_MATVIEW));
+ "WHERE refrelkind = " RELKIND_MATVIEW_STR);
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -7279,9 +7279,9 @@ getTables(Archive *fout, int *numTables)
"c.relhastriggers, c.relpersistence, "
"c.reloftype, "
"c.relacl, "
- "acldefault(CASE WHEN c.relkind = " CppAsString2(RELKIND_SEQUENCE)
+ "acldefault(CASE WHEN c.relkind = " RELKIND_SEQUENCE_STR
" THEN 's'::\"char\" ELSE 'r'::\"char\" END, c.relowner) AS acldefault, "
- "CASE WHEN c.relkind = " CppAsString2(RELKIND_FOREIGN_TABLE) " THEN "
+ "CASE WHEN c.relkind = " RELKIND_FOREIGN_TABLE_STR " THEN "
"(SELECT ftserver FROM pg_catalog.pg_foreign_table WHERE ftrelid = c.oid) "
"ELSE 0 END AS foreignserver, "
"c.relfrozenxid, tc.relfrozenxid AS tfrozenxid, "
@@ -7367,7 +7367,7 @@ getTables(Archive *fout, int *numTables)
appendPQExpBufferStr(query,
"\nFROM pg_class c\n"
"LEFT JOIN pg_depend d ON "
- "(c.relkind = " CppAsString2(RELKIND_SEQUENCE) " AND "
+ "(c.relkind = " RELKIND_SEQUENCE_STR " AND "
"d.classid = 'pg_class'::regclass AND d.objid = c.oid AND "
"d.objsubid = 0 AND "
"d.refclassid = 'pg_class'::regclass AND d.deptype IN ('a', 'i'))\n"
@@ -7387,8 +7387,8 @@ getTables(Archive *fout, int *numTables)
*/
appendPQExpBufferStr(query,
"LEFT JOIN pg_class tc ON (c.reltoastrelid = tc.oid"
- " AND tc.relkind = " CppAsString2(RELKIND_TOASTVALUE)
- " AND c.relkind <> " CppAsString2(RELKIND_PARTITIONED_TABLE) ")\n");
+ " AND tc.relkind = " RELKIND_TOASTVALUE_STR
+ " AND c.relkind <> " RELKIND_PARTITIONED_TABLE_STR ")\n");
/*
* Restrict to interesting relkinds (in particular, not indexes). Not all
@@ -7402,13 +7402,13 @@ getTables(Archive *fout, int *numTables)
*/
appendPQExpBufferStr(query,
"WHERE c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_SEQUENCE) ", "
- CppAsString2(RELKIND_VIEW) ", "
- CppAsString2(RELKIND_COMPOSITE_TYPE) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_FOREIGN_TABLE) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")\n"
+ RELKIND_RELATION_STR ", "
+ RELKIND_SEQUENCE_STR ", "
+ RELKIND_VIEW_STR ", "
+ RELKIND_COMPOSITE_TYPE_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_FOREIGN_TABLE_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")\n"
"ORDER BY c.oid");
res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index a8d20a92a98..5d053563657 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -372,9 +372,9 @@ data_type_check_query(int checknum)
" NOT a.attisdropped AND "
" a.atttypid IN (SELECT oid FROM oids) AND "
" c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_INDEX) ") AND "
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_INDEX_STR ") AND "
" c.relnamespace = n.oid AND "
/* exclude possible orphaned temp tables */
" n.nspname !~ '^pg_temp_' AND "
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 47e8d1039a2..89bda44fcf9 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -508,8 +508,8 @@ get_rel_infos_query(void)
" SELECT c.oid, 0::oid, 0::oid "
" FROM pg_catalog.pg_class c JOIN pg_catalog.pg_namespace n "
" ON c.relnamespace = n.oid "
- " WHERE relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) "%s) AND "
+ " WHERE relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR "%s) AND "
/* exclude possible orphaned temp tables */
" ((n.nspname !~ '^pg_temp_' AND "
" n.nspname !~ '^pg_toast_temp_' AND "
@@ -519,7 +519,7 @@ get_rel_infos_query(void)
" (n.nspname = 'pg_catalog' AND "
" relname IN ('pg_largeobject'%s) ))), ",
(user_opts.transfer_mode == TRANSFER_MODE_SWAP) ?
- ", " CppAsString2(RELKIND_SEQUENCE) : "",
+ ", " RELKIND_SEQUENCE_STR : "",
FirstNormalObjectId,
(GET_MAJOR_VERSION(old_cluster.major_version) >= 1600) ?
", 'pg_largeobject_metadata'" : "");
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index 2127d297bfe..e94f02fd369 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -990,9 +990,9 @@ set_frozenxids(bool minmxid_only)
"SET relfrozenxid = '%u' "
/* only heap, materialized view, and TOAST are vacuumed */
"WHERE relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_TOASTVALUE) ")",
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_TOASTVALUE_STR ")",
old_cluster.controldata.chkpnt_nxtxid));
/* set pg_class.relminmxid */
@@ -1001,9 +1001,9 @@ set_frozenxids(bool minmxid_only)
"SET relminmxid = '%u' "
/* only heap, materialized view, and TOAST are vacuumed */
"WHERE relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_TOASTVALUE) ")",
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_TOASTVALUE_STR ")",
old_cluster.controldata.chkpnt_nxtmulti));
PQfinish(conn);
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index 3584c4e1428..f02a8df8875 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -689,7 +689,7 @@ describeTypes(const char *pattern, bool verbose, bool showSystem)
* composite types
*/
appendPQExpBufferStr(&buf, "WHERE (t.typrelid = 0 ");
- appendPQExpBufferStr(&buf, "OR (SELECT c.relkind = " CppAsString2(RELKIND_COMPOSITE_TYPE)
+ appendPQExpBufferStr(&buf, "OR (SELECT c.relkind = " RELKIND_COMPOSITE_TYPE_STR
" FROM pg_catalog.pg_class c "
"WHERE c.oid = t.typrelid))\n");
@@ -1063,12 +1063,12 @@ permissionsList(const char *pattern, bool showSystem)
"SELECT n.nspname as \"%s\",\n"
" c.relname as \"%s\",\n"
" CASE c.relkind"
- " WHEN " CppAsString2(RELKIND_RELATION) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_VIEW) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_MATVIEW) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_SEQUENCE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_FOREIGN_TABLE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_PARTITIONED_TABLE) " THEN '%s'"
+ " WHEN " RELKIND_RELATION_STR " THEN '%s'"
+ " WHEN " RELKIND_VIEW_STR " THEN '%s'"
+ " WHEN " RELKIND_MATVIEW_STR " THEN '%s'"
+ " WHEN " RELKIND_SEQUENCE_STR " THEN '%s'"
+ " WHEN " RELKIND_FOREIGN_TABLE_STR " THEN '%s'"
+ " WHEN " RELKIND_PARTITIONED_TABLE_STR " THEN '%s'"
" END as \"%s\",\n"
" ",
gettext_noop("Schema"),
@@ -1164,12 +1164,12 @@ permissionsList(const char *pattern, bool showSystem)
appendPQExpBufferStr(&buf, "\nFROM pg_catalog.pg_class c\n"
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
"WHERE c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_VIEW) ","
- CppAsString2(RELKIND_MATVIEW) ","
- CppAsString2(RELKIND_SEQUENCE) ","
- CppAsString2(RELKIND_FOREIGN_TABLE) ","
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")\n");
+ RELKIND_RELATION_STR ","
+ RELKIND_VIEW_STR ","
+ RELKIND_MATVIEW_STR ","
+ RELKIND_SEQUENCE_STR ","
+ RELKIND_FOREIGN_TABLE_STR ","
+ RELKIND_PARTITIONED_TABLE_STR ")\n");
if (!showSystem && !pattern)
appendPQExpBufferStr(&buf, " AND n.nspname <> 'pg_catalog'\n"
@@ -3471,8 +3471,8 @@ describeOneTableDetails(const char *schemaname,
"SELECT c.oid::pg_catalog.regclass\n"
"FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i\n"
"WHERE c.oid = i.inhparent AND i.inhrelid = '%s'\n"
- " AND c.relkind != " CppAsString2(RELKIND_PARTITIONED_TABLE)
- " AND c.relkind != " CppAsString2(RELKIND_PARTITIONED_INDEX)
+ " AND c.relkind != " RELKIND_PARTITIONED_TABLE_STR
+ " AND c.relkind != " RELKIND_PARTITIONED_INDEX_STR
"\nORDER BY inhseqno;",
oid);
@@ -4067,15 +4067,15 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
"SELECT n.nspname as \"%s\",\n"
" c.relname as \"%s\",\n"
" CASE c.relkind"
- " WHEN " CppAsString2(RELKIND_RELATION) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_VIEW) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_MATVIEW) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_INDEX) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_SEQUENCE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_TOASTVALUE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_FOREIGN_TABLE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_PARTITIONED_TABLE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_PARTITIONED_INDEX) " THEN '%s'"
+ " WHEN " RELKIND_RELATION_STR " THEN '%s'"
+ " WHEN " RELKIND_VIEW_STR " THEN '%s'"
+ " WHEN " RELKIND_MATVIEW_STR " THEN '%s'"
+ " WHEN " RELKIND_INDEX_STR " THEN '%s'"
+ " WHEN " RELKIND_SEQUENCE_STR " THEN '%s'"
+ " WHEN " RELKIND_TOASTVALUE_STR " THEN '%s'"
+ " WHEN " RELKIND_FOREIGN_TABLE_STR " THEN '%s'"
+ " WHEN " RELKIND_PARTITIONED_TABLE_STR " THEN '%s'"
+ " WHEN " RELKIND_PARTITIONED_INDEX_STR " THEN '%s'"
" END as \"%s\",\n"
" pg_catalog.pg_get_userbyid(c.relowner) as \"%s\"",
gettext_noop("Schema"),
@@ -4157,25 +4157,25 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
appendPQExpBufferStr(&buf, "\nWHERE c.relkind IN (");
if (showTables)
{
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_RELATION) ","
- CppAsString2(RELKIND_PARTITIONED_TABLE) ",");
+ appendPQExpBufferStr(&buf, RELKIND_RELATION_STR ","
+ RELKIND_PARTITIONED_TABLE_STR ",");
/* with 'S' or a pattern, allow 't' to match TOAST tables too */
if (showSystem || pattern)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_TOASTVALUE) ",");
+ appendPQExpBufferStr(&buf, RELKIND_TOASTVALUE_STR ",");
}
if (showViews)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_VIEW) ",");
+ appendPQExpBufferStr(&buf, RELKIND_VIEW_STR ",");
if (showMatViews)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_MATVIEW) ",");
+ appendPQExpBufferStr(&buf, RELKIND_MATVIEW_STR ",");
if (showIndexes)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_INDEX) ","
- CppAsString2(RELKIND_PARTITIONED_INDEX) ",");
+ appendPQExpBufferStr(&buf, RELKIND_INDEX_STR ","
+ RELKIND_PARTITIONED_INDEX_STR ",");
if (showSeq)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_SEQUENCE) ",");
+ appendPQExpBufferStr(&buf, RELKIND_SEQUENCE_STR ",");
if (showSystem || pattern)
appendPQExpBufferStr(&buf, "'s',"); /* was RELKIND_SPECIAL */
if (showForeign)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_FOREIGN_TABLE) ",");
+ appendPQExpBufferStr(&buf, RELKIND_FOREIGN_TABLE_STR ",");
appendPQExpBufferStr(&buf, "''"); /* dummy */
appendPQExpBufferStr(&buf, ")\n");
@@ -4348,8 +4348,8 @@ listPartitionedTables(const char *reltypes, const char *pattern, bool verbose)
{
appendPQExpBuffer(&buf,
",\n CASE c.relkind"
- " WHEN " CppAsString2(RELKIND_PARTITIONED_TABLE) " THEN '%s'"
- " WHEN " CppAsString2(RELKIND_PARTITIONED_INDEX) " THEN '%s'"
+ " WHEN " RELKIND_PARTITIONED_TABLE_STR " THEN '%s'"
+ " WHEN " RELKIND_PARTITIONED_INDEX_STR " THEN '%s'"
" END as \"%s\"",
gettext_noop("partitioned table"),
gettext_noop("partitioned index"),
@@ -4449,9 +4449,9 @@ listPartitionedTables(const char *reltypes, const char *pattern, bool verbose)
appendPQExpBufferStr(&buf, "\nWHERE c.relkind IN (");
if (showTables)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_PARTITIONED_TABLE) ",");
+ appendPQExpBufferStr(&buf, RELKIND_PARTITIONED_TABLE_STR ",");
if (showIndexes)
- appendPQExpBufferStr(&buf, CppAsString2(RELKIND_PARTITIONED_INDEX) ",");
+ appendPQExpBufferStr(&buf, RELKIND_PARTITIONED_INDEX_STR ",");
appendPQExpBufferStr(&buf, "''"); /* dummy */
appendPQExpBufferStr(&buf, ")\n");
diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index 8b91bc00062..5434a1273b2 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -146,7 +146,7 @@ typedef struct SchemaQuery
* Selection condition --- only rows meeting this condition are candidates
* to display. If catname mentions multiple tables, include the necessary
* join condition here. For example, this might look like "c.relkind = "
- * CppAsString2(RELKIND_RELATION). Write NULL (not an empty string) if
+ * RELKIND_RELATION_STR. Write NULL (not an empty string) if
* not needed.
*/
const char *selcondition;
@@ -591,7 +591,7 @@ static const SchemaQuery Query_for_list_of_datatypes = {
.catname = "pg_catalog.pg_type t",
/* selcondition --- ignore table rowtypes and array types */
.selcondition = "(t.typrelid = 0 "
- " OR (SELECT c.relkind = " CppAsString2(RELKIND_COMPOSITE_TYPE)
+ " OR (SELECT c.relkind = " RELKIND_COMPOSITE_TYPE_STR
" FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid)) "
"AND t.typname !~ '^_'",
.viscondition = "pg_catalog.pg_type_is_visible(t.oid)",
@@ -603,7 +603,7 @@ static const SchemaQuery Query_for_list_of_datatypes = {
static const SchemaQuery Query_for_list_of_composite_datatypes = {
.catname = "pg_catalog.pg_type t",
/* selcondition --- only get composite types */
- .selcondition = "(SELECT c.relkind = " CppAsString2(RELKIND_COMPOSITE_TYPE)
+ .selcondition = "(SELECT c.relkind = " RELKIND_COMPOSITE_TYPE_STR
" FROM pg_catalog.pg_class c WHERE c.oid = t.typrelid) "
"AND t.typname !~ '^_'",
.viscondition = "pg_catalog.pg_type_is_visible(t.oid)",
@@ -679,7 +679,7 @@ static const SchemaQuery Query_for_list_of_routines = {
static const SchemaQuery Query_for_list_of_sequences = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_SEQUENCE) ")",
+ .selcondition = "c.relkind IN (" RELKIND_SEQUENCE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -687,7 +687,7 @@ static const SchemaQuery Query_for_list_of_sequences = {
static const SchemaQuery Query_for_list_of_foreign_tables = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_FOREIGN_TABLE) ")",
+ .selcondition = "c.relkind IN (" RELKIND_FOREIGN_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -696,8 +696,8 @@ static const SchemaQuery Query_for_list_of_foreign_tables = {
static const SchemaQuery Query_for_list_of_tables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -705,7 +705,7 @@ static const SchemaQuery Query_for_list_of_tables = {
static const SchemaQuery Query_for_list_of_partitioned_tables = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ .selcondition = "c.relkind IN (" RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -714,8 +714,8 @@ static const SchemaQuery Query_for_list_of_partitioned_tables = {
static const SchemaQuery Query_for_list_of_tables_for_constraint = {
.catname = "pg_catalog.pg_class c, pg_catalog.pg_constraint con",
.selcondition = "c.oid=con.conrelid and c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ RELKIND_RELATION_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -783,7 +783,7 @@ static const SchemaQuery Query_for_list_of_ts_templates = {
static const SchemaQuery Query_for_list_of_views = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_VIEW) ")",
+ .selcondition = "c.relkind IN (" RELKIND_VIEW_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -791,7 +791,7 @@ static const SchemaQuery Query_for_list_of_views = {
static const SchemaQuery Query_for_list_of_matviews = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_MATVIEW) ")",
+ .selcondition = "c.relkind IN (" RELKIND_MATVIEW_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -800,8 +800,8 @@ static const SchemaQuery Query_for_list_of_matviews = {
static const SchemaQuery Query_for_list_of_indexes = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_INDEX) ", "
- CppAsString2(RELKIND_PARTITIONED_INDEX) ")",
+ "c.relkind IN (" RELKIND_INDEX_STR ", "
+ RELKIND_PARTITIONED_INDEX_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -809,7 +809,7 @@ static const SchemaQuery Query_for_list_of_indexes = {
static const SchemaQuery Query_for_list_of_partitioned_indexes = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind = " CppAsString2(RELKIND_PARTITIONED_INDEX),
+ .selcondition = "c.relkind = " RELKIND_PARTITIONED_INDEX_STR,
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -827,8 +827,8 @@ static const SchemaQuery Query_for_list_of_relations = {
/* partitioned relations */
static const SchemaQuery Query_for_list_of_partitioned_relations = {
.catname = "pg_catalog.pg_class c",
- .selcondition = "c.relkind IN (" CppAsString2(RELKIND_PARTITIONED_TABLE)
- ", " CppAsString2(RELKIND_PARTITIONED_INDEX) ")",
+ .selcondition = "c.relkind IN (" RELKIND_PARTITIONED_TABLE_STR
+ ", " RELKIND_PARTITIONED_INDEX_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -845,10 +845,10 @@ static const SchemaQuery Query_for_list_of_operator_families = {
static const SchemaQuery Query_for_list_of_updatables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_FOREIGN_TABLE) ", "
- CppAsString2(RELKIND_VIEW) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_FOREIGN_TABLE_STR ", "
+ RELKIND_VIEW_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -858,9 +858,9 @@ static const SchemaQuery Query_for_list_of_updatables = {
static const SchemaQuery Query_for_list_of_mergetargets = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_VIEW) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ") ",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_VIEW_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ") ",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -870,12 +870,12 @@ static const SchemaQuery Query_for_list_of_mergetargets = {
static const SchemaQuery Query_for_list_of_selectables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_SEQUENCE) ", "
- CppAsString2(RELKIND_VIEW) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_FOREIGN_TABLE) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_SEQUENCE_STR ", "
+ RELKIND_VIEW_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_FOREIGN_TABLE_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -885,9 +885,9 @@ static const SchemaQuery Query_for_list_of_selectables = {
static const SchemaQuery Query_for_list_of_truncatables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_FOREIGN_TABLE) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_FOREIGN_TABLE_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -900,10 +900,10 @@ static const SchemaQuery Query_for_list_of_truncatables = {
static const SchemaQuery Query_for_list_of_analyzables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_FOREIGN_TABLE) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_FOREIGN_TABLE_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -921,9 +921,9 @@ static const SchemaQuery Query_for_list_of_analyzables = {
static const SchemaQuery Query_for_list_of_indexables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ", "
- CppAsString2(RELKIND_MATVIEW) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ", "
+ RELKIND_MATVIEW_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
@@ -939,9 +939,9 @@ static const SchemaQuery Query_for_list_of_indexables = {
static const SchemaQuery Query_for_list_of_clusterables = {
.catname = "pg_catalog.pg_class c",
.selcondition =
- "c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) ", "
- CppAsString2(RELKIND_MATVIEW) ")",
+ "c.relkind IN (" RELKIND_RELATION_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR ", "
+ RELKIND_MATVIEW_STR ")",
.viscondition = "pg_catalog.pg_table_is_visible(c.oid)",
.namespace = "c.relnamespace",
.result = "c.relname",
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index b15745256ff..e63dda7a7a1 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -651,8 +651,8 @@ get_parallel_tables_list(PGconn *conn, ReindexType type,
" ON c.relnamespace = ns.oid\n"
" WHERE ns.nspname != 'pg_catalog'\n"
" AND c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ")\n"
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ")\n"
" AND c.relpersistence != "
CppAsString2(RELPERSISTENCE_TEMP) "\n"
" ORDER BY c.relpages DESC;");
@@ -674,8 +674,8 @@ get_parallel_tables_list(PGconn *conn, ReindexType type,
" JOIN pg_catalog.pg_namespace ns"
" ON c.relnamespace = ns.oid\n"
" WHERE c.relkind IN ("
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ")\n"
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ")\n"
" AND c.relpersistence != "
CppAsString2(RELPERSISTENCE_TEMP) "\n"
" AND ns.nspname IN (");
diff --git a/src/bin/scripts/vacuuming.c b/src/bin/scripts/vacuuming.c
index faac9089a01..9c59cd31c50 100644
--- a/src/bin/scripts/vacuuming.c
+++ b/src/bin/scripts/vacuuming.c
@@ -598,8 +598,8 @@ retrieve_objects(PGconn *conn, vacuumingOptions *vacopts,
" JOIN pg_catalog.pg_namespace ns"
" ON c.relnamespace OPERATOR(pg_catalog.=) ns.oid\n"
" CROSS JOIN LATERAL (SELECT c.relkind IN ("
- CppAsString2(RELKIND_PARTITIONED_TABLE) ", "
- CppAsString2(RELKIND_PARTITIONED_INDEX) ")) as p (inherited)\n"
+ RELKIND_PARTITIONED_TABLE_STR ", "
+ RELKIND_PARTITIONED_INDEX_STR ")) as p (inherited)\n"
" LEFT JOIN pg_catalog.pg_class t"
" ON c.reltoastrelid OPERATOR(pg_catalog.=) t.oid\n");
@@ -659,14 +659,14 @@ retrieve_objects(PGconn *conn, vacuumingOptions *vacopts,
if (vacopts->mode == MODE_ANALYZE)
appendPQExpBufferStr(&catalog_query,
" AND c.relkind OPERATOR(pg_catalog.=) ANY (array["
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) ", "
- CppAsString2(RELKIND_PARTITIONED_TABLE) "])\n");
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR ", "
+ RELKIND_PARTITIONED_TABLE_STR "])\n");
else
appendPQExpBufferStr(&catalog_query,
" AND c.relkind OPERATOR(pg_catalog.=) ANY (array["
- CppAsString2(RELKIND_RELATION) ", "
- CppAsString2(RELKIND_MATVIEW) "])\n");
+ RELKIND_RELATION_STR ", "
+ RELKIND_MATVIEW_STR "])\n");
}
/*
--
2.47.3
--a5gwxv7edi5gnyjn
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
filename="0003-Initial-steps-to-making-relkind-an-enum.patch"
view thread (106+ messages)
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected]
Subject: Re: [PATCH 2/3] replace CppAsString2(RELKIND_x) with RELKIND_x_STR
In-Reply-To: <no-message-id-599985@localhost>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox