Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 20c95f2

Browse files
committed
Clean up psql/describe.c's messy query for extended stats.
Remove unnecessary casts, safely schema-qualify the ones that remain, lose an unnecessary level of sub-SELECT, reformat for tidiness.
1 parent e6c9a5a commit 20c95f2

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

src/bin/psql/describe.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2343,15 +2343,18 @@ describeOneTableDetails(const char *schemaname,
23432343
if (pset.sversion >= 100000)
23442344
{
23452345
printfPQExpBuffer(&buf,
2346-
"SELECT oid, stanamespace::regnamespace AS nsp, staname, stakeys,\n"
2347-
" (SELECT pg_catalog.string_agg(pg_catalog.quote_ident(attname::text),', ') \n"
2348-
" FROM ((SELECT pg_catalog.unnest(stakeys) AS attnum) s\n"
2349-
" JOIN pg_catalog.pg_attribute a ON (starelid = a.attrelid AND\n"
2350-
"a.attnum = s.attnum AND not attisdropped))) AS columns,\n"
2351-
" (staenabled::char[] @> '{d}'::char[]) AS ndist_enabled,\n"
2352-
" (staenabled::char[] @> '{f}'::char[]) AS deps_enabled\n"
2353-
"FROM pg_catalog.pg_statistic_ext stat WHERE starelid = '%s'\n"
2354-
"ORDER BY 1;",
2346+
"SELECT oid, "
2347+
"stanamespace::pg_catalog.regnamespace AS nsp, "
2348+
"staname, stakeys,\n"
2349+
" (SELECT pg_catalog.string_agg(pg_catalog.quote_ident(attname),', ')\n"
2350+
" FROM pg_catalog.unnest(stakeys) s(attnum)\n"
2351+
" JOIN pg_catalog.pg_attribute a ON (starelid = a.attrelid AND\n"
2352+
" a.attnum = s.attnum AND NOT attisdropped)) AS columns,\n"
2353+
" (staenabled @> '{d}') AS ndist_enabled,\n"
2354+
" (staenabled @> '{f}') AS deps_enabled\n"
2355+
"FROM pg_catalog.pg_statistic_ext stat "
2356+
"WHERE starelid = '%s'\n"
2357+
"ORDER BY 1;",
23552358
oid);
23562359

23572360
result = PSQLexec(buf.data);

0 commit comments

Comments
 (0)