Skip to content

P
Postgres FD Implementation
Commit 50d2426f authored by Tom Lane's avatar Tom Lane
Browse files
Options

Clean up SQL emitted by psql/describe.c. 

Fix assorted places that had not bothered with the convention of
prefixing catalog and function names with "pg_catalog.".  That
could possibly result in query failure when running with a nondefault
search_path.  Also fix two places that weren't quoting OID literals.
I think the latter hasn't mattered much since about 7.3, but it's still
a bad idea to be doing it in 99 places and not in 2 others.

Also remove a useless EXISTS sub-select that someone had stuck into
describeOneTableDetails' queries for child tables.  We just got the OID
out of pg_class, so I hardly see how checking that it exists in pg_class
was doing anything helpful.

In passing, try to improve the emitted formatting of a couple of
these queries, though I didn't work really hard on that.  And merge
unnecessarily duplicative coding in some other places.

Much of this was new in HEAD, but some was quite old; back-patch
as appropriate.
parent 5e3254f0
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 91 deletions
src/bin/psql/describe.c
View file @ 50d2426f
...@@ -1594,17 +1594,17 @@ describeOneTableDetails(const char *schemaname, ...@@ -1594,17 +1594,17 @@ describeOneTableDetails(const char *schemaname,
else else
appendPQExpBufferStr(&buf, "\n NULL AS attcollation"); appendPQExpBufferStr(&buf, "\n NULL AS attcollation");
if (pset.sversion >= 100000) if (pset.sversion >= 100000)
appendPQExpBufferStr(&buf, ", a.attidentity"); appendPQExpBufferStr(&buf, ",\n a.attidentity");
else else
appendPQExpBufferStr(&buf, ", ''::\"char\" AS attidentity"); appendPQExpBufferStr(&buf, ",\n ''::pg_catalog.char AS attidentity");
if (tableinfo.relkind == RELKIND_INDEX) if (tableinfo.relkind == RELKIND_INDEX)
appendPQExpBufferStr(&buf, ",\n pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE) AS indexdef"); appendPQExpBufferStr(&buf, ",\n pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE) AS indexdef");
else else
appendPQExpBufferStr(&buf, ",\n NULL AS indexdef"); appendPQExpBufferStr(&buf, ",\n NULL AS indexdef");
if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200) if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200)
appendPQExpBufferStr(&buf, ",\n CASE WHEN attfdwoptions IS NULL THEN '' ELSE " appendPQExpBufferStr(&buf, ",\n CASE WHEN attfdwoptions IS NULL THEN '' ELSE "
" '(' || array_to_string(ARRAY(SELECT quote_ident(option_name) || ' ' || quote_literal(option_value) FROM " " '(' || pg_catalog.array_to_string(ARRAY(SELECT pg_catalog.quote_ident(option_name) || ' ' || pg_catalog.quote_literal(option_value) FROM "
" pg_options_to_table(attfdwoptions)), ', ') || ')' END AS attfdwoptions"); " pg_catalog.pg_options_to_table(attfdwoptions)), ', ') || ')' END AS attfdwoptions");
else else
appendPQExpBufferStr(&buf, ",\n NULL AS attfdwoptions"); appendPQExpBufferStr(&buf, ",\n NULL AS attfdwoptions");
if (verbose) if (verbose)
...@@ -1860,24 +1860,18 @@ describeOneTableDetails(const char *schemaname, ...@@ -1860,24 +1860,18 @@ describeOneTableDetails(const char *schemaname,
char *partdef; char *partdef;
char *partconstraintdef = NULL; char *partconstraintdef = NULL;
printfPQExpBuffer(&buf,
"SELECT inhparent::pg_catalog.regclass,\n"
" pg_catalog.pg_get_expr(c.relpartbound, inhrelid)");
/* If verbose, also request the partition constraint definition */ /* If verbose, also request the partition constraint definition */
if (verbose) if (verbose)
printfPQExpBuffer(&buf, appendPQExpBuffer(&buf,
"SELECT inhparent::pg_catalog.regclass," ",\n pg_catalog.pg_get_partition_constraintdef(inhrelid)");
" pg_get_expr(c.relpartbound, inhrelid)," appendPQExpBuffer(&buf,
" pg_get_partition_constraintdef(inhrelid)" "\nFROM pg_catalog.pg_class c"
" FROM pg_catalog.pg_class c" " JOIN pg_catalog.pg_inherits i"
" JOIN pg_catalog.pg_inherits"
" ON c.oid = inhrelid"
" WHERE c.oid = '%s' AND c.relispartition;", oid);
else
printfPQExpBuffer(&buf,
"SELECT inhparent::pg_catalog.regclass,"
" pg_get_expr(c.relpartbound, inhrelid)"
" FROM pg_catalog.pg_class c"
" JOIN pg_catalog.pg_inherits"
" ON c.oid = inhrelid" " ON c.oid = inhrelid"
" WHERE c.oid = '%s' AND c.relispartition;", oid); "\nWHERE c.oid = '%s' AND c.relispartition;", oid);
result = PSQLexec(buf.data); result = PSQLexec(buf.data);
if (!result) if (!result)
goto error_return; goto error_return;
...@@ -2041,7 +2035,7 @@ describeOneTableDetails(const char *schemaname, ...@@ -2041,7 +2035,7 @@ describeOneTableDetails(const char *schemaname,
"\n a.attnum=d.refobjsubid)" "\n a.attnum=d.refobjsubid)"
"\nWHERE d.classid='pg_catalog.pg_class'::pg_catalog.regclass" "\nWHERE d.classid='pg_catalog.pg_class'::pg_catalog.regclass"
"\n AND d.refclassid='pg_catalog.pg_class'::pg_catalog.regclass" "\n AND d.refclassid='pg_catalog.pg_class'::pg_catalog.regclass"
"\n AND d.objid=%s" "\n AND d.objid='%s'"
"\n AND d.deptype IN ('a', 'i')", "\n AND d.deptype IN ('a', 'i')",
oid); oid);
...@@ -2285,33 +2279,23 @@ describeOneTableDetails(const char *schemaname, ...@@ -2285,33 +2279,23 @@ describeOneTableDetails(const char *schemaname,
/* print any row-level policies */ /* print any row-level policies */
if (pset.sversion >= 90500) if (pset.sversion >= 90500)
{ {
printfPQExpBuffer(&buf, "SELECT pol.polname,");
if (pset.sversion >= 100000) if (pset.sversion >= 100000)
printfPQExpBuffer(&buf, appendPQExpBuffer(&buf,
"SELECT pol.polname, pol.polpermissive,\n" " pol.polpermissive,\n");
"CASE WHEN pol.polroles = '{0}' THEN NULL ELSE array_to_string(array(select rolname from pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
"pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n"
"pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n"
"CASE pol.polcmd\n"
"WHEN 'r' THEN 'SELECT'\n"
"WHEN 'a' THEN 'INSERT'\n"
"WHEN 'w' THEN 'UPDATE'\n"
"WHEN 'd' THEN 'DELETE'\n"
"END AS cmd\n"
"FROM pg_catalog.pg_policy pol\n"
"WHERE pol.polrelid = '%s' ORDER BY 1;",
oid);
else else
printfPQExpBuffer(&buf, appendPQExpBuffer(&buf,
"SELECT pol.polname, 't' as polpermissive,\n" " 't' as polpermissive,\n");
"CASE WHEN pol.polroles = '{0}' THEN NULL ELSE array_to_string(array(select rolname from pg_roles where oid = any (pol.polroles) order by 1),',') END,\n" appendPQExpBuffer(&buf,
"pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n" " CASE WHEN pol.polroles = '{0}' THEN NULL ELSE pg_catalog.array_to_string(array(select rolname from pg_catalog.pg_roles where oid = any (pol.polroles) order by 1),',') END,\n"
"pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n" " pg_catalog.pg_get_expr(pol.polqual, pol.polrelid),\n"
"CASE pol.polcmd\n" " pg_catalog.pg_get_expr(pol.polwithcheck, pol.polrelid),\n"
"WHEN 'r' THEN 'SELECT'\n" " CASE pol.polcmd\n"
"WHEN 'a' THEN 'INSERT'\n" " WHEN 'r' THEN 'SELECT'\n"
"WHEN 'w' THEN 'UPDATE'\n" " WHEN 'a' THEN 'INSERT'\n"
"WHEN 'd' THEN 'DELETE'\n" " WHEN 'w' THEN 'UPDATE'\n"
"END AS cmd\n" " WHEN 'd' THEN 'DELETE'\n"
" END AS cmd\n"
"FROM pg_catalog.pg_policy pol\n" "FROM pg_catalog.pg_policy pol\n"
"WHERE pol.polrelid = '%s' ORDER BY 1;", "WHERE pol.polrelid = '%s' ORDER BY 1;",
oid); oid);
...@@ -2543,7 +2527,7 @@ describeOneTableDetails(const char *schemaname, ...@@ -2543,7 +2527,7 @@ describeOneTableDetails(const char *schemaname,
"UNION ALL\n" "UNION ALL\n"
"SELECT pubname\n" "SELECT pubname\n"
"FROM pg_catalog.pg_publication p\n" "FROM pg_catalog.pg_publication p\n"
"WHERE p.puballtables AND pg_relation_is_publishable('%s')\n" "WHERE p.puballtables AND pg_catalog.pg_relation_is_publishable('%s')\n"
"ORDER BY 1;", "ORDER BY 1;",
oid, oid); oid, oid);
...@@ -2764,13 +2748,13 @@ describeOneTableDetails(const char *schemaname, ...@@ -2764,13 +2748,13 @@ describeOneTableDetails(const char *schemaname,
/* Footer information about foreign table */ /* Footer information about foreign table */
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT s.srvname,\n" "SELECT s.srvname,\n"
" array_to_string(ARRAY(SELECT " " pg_catalog.array_to_string(ARRAY(\n"
" quote_ident(option_name) || ' ' || " " SELECT pg_catalog.quote_ident(option_name)"
" quote_literal(option_value) FROM " " || ' ' || pg_catalog.quote_literal(option_value)\n"
" pg_options_to_table(ftoptions)), ', ') " " FROM pg_catalog.pg_options_to_table(ftoptions)), ', ')\n"
"FROM pg_catalog.pg_foreign_table f,\n" "FROM pg_catalog.pg_foreign_table f,\n"
" pg_catalog.pg_foreign_server s\n" " pg_catalog.pg_foreign_server s\n"
"WHERE f.ftrelid = %s AND s.oid = f.ftserver;", "WHERE f.ftrelid = '%s' AND s.oid = f.ftserver;",
oid); oid);
result = PSQLexec(buf.data); result = PSQLexec(buf.data);
if (!result) if (!result)
...@@ -2834,22 +2818,22 @@ describeOneTableDetails(const char *schemaname, ...@@ -2834,22 +2818,22 @@ describeOneTableDetails(const char *schemaname,
/* print child tables (with additional info if partitions) */ /* print child tables (with additional info if partitions) */
if (pset.sversion >= 100000) if (pset.sversion >= 100000)
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT c.oid::pg_catalog.regclass, pg_get_expr(c.relpartbound, c.oid)" "SELECT c.oid::pg_catalog.regclass, pg_catalog.pg_get_expr(c.relpartbound, c.oid)"
" FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i" " FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i"
" WHERE c.oid=i.inhrelid AND" " WHERE c.oid=i.inhrelid AND i.inhparent = '%s'"
" i.inhparent = '%s' AND" " ORDER BY c.oid::pg_catalog.regclass::pg_catalog.text;", oid);
" EXISTS (SELECT 1 FROM pg_class c WHERE c.oid = '%s')"
" ORDER BY c.oid::pg_catalog.regclass::pg_catalog.text;", oid, oid);
else if (pset.sversion >= 80300) else if (pset.sversion >= 80300)
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT c.oid::pg_catalog.regclass" "SELECT c.oid::pg_catalog.regclass"
" FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i" " FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i"
" WHERE c.oid=i.inhrelid AND" " WHERE c.oid=i.inhrelid AND i.inhparent = '%s'"
" i.inhparent = '%s' AND" " ORDER BY c.oid::pg_catalog.regclass::pg_catalog.text;", oid);
" EXISTS (SELECT 1 FROM pg_class c WHERE c.oid = '%s')"
" ORDER BY c.oid::pg_catalog.regclass::pg_catalog.text;", oid, oid);
else else
printfPQExpBuffer(&buf, "SELECT c.oid::pg_catalog.regclass FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i WHERE c.oid=i.inhrelid AND i.inhparent = '%s' ORDER BY c.relname;", oid); printfPQExpBuffer(&buf,
"SELECT c.oid::pg_catalog.regclass"
" FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i"
" WHERE c.oid=i.inhrelid AND i.inhparent = '%s'"
" ORDER BY c.relname;", oid);
result = PSQLexec(buf.data); result = PSQLexec(buf.data);
if (!result) if (!result)
...@@ -3234,16 +3218,16 @@ listDbRoleSettings(const char *pattern, const char *pattern2) ...@@ -3234,16 +3218,16 @@ listDbRoleSettings(const char *pattern, const char *pattern2)
printfPQExpBuffer(&buf, "SELECT rolname AS \"%s\", datname AS \"%s\",\n" printfPQExpBuffer(&buf, "SELECT rolname AS \"%s\", datname AS \"%s\",\n"
"pg_catalog.array_to_string(setconfig, E'\\n') AS \"%s\"\n" "pg_catalog.array_to_string(setconfig, E'\\n') AS \"%s\"\n"
"FROM pg_db_role_setting AS s\n" "FROM pg_catalog.pg_db_role_setting s\n"
"LEFT JOIN pg_database ON pg_database.oid = setdatabase\n" "LEFT JOIN pg_catalog.pg_database d ON d.oid = setdatabase\n"
"LEFT JOIN pg_roles ON pg_roles.oid = setrole\n", "LEFT JOIN pg_catalog.pg_roles r ON r.oid = setrole\n",
gettext_noop("Role"), gettext_noop("Role"),
gettext_noop("Database"), gettext_noop("Database"),
gettext_noop("Settings")); gettext_noop("Settings"));
havewhere = processSQLNamePattern(pset.db, &buf, pattern, false, false, havewhere = processSQLNamePattern(pset.db, &buf, pattern, false, false,
NULL, "pg_roles.rolname", NULL, NULL); NULL, "r.rolname", NULL, NULL);
processSQLNamePattern(pset.db, &buf, pattern2, havewhere, false, processSQLNamePattern(pset.db, &buf, pattern2, havewhere, false,
NULL, "pg_database.datname", NULL, NULL); NULL, "d.datname", NULL, NULL);
appendPQExpBufferStr(&buf, "ORDER BY 1, 2;"); appendPQExpBufferStr(&buf, "ORDER BY 1, 2;");
} }
else else
...@@ -3475,13 +3459,13 @@ listLanguages(const char *pattern, bool verbose, bool showSystem) ...@@ -3475,13 +3459,13 @@ listLanguages(const char *pattern, bool verbose, bool showSystem)
{ {
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n NOT l.lanispl AS \"%s\",\n" ",\n NOT l.lanispl AS \"%s\",\n"
" l.lanplcallfoid::regprocedure AS \"%s\",\n" " l.lanplcallfoid::pg_catalog.regprocedure AS \"%s\",\n"
" l.lanvalidator::regprocedure AS \"%s\",\n ", " l.lanvalidator::pg_catalog.regprocedure AS \"%s\",\n ",
gettext_noop("Internal language"), gettext_noop("Internal language"),
gettext_noop("Call handler"), gettext_noop("Call handler"),
gettext_noop("Validator")); gettext_noop("Validator"));
if (pset.sversion >= 90000) if (pset.sversion >= 90000)
appendPQExpBuffer(&buf, "l.laninline::regprocedure AS \"%s\",\n ", appendPQExpBuffer(&buf, "l.laninline::pg_catalog.regprocedure AS \"%s\",\n ",
gettext_noop("Inline handler")); gettext_noop("Inline handler"));
printACLColumn(&buf, "l.lanacl"); printACLColumn(&buf, "l.lanacl");
} }
...@@ -4611,10 +4595,10 @@ listForeignDataWrappers(const char *pattern, bool verbose) ...@@ -4611,10 +4595,10 @@ listForeignDataWrappers(const char *pattern, bool verbose)
printACLColumn(&buf, "fdwacl"); printACLColumn(&buf, "fdwacl");
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n CASE WHEN fdwoptions IS NULL THEN '' ELSE " ",\n CASE WHEN fdwoptions IS NULL THEN '' ELSE "
" '(' || array_to_string(ARRAY(SELECT " " '(' || pg_catalog.array_to_string(ARRAY(SELECT "
" quote_ident(option_name) || ' ' || " " pg_catalog.quote_ident(option_name) || ' ' || "
" quote_literal(option_value) FROM " " pg_catalog.quote_literal(option_value) FROM "
" pg_options_to_table(fdwoptions)), ', ') || ')' " " pg_catalog.pg_options_to_table(fdwoptions)), ', ') || ')' "
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("FDW options")); gettext_noop("FDW options"));
...@@ -4692,10 +4676,10 @@ listForeignServers(const char *pattern, bool verbose) ...@@ -4692,10 +4676,10 @@ listForeignServers(const char *pattern, bool verbose)
" s.srvtype AS \"%s\",\n" " s.srvtype AS \"%s\",\n"
" s.srvversion AS \"%s\",\n" " s.srvversion AS \"%s\",\n"
" CASE WHEN srvoptions IS NULL THEN '' ELSE " " CASE WHEN srvoptions IS NULL THEN '' ELSE "
" '(' || array_to_string(ARRAY(SELECT " " '(' || pg_catalog.array_to_string(ARRAY(SELECT "
" quote_ident(option_name) || ' ' || " " pg_catalog.quote_ident(option_name) || ' ' || "
" quote_literal(option_value) FROM " " pg_catalog.quote_literal(option_value) FROM "
" pg_options_to_table(srvoptions)), ', ') || ')' " " pg_catalog.pg_options_to_table(srvoptions)), ', ') || ')' "
" END AS \"%s\",\n" " END AS \"%s\",\n"
" d.description AS \"%s\"", " d.description AS \"%s\"",
gettext_noop("Type"), gettext_noop("Type"),
...@@ -4710,7 +4694,7 @@ listForeignServers(const char *pattern, bool verbose) ...@@ -4710,7 +4694,7 @@ listForeignServers(const char *pattern, bool verbose)
if (verbose) if (verbose)
appendPQExpBufferStr(&buf, appendPQExpBufferStr(&buf,
"LEFT JOIN pg_description d\n " "LEFT JOIN pg_catalog.pg_description d\n "
"ON d.classoid = s.tableoid AND d.objoid = s.oid " "ON d.classoid = s.tableoid AND d.objoid = s.oid "
"AND d.objsubid = 0\n"); "AND d.objsubid = 0\n");
...@@ -4766,10 +4750,10 @@ listUserMappings(const char *pattern, bool verbose) ...@@ -4766,10 +4750,10 @@ listUserMappings(const char *pattern, bool verbose)
if (verbose) if (verbose)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n CASE WHEN umoptions IS NULL THEN '' ELSE " ",\n CASE WHEN umoptions IS NULL THEN '' ELSE "
" '(' || array_to_string(ARRAY(SELECT " " '(' || pg_catalog.array_to_string(ARRAY(SELECT "
" quote_ident(option_name) || ' ' || " " pg_catalog.quote_ident(option_name) || ' ' || "
" quote_literal(option_value) FROM " " pg_catalog.quote_literal(option_value) FROM "
" pg_options_to_table(umoptions)), ', ') || ')' " " pg_catalog.pg_options_to_table(umoptions)), ', ') || ')' "
" END AS \"%s\"", " END AS \"%s\"",
gettext_noop("FDW options")); gettext_noop("FDW options"));
...@@ -4829,10 +4813,10 @@ listForeignTables(const char *pattern, bool verbose) ...@@ -4829,10 +4813,10 @@ listForeignTables(const char *pattern, bool verbose)
if (verbose) if (verbose)
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
",\n CASE WHEN ftoptions IS NULL THEN '' ELSE " ",\n CASE WHEN ftoptions IS NULL THEN '' ELSE "
" '(' || array_to_string(ARRAY(SELECT " " '(' || pg_catalog.array_to_string(ARRAY(SELECT "
" quote_ident(option_name) || ' ' || " " pg_catalog.quote_ident(option_name) || ' ' || "
" quote_literal(option_value) FROM " " pg_catalog.quote_literal(option_value) FROM "
" pg_options_to_table(ftoptions)), ', ') || ')' " " pg_catalog.pg_options_to_table(ftoptions)), ', ') || ')' "
" END AS \"%s\",\n" " END AS \"%s\",\n"
" d.description AS \"%s\"", " d.description AS \"%s\"",
gettext_noop("FDW options"), gettext_noop("FDW options"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment