Fix psql describe commands' handling of ACL columns for old servers.

tglsfdc · tglsfdc · commit 923a71584fd7 · 2024-09-24T17:21:38.000-04:00
Commit d1379eb carelessly broke printACLColumn for pre-9.4 servers, by using the cardinality() function which we introduced in 9.4. We expect psql's describe-related commands to work back to 9.2, so this is bad. Use the longstanding array_length() function instead. Per report from Christoph Berg. Back-patch to v17. Discussion: https://postgr.es/m/ZvLXYglRS6hMMhtr@msg.df7cb.de
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -6660,7 +6660,7 @@ printACLColumn(PQExpBuffer buf, const char *colname)
 {
 	appendPQExpBuffer(buf,
 					  "CASE"
-					  " WHEN pg_catalog.cardinality(%s) = 0 THEN '%s'"
+					  " WHEN pg_catalog.array_length(%s, 1) = 0 THEN '%s'"
 					  " ELSE pg_catalog.array_to_string(%s, E'\\n')"
 					  " END AS \"%s\"",
 					  colname, gettext_noop("(none)"),

Original file line number	Diff line number	Diff line change
`@@ -6660,7 +6660,7 @@ printACLColumn(PQExpBuffer buf, const char *colname)`
`6660`	`6660`	`{`
`6661`	`6661`	`appendPQExpBuffer(buf,`
`6662`	`6662`	`"CASE"`
`6663`		`- " WHEN pg_catalog.cardinality(%s) = 0 THEN '%s'"`
	`6663`	`+ " WHEN pg_catalog.array_length(%s, 1) = 0 THEN '%s'"`
`6664`	`6664`	`" ELSE pg_catalog.array_to_string(%s, E'\\n')"`
`6665`	`6665`	`" END AS \"%s\"",`
`6666`	`6666`	`colname, gettext_noop("(none)"),`