Fix hard-coded relkind constants in assorted other files.

Although it's reasonable to expect that most of these constants will
never change, that does not make it good programming style to hard-code
the value rather than using the RELKIND_FOO macros.

I think I've now gotten all the hard-coded references in C code.
Unfortunately there's no equally convenient way to parameterize
SQL files ...

Discussion: https://postgr.es/m/11145.1488931324@sss.pgh.pa.us

2 files changed, 27 insertions, 10 deletions

diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index 04aeb7178e9..f81cf489d26 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -69,6 +69,7 @@
 
 #include "access/htup_details.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_class.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "executor/executor.h"
@@ -2344,7 +2345,13 @@ schema_get_xml_visible_tables(Oid nspid)
 	StringInfoData query;
 
 	initStringInfo(&query);
-	appendStringInfo(&query, "SELECT oid FROM pg_catalog.pg_class WHERE relnamespace = %u AND relkind IN ('r', 'm', 'v') AND pg_catalog.has_table_privilege (oid, 'SELECT') ORDER BY relname;", nspid);
+	appendStringInfo(&query, "SELECT oid FROM pg_catalog.pg_class"
+					 " WHERE relnamespace = %u AND relkind IN ("
+					 CppAsString2(RELKIND_RELATION) ","
+					 CppAsString2(RELKIND_MATVIEW) ","
+					 CppAsString2(RELKIND_VIEW) ")"
+					 " AND pg_catalog.has_table_privilege (oid, 'SELECT')"
+					 " ORDER BY relname;", nspid);
 
 	return query_to_oid_list(query.data);
 }
@@ -2370,7 +2377,13 @@ static List *
 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 ('r', 'm', 'v') AND pg_catalog.has_table_privilege (pg_class.oid, 'SELECT') AND relnamespace IN (" XML_VISIBLE_SCHEMAS ");");
+	return query_to_oid_list("SELECT oid FROM pg_catalog.pg_class"
+							 " WHERE relkind IN ("
+							 CppAsString2(RELKIND_RELATION) ","
+							 CppAsString2(RELKIND_MATVIEW) ","
+							 CppAsString2(RELKIND_VIEW) ")"
+							 " AND pg_catalog.has_table_privilege(pg_class.oid, 'SELECT')"
+							 " AND relnamespace IN (" XML_VISIBLE_SCHEMAS ");");
 }
 
 
diff --git a/src/tools/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c
index 9fe0379f63e..267107ddaeb 100644
--- a/src/tools/findoidjoins/findoidjoins.c
+++ b/src/tools/findoidjoins/findoidjoins.c
@@ -7,6 +7,8 @@
  */
 #include "postgres_fe.h"
 
+#include "catalog/pg_class.h"
+
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
 
@@ -51,8 +53,8 @@ main(int argc, char **argv)
 					  "SELECT c.relname, (SELECT nspname FROM "
 		"pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname "
 					  "FROM pg_catalog.pg_class c "
-					  "WHERE c.relkind = 'r' "
-					  "AND c.relhasoids "
+					  "WHERE c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND c.relhasoids "
 					  "ORDER BY nspname, c.relname"
 		);
 
@@ -71,9 +73,10 @@ main(int argc, char **argv)
 					  "(SELECT nspname FROM pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname, "
 					  "a.attname "
 					  "FROM pg_catalog.pg_class c, pg_catalog.pg_attribute a "
-					  "WHERE a.attnum > 0 AND c.relkind = 'r' "
-					  "AND a.attrelid = c.oid "
-					  "AND a.atttypid IN ('pg_catalog.oid'::regtype, "
+					  "WHERE a.attnum > 0"
+					  " AND c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND a.attrelid = c.oid"
+					  " AND a.atttypid IN ('pg_catalog.oid'::regtype, "
 					  " 'pg_catalog.regclass'::regtype, "
 					  " 'pg_catalog.regoper'::regtype, "
 					  " 'pg_catalog.regoperator'::regtype, "
@@ -146,9 +149,10 @@ main(int argc, char **argv)
 					  "(SELECT nspname FROM pg_catalog.pg_namespace n WHERE n.oid = c.relnamespace) AS nspname, "
 					  "a.attname "
 					  "FROM pg_catalog.pg_class c, pg_catalog.pg_attribute a "
-					  "WHERE a.attnum > 0 AND c.relkind = 'r' "
-					  "AND a.attrelid = c.oid "
-					  "AND a.atttypid IN ('pg_catalog.oid[]'::regtype, "
+					  "WHERE a.attnum > 0"
+					  " AND c.relkind = " CppAsString2(RELKIND_RELATION)
+					  " AND a.attrelid = c.oid"
+					  " AND a.atttypid IN ('pg_catalog.oid[]'::regtype, "
 					  " 'pg_catalog.regclass[]'::regtype, "
 					  " 'pg_catalog.regoper[]'::regtype, "
 					  " 'pg_catalog.regoperator[]'::regtype, "