Date: Sat, 1 Jun 2019 15:10:07 -0400
From: Michael Paquier <michael@paquier.xyz>
To: Postgres hackers <pgsql-hackers@lists.postgresql.org>
Subject: psql completion bugs with access methods
Message-ID: <20190601191007.GC1905@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="LSp5EJdfMPwZcMS1"
Content-Disposition: inline
Precedence: bulk


--LSp5EJdfMPwZcMS1
Content-Type: multipart/mixed; boundary="8nsIa27JVQLqB7/C"
Content-Disposition: inline


--8nsIa27JVQLqB7/C
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hi all,

I have bumped into a couple of issues with psql completion for access
methods:
1) CREATE INDEX USING suggests both index and table AMs.
2) CREATE TABLE USING has no completion support, USING not being
included in the completion, and the follow-up table AMs are missing as
well.
3) CREATE ACCESS METHOD TYPE suggests only INDEX.

Attached is a patch to close the gap.  Thoughts?
--
Michael

--8nsIa27JVQLqB7/C
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="ams-completion-v1.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index c6347b6190..5e38f46399 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -41,6 +41,7 @@
=20
 #include <ctype.h>
=20
+#include "catalog/pg_am_d.h"
 #include "catalog/pg_class_d.h"
=20
 #include "libpq-fe.h"
@@ -824,6 +825,18 @@ static const SchemaQuery Query_for_list_of_statistics =
=3D {
 "   FROM pg_catalog.pg_am "\
 "  WHERE substring(pg_catalog.quote_ident(amname),1,%d)=3D'%s'"
=20
+#define Query_for_list_of_index_access_methods \
+" SELECT pg_catalog.quote_ident(amname) "\
+"   FROM pg_catalog.pg_am "\
+"  WHERE substring(pg_catalog.quote_ident(amname),1,%d)=3D'%s' AND "\
+"   amtype=3D" CppAsString2(AMTYPE_INDEX)
+
+#define Query_for_list_of_table_access_methods \
+" SELECT pg_catalog.quote_ident(amname) "\
+"   FROM pg_catalog.pg_am "\
+"  WHERE substring(pg_catalog.quote_ident(amname),1,%d)=3D'%s' AND "\
+"   amtype=3D" CppAsString2(AMTYPE_TABLE)
+
 /* the silly-looking length condition is just to eat up the current word */
 #define Query_for_list_of_arguments \
 "SELECT pg_catalog.oidvectortypes(proargtypes)||')' "\
@@ -2234,7 +2247,7 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH("TYPE");
 	/* Complete "CREATE ACCESS METHOD <name> TYPE" */
 	else if (Matches("CREATE", "ACCESS", "METHOD", MatchAny, "TYPE"))
-		COMPLETE_WITH("INDEX");
+		COMPLETE_WITH("INDEX", "TABLE");
 	/* Complete "CREATE ACCESS METHOD <name> TYPE <type>" */
 	else if (Matches("CREATE", "ACCESS", "METHOD", MatchAny, "TYPE", MatchAny=
))
 		COMPLETE_WITH("HANDLER");
@@ -2322,7 +2335,7 @@ psql_completion(const char *text, int start, int end)
 	else if (TailMatches("INDEX", MatchAny, MatchAny, "ON", MatchAny, "USING"=
) ||
 			 TailMatches("INDEX", MatchAny, "ON", MatchAny, "USING") ||
 			 TailMatches("INDEX", "ON", MatchAny, "USING"))
-		COMPLETE_WITH_QUERY(Query_for_list_of_access_methods);
+		COMPLETE_WITH_QUERY(Query_for_list_of_index_access_methods);
 	else if (TailMatches("ON", MatchAny, "USING", MatchAny) &&
 			 !TailMatches("POLICY", MatchAny, MatchAny, MatchAny, MatchAny, MatchAn=
y) &&
 			 !TailMatches("FOR", MatchAny, MatchAny, MatchAny))
@@ -2490,10 +2503,14 @@ psql_completion(const char *text, int start, int en=
d)
 	/* Complete CREATE TABLE name (...) with supported options */
 	else if (TailMatches("CREATE", "TABLE", MatchAny, "(*)") ||
 			 TailMatches("CREATE", "UNLOGGED", "TABLE", MatchAny, "(*)"))
-		COMPLETE_WITH("INHERITS (", "PARTITION BY", "TABLESPACE", "WITH (");
+		COMPLETE_WITH("INHERITS (", "PARTITION BY", "USING", "TABLESPACE", "WITH=
 (");
 	else if (TailMatches("CREATE", "TEMP|TEMPORARY", "TABLE", MatchAny, "(*)"=
))
 		COMPLETE_WITH("INHERITS (", "ON COMMIT", "PARTITION BY",
 					  "TABLESPACE", "WITH (");
+	/* Complete CREATE TABLE (...) USING with table access methods */
+	else if (TailMatches("CREATE", "TABLE", MatchAny, "(*)", "USING") ||
+			 TailMatches("CREATE", "TEMP|TEMPORARY|UNLOGGED", "TABLE", MatchAny, "(=
*)", "USING"))
+		COMPLETE_WITH_QUERY(Query_for_list_of_table_access_methods);
 	/* Complete CREATE TABLE (...) WITH with storage parameters */
 	else if (TailMatches("CREATE", "TABLE", MatchAny, "(*)", "WITH", "(") ||
 			 TailMatches("CREATE", "TEMP|TEMPORARY|UNLOGGED", "TABLE", MatchAny, "(=
*)", "WITH", "("))

--8nsIa27JVQLqB7/C--

--LSp5EJdfMPwZcMS1
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAlzyzY8ACgkQnvQgOdby
QH25uA/9FSkLjzKY//ahMh2MJxCmp4aw2L0bypH80NH50Q3kECivjQ7aRvNngOfg
L0pA5OqPOI6vD4TP/6h29hz1dwm2py5ASbgEFJvRNMZoo9BGxsRFkHk9EzWcZ8ZL
K/EJCU6EfGdTH0ppyVEtulkaSlr9uhcuvby1GxHYfgujGZw8QwCI0tGDOQAhjk65
FagpLuZXtCkopzAiNNfllEe+k3GjPAmabN2i0iZU5Hkk7dD2nLA54HwXY11Lfpj5
o1G3wEAFGs05xoTSCXmAUfHr5XXnEif+Mx3wLPymZrJy57ZD1MZ/594FEv2ptQm6
MSEj4CpXPgR5kM3IUK9ryg3T/bxgbs4tEKlunc0UPNAlmQb19xijwIA0wl6PYcir
1lWAcl1yKL+rydqtWR8W4hTh/U3p1Ktnmj1JC1w6oOzSbMmtjhMx1BuwroOKMc4j
E++zdnmpvTw1ZXgsalWVE0E3ora2q7kn0aIB2UVxsJdqLVC9e2tNFTAQU9/3tmRU
mnx6WaNWd1+7wzaxwXkpN2WoM3DUdFezpGIpHaneanYA7o6i21dSr+JT7PfGmMJA
Uu+aal+rZ7J8XMUyOPkF+jDIHe7wzYPTCvT9c8yHzr3phxhfdagPswaOoS+KG6iO
QYn/1mOmz2et3vVOyegqnnGxxWcKmEuWrokPJlVwRGAboRU20Yo=
=jkzU
-----END PGP SIGNATURE-----

--LSp5EJdfMPwZcMS1--