diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index f4aabf5dc7..9ed0f83996 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -675,7 +675,7 @@ search and ordering purposes.) - +
<structname>pg_amop</structname> Columns @@ -818,7 +818,7 @@ is one row for each support function belonging to an operator family. -
+
<structname>pg_amproc</structname> Columns @@ -4458,7 +4458,7 @@ SCRAM-SHA-256$<iteration count>:&l Operator classes are described at length in . -
+
<structname>pg_opclass</structname> Columns @@ -4720,7 +4720,7 @@ SCRAM-SHA-256$<iteration count>:&l Operator families are described at length in . -
+
<structname>pg_opfamily</structname> Columns diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 1b5d82ed8e..da85f63400 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1219,11 +1219,82 @@ testdb=> - Lists access methods. If pattern is specified, only access - methods whose names match the pattern are shown. If - + is appended to the command name, each access - method is listed with its associated handler function and description. + Lists access methods with their associated handler function. If + + is appended to the command name, additional + description is provided. + If pattern is specified, + the command displays the properties of the access methods whose names + match the search pattern. + + + + + + + \dAc[+] + [access-method-pattern + [input-type-pattern]] + + + + + Shows info index access method operator classes listed in + . + If access-method-patttern + is specified, only operator classes associated with access method whose + name matches pattern are shown. + If input-type-pattern + is specified, only procedures associated with families whose input type + matches the pattern are shown. + If + is appended to the command name, operator family + and owner are listed. + + + + + + + \dAo[+] + [access-method-pattern + [operator-family-pattern]] + + + + + + Lists operators () associated + with access method operator families. If + access-method-patttern is + specified, only operators associated with access method whose name + matches pattern are shown. If + operator-family-pattern is + specified, only operators associated with families whose name matches + the pattern are shown. + If + is appended to the command name, displays + additional info. + + + + + + + \dAp[+] + [access-method-pattern + [operator-family-pattern]] + + + + + Lists procedures () associated + with access method operator families. + If access-method-patttern + is specified, only procedures associated with access method whose name + matches pattern are shown. + If operator-family-pattern + is specified, only procedures associated with families whose name + matches the pattern are shown. + If + is appended to the command name, procedures + listed with its names. diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index ab259c473a..7b57c7cb49 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -719,7 +719,25 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd) success = listTables("tvmsE", NULL, show_verbose, show_system); break; case 'A': - success = describeAccessMethods(pattern, show_verbose); + { + char *pattern2 = NULL; + if (pattern) + pattern2 = psql_scan_slash_option(scan_state, OT_NORMAL, NULL, true); + + if (strncmp(cmd, "dAo", 3) == 0) + success = listFamilyClassOperators(pattern, pattern2, show_verbose); + else if (strncmp(cmd, "dAp", 3) == 0) + success = listOperatorFamilyProcedures(pattern, pattern2, show_verbose); + else if (strncmp(cmd, "dAc", 3) == 0) + success = describeAccessMethodOperatorClasses(pattern, pattern2, show_verbose); + else if (pattern) + success = describeAccessMethodProperties(pattern); + else + success = listAccessMethods(show_verbose); + + if (pattern2) + free(pattern2); + } break; case 'a': success = describeAggregates(pattern, show_verbose, show_system); diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index f94a7a9c30..d3e349498f 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -14,6 +14,7 @@ #include +#include "catalog/pg_am.h" #include "catalog/pg_attribute_d.h" #include "catalog/pg_cast_d.h" #include "catalog/pg_class_d.h" @@ -146,7 +147,7 @@ describeAggregates(const char *pattern, bool verbose, bool showSystem) * Takes an optional regexp to select particular access methods */ bool -describeAccessMethods(const char *pattern, bool verbose) +listAccessMethods(bool verbose) { PQExpBufferData buf; PGresult *res; @@ -168,31 +169,23 @@ describeAccessMethods(const char *pattern, bool verbose) printfPQExpBuffer(&buf, "SELECT amname AS \"%s\",\n" " CASE amtype" - " WHEN 'i' THEN '%s'" - " WHEN 't' THEN '%s'" - " END AS \"%s\"", + " WHEN 'i' THEN '%s'" + " WHEN 't' THEN '%s'" + " END AS \"%s\",\n" + " amhandler AS \"%s\"", gettext_noop("Name"), - gettext_noop("Index"), - gettext_noop("Table"), - gettext_noop("Type")); + gettext_noop("index"), + gettext_noop("table"), + gettext_noop("Type"), + gettext_noop("Handler")); if (verbose) - { appendPQExpBuffer(&buf, - ",\n amhandler AS \"%s\",\n" - " pg_catalog.obj_description(oid, 'pg_am') AS \"%s\"", - gettext_noop("Handler"), + ",\n pg_catalog.obj_description(oid, 'pg_am') AS \"%s\"", gettext_noop("Description")); - } - appendPQExpBufferStr(&buf, - "\nFROM pg_catalog.pg_am\n"); - - processSQLNamePattern(pset.db, &buf, pattern, false, false, - NULL, "amname", NULL, - NULL); - - appendPQExpBufferStr(&buf, "ORDER BY 1;"); + "\nFROM pg_catalog.pg_am\n" + "ORDER BY 1;"); res = PSQLexec(buf.data); termPQExpBuffer(&buf); @@ -5740,3 +5733,386 @@ printACLColumn(PQExpBuffer buf, const char *colname) "pg_catalog.array_to_string(%s, '\\n') AS \"%s\"", colname, gettext_noop("Access privileges")); } + +/* + * \dA NAME + * Describes access method properties. + * + * Takes an optional regexp to select particular access methods + */ +bool +describeAccessMethodProperties(const char *pattern) +{ + PQExpBufferData buf; + PGresult *res; + bool found_result = false; + printQueryOpt myopt = pset.popt; + static const bool translate_columns_i[] = {true, true, true, true, true, true}; + static const bool translate_columns_t[] = {true, true, true, true}; + + if (pset.sversion < 90600) + { + char sverbuf[32]; + + psql_error("The server (version %s) does not support access methods.\n", + formatPGVersionNumber(pset.sversion, false, + sverbuf, sizeof(sverbuf))); + return true; + } + + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + pset.sversion >= 90600 ? + "SELECT a.amname AS \"%1$s\",\n" + " CASE WHEN pg_catalog.pg_indexam_has_property(a.oid, 'can_order')\n" + " THEN '%2$s' ELSE '%3$s' END AS \"%4$s\",\n" + " CASE WHEN pg_catalog.pg_indexam_has_property(a.oid, 'can_unique')\n" + " THEN '%2$s' ELSE '%3$s' END AS \"%5$s\",\n" + " CASE WHEN pg_catalog.pg_indexam_has_property(a.oid, 'can_multi_col')\n" + " THEN '%2$s' ELSE '%3$s' END AS \"%6$s\",\n" + " CASE WHEN pg_catalog.pg_indexam_has_property(a.oid, 'can_exclude')\n" + " THEN '%2$s' ELSE '%3$s' END AS \"%7$s\",\n" + : + "SELECT a.amname AS \"%1$s\",\n" + " CASE WHEN a.amcanorder THEN '%2$s' ELSE '%3$s' END AS \"%4$s\",\n" + " CASE WHEN a.amcanunique THEN '%2$s' ELSE '%3$s' END AS \"%5$s\",\n" + " CASE WHEN a.amcanmulticol THEN '%2$s' ELSE '%3$s' END AS \"%6$s\",\n" + " CASE WHEN a.amgettuple <> 0 THEN '%2$s' ELSE '%3$s' END AS \"%7$s\",\n", + gettext_noop("AM"), + gettext_noop("yes"), + gettext_noop("no"), + gettext_noop("Ordering"), + gettext_noop("Unique indexes"), + gettext_noop("Multicol indexes"), + gettext_noop("Exclusion constraints")); + + appendPQExpBuffer(&buf, + pset.sversion >= 110000 + ? " CASE WHEN pg_catalog.pg_indexam_has_property(a.oid, 'can_include')\n" + " THEN '%1$s' ELSE '%2$s' END AS \"%3$s\"" + : " CASE WHEN false THEN '%1$s' ELSE '%2$s' END AS \"%3$s\"", + gettext_noop("yes"), gettext_noop("no"), + gettext_noop("Include non-key columns")); + + appendPQExpBufferStr(&buf, + "\nFROM pg_catalog.pg_am a\n" + " WHERE a.amtype = 'i'\n"); + + processSQLNamePattern(pset.db, &buf, pattern, true, false, + NULL, "amname", NULL, NULL); + + appendPQExpBufferStr(&buf, "ORDER BY 1;"); + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.nullPrint = NULL; + myopt.title = _("Index access method properties"); + myopt.translate_header = true; + myopt.translate_columns = translate_columns_i; + myopt.n_translate_columns = lengthof(translate_columns_i); + + if (PQntuples(res) > 0) + { + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + found_result = true; + } + + PQclear(res); + + /* Table AM */ + initPQExpBuffer(&buf); + printfPQExpBuffer(&buf, + "SELECT a.amname AS \"%s\",\n" + " 'table' AS \"%s\",\n" + " a.amhandler AS \"%s\",\n" + " pg_catalog.obj_description(a.oid, 'pg_am') AS \"%s\"\n" + "FROM pg_catalog.pg_am a\n" + " WHERE a.amtype = 't'\n", + gettext_noop("Name"), + gettext_noop("Type"), + gettext_noop("Handler"), + gettext_noop("Description")); + + processSQLNamePattern(pset.db, &buf, pattern, true, false, + NULL, "a.amname", NULL, NULL); + appendPQExpBufferStr(&buf, "ORDER BY 1;"); + + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + + myopt.nullPrint = NULL; + myopt.title = _("Table access method properties"); + myopt.translate_header = true; + myopt.translate_columns = translate_columns_t; + myopt.n_translate_columns = lengthof(translate_columns_t); + + if (PQntuples(res) > 0) + { + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + found_result = true; + } + + PQclear(res); + + if (!found_result) + psql_error("Did not find any AM named \"%s\".\n", pattern); + + return true; +} + +/* + * \dAo + * Lists operators associated with access method operator families. + * + * Takes an optional regexp to select particular access methods + * and operator families + */ +bool +listFamilyClassOperators(const char *access_method_pattern, + const char *family_pattern, bool verbose) +{ + PQExpBufferData buf; + PGresult *res; + printQueryOpt myopt = pset.popt; + bool have_where = false; + + static const bool translate_columns[] = {false, false, false, false, false, + false, false, true, false}; + + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + "SELECT\n" + " am.amname AS \"%s\",\n" + " CASE\n" + " WHEN pg_catalog.pg_opfamily_is_visible(of.oid)\n" + " THEN format('%%I', of.opfname)\n" + " ELSE format('%%I.%%I', nsf.nspname, of.opfname)\n" + " END AS \"%s\",\n" + " format ('%%s (%%s, %%s)',\n" + " CASE\n" + " WHEN pg_catalog.pg_operator_is_visible(op.oid) \n" + " THEN op.oprname::pg_catalog.text \n" + " ELSE o.amopopr::pg_catalog.regoper::pg_catalog.text \n" + " END,\n" + " pg_catalog.format_type(o.amoplefttype, NULL),\n" + " pg_catalog.format_type(o.amoprighttype, NULL)\n" + " ) AS \"%s\"\n", + gettext_noop("AM"), + gettext_noop("Opfamily Name"), + gettext_noop("Operator")); + + if (verbose) + appendPQExpBuffer(&buf, + ", o.amopstrategy AS \"%s\",\n" + " CASE o.amoppurpose\n" + " WHEN 'o' THEN '%s'\n" + " WHEN 's' THEN '%s'\n" + " END AS \"%s\",\n" + " ofs.opfname AS \"%s\"\n", + gettext_noop("Strategy"), + gettext_noop("ordering"), + gettext_noop("search"), + gettext_noop("Purpose"), + gettext_noop("Sort opfamily")); + appendPQExpBuffer(&buf, + "FROM pg_catalog.pg_amop o\n" + " LEFT JOIN pg_catalog.pg_operator op ON op.oid = o.amopopr\n" + " LEFT JOIN pg_catalog.pg_opfamily of ON of.oid = o.amopfamily\n" + " LEFT JOIN pg_catalog.pg_am am ON am.oid = of.opfmethod AND am.oid = o.amopmethod\n" + " LEFT JOIN pg_catalog.pg_namespace nsf ON of.opfnamespace = nsf.oid\n"); + if (verbose) + appendPQExpBuffer(&buf, + " LEFT JOIN pg_catalog.pg_opfamily ofs ON ofs.oid = o.amopsortfamily\n"); + + if (access_method_pattern) + have_where = processSQLNamePattern(pset.db, &buf, access_method_pattern, + false, false, NULL, "am.amname", + NULL, NULL); + + if (family_pattern) + processSQLNamePattern(pset.db, &buf, family_pattern, have_where, false, + "nsf.nspname", "of.opfname", NULL, NULL); + + appendPQExpBufferStr(&buf, "ORDER BY 1, 2, o.amopstrategy, 3;"); + + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.nullPrint = NULL; + myopt.title = _("List operators of family related to access method"); + myopt.translate_header = true; + myopt.translate_columns = translate_columns; + myopt.n_translate_columns = lengthof(translate_columns); + + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + + PQclear(res); + return true; +} + +/* + * \dAp + * Lists procedures associated with access method operator families. + * + * Takes an optional regexp to select particular access methods + * and operator families + */ +bool +listOperatorFamilyProcedures(const char *access_method_pattern, + const char *family_pattern, bool verbose) +{ + PQExpBufferData buf; + PGresult *res; + printQueryOpt myopt = pset.popt; + bool have_where = false; + static const bool translate_columns[] = {false, false, false, false, false, false, false}; + + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + "SELECT DISTINCT\n" + " am.amname AS \"%s\",\n" + " CASE\n" + " WHEN pg_catalog.pg_opfamily_is_visible(of.oid)\n" + " THEN format('%%I', of.opfname)\n" + " ELSE format('%%I.%%I', ns.nspname, of.opfname)\n" + " END AS \"%s\",\n" + " pg_catalog.format_type(ap.amproclefttype, NULL) AS \"%s\",\n" + " pg_catalog.format_type(ap.amprocrighttype, NULL) AS \"%s\",\n" + " ap.amprocnum AS \"%s\"\n", + gettext_noop("AM"), + gettext_noop("Operator family"), + gettext_noop("Left arg type"), + gettext_noop("Right arg type"), + gettext_noop("Support function")); + if (verbose) + appendPQExpBuffer(&buf, + ", ap.amproc::pg_catalog.regproc::pg_catalog.text AS \"%s\"\n", + gettext_noop("Proc name")); + appendPQExpBuffer(&buf, + "FROM pg_catalog.pg_amproc ap\n" + " LEFT JOIN pg_catalog.pg_opfamily of ON of.oid = ap.amprocfamily\n" + " LEFT JOIN pg_catalog.pg_am am ON am.oid = of.opfmethod\n" + " LEFT JOIN pg_catalog.pg_namespace ns ON of.opfnamespace = ns.oid\n"); + + if (access_method_pattern) + have_where = processSQLNamePattern(pset.db, &buf, access_method_pattern, + false, false, NULL, "am.amname", + NULL, NULL); + if (family_pattern) + processSQLNamePattern(pset.db, &buf, family_pattern, have_where, false, + "ns.nspname", "of.opfname", NULL, NULL); + + appendPQExpBufferStr(&buf, + "ORDER BY 1, 2, 3, 4, 5;"); + + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.nullPrint = NULL; + myopt.title = _("List of operator family procedures"); + myopt.translate_header = true; + myopt.translate_columns = translate_columns; + myopt.n_translate_columns = lengthof(translate_columns); + + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + + PQclear(res); + return true; +} + +/* + * \dAc + * List index access method operator classes. + * Takes an optional regexp to select particular access method and operator class. + */ +bool +describeAccessMethodOperatorClasses(const char *access_method_pattern, + const char *type_pattern, bool verbose) +{ + PQExpBufferData buf; + PGresult *res; + printQueryOpt myopt = pset.popt; + bool have_where = false; + static const bool translate_columns[] = {false, false, false, false, false, + false, false, false}; + + initPQExpBuffer(&buf); + + printfPQExpBuffer(&buf, + "SELECT DISTINCT" + " am.amname AS \"%s\",\n" + " c.opcintype::pg_catalog.regtype AS \"%s\",\n" + " (CASE WHEN c.opckeytype <> 0 AND c.opckeytype <> c.opcintype\n" + " THEN c.opckeytype\n" + " ELSE NULL -- c.opcintype\n" + " END)::pg_catalog.regtype AS \"%s\",\n" + " CASE\n" + " WHEN pg_catalog.pg_opclass_is_visible(c.oid)\n" + " THEN format('%%I', c.opcname)\n" + " ELSE format('%%I.%%I', n.nspname, c.opcname)\n" + " END AS \"%s\",\n" + " (CASE WHEN c.opcdefault\n" + " THEN '%s'\n" + " ELSE '%s'\n" + " END) AS \"%s\"", + gettext_noop("AM"), + gettext_noop("Input type"), + gettext_noop("Storage type"), + gettext_noop("Operator class"), + gettext_noop("yes"), + gettext_noop("no"), + gettext_noop("Default?")); + if (verbose) + appendPQExpBuffer(&buf, + ",\n CASE\n" + " WHEN pg_catalog.pg_opfamily_is_visible(of.oid)\n" + " THEN format('%%I', of.opfname)\n" + " ELSE format('%%I.%%I', ofn.nspname, of.opfname)\n" + " END AS \"%s\",\n" + " pg_catalog.pg_get_userbyid(c.opcowner) AS \"%s\"\n", + gettext_noop("Operator family"), + gettext_noop("Owner")); + appendPQExpBuffer(&buf, + "\nFROM pg_catalog.pg_opclass c\n" + " LEFT JOIN pg_catalog.pg_am am on am.oid = c.opcmethod\n" + " LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.opcnamespace\n" + " LEFT JOIN pg_catalog.pg_type t1 ON t1.oid = c.opcintype\n" + ); + if (verbose) + appendPQExpBuffer(&buf, + " LEFT JOIN pg_catalog.pg_opfamily of ON of.oid = c.opcfamily\n" + " LEFT JOIN pg_catalog.pg_namespace ofn ON ofn.oid = of.opfnamespace\n"); + + if (access_method_pattern) + have_where = processSQLNamePattern(pset.db, &buf, access_method_pattern, + false, false, NULL, "am.amname", NULL, NULL); + if (type_pattern) + processSQLNamePattern(pset.db, &buf, type_pattern, have_where, false, + NULL, "t1.typname", NULL, NULL); + + appendPQExpBufferStr(&buf, "ORDER BY 1, 2, 4;"); + res = PSQLexec(buf.data); + termPQExpBuffer(&buf); + if (!res) + return false; + + myopt.nullPrint = NULL; + myopt.title = _("Index access method operator classes"); + myopt.translate_header = true; + myopt.translate_columns = translate_columns; + myopt.n_translate_columns = lengthof(translate_columns); + + printQuery(res, &myopt, pset.queryFout, false, pset.logfile); + + PQclear(res); + return true; +} diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 4ff1f91f38..6cce80f260 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -13,7 +13,7 @@ extern bool describeAggregates(const char *pattern, bool verbose, bool showSystem); /* \dA */ -extern bool describeAccessMethods(const char *pattern, bool verbose); +extern bool listAccessMethods(bool verbose); /* \db */ extern bool describeTablespaces(const char *pattern, bool verbose); @@ -111,4 +111,21 @@ bool describePublications(const char *pattern); /* \dRs */ bool describeSubscriptions(const char *pattern, bool verbose); +/* \dA foo*/ +extern bool describeAccessMethodProperties(const char *pattern); + +/* \dAp */ +extern bool listOperatorFamilyProcedures(const char *access_method_pattern, + const char *family_pattern, + bool verbose); + +/* \dAo */ +extern bool listFamilyClassOperators(const char *accessMethod_pattern, + const char *family_pattern, bool verbose); + +/* \dAc */ +extern bool describeAccessMethodOperatorClasses(const char *access_method_pattern, + const char *opclass_pattern, + bool verbose); + #endif /* DESCRIBE_H */ diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 6fc4ebab1e..a8d2b53b62 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -224,7 +224,11 @@ slashUsage(unsigned short int pager) fprintf(output, _(" \\d[S+] list tables, views, and sequences\n")); fprintf(output, _(" \\d[S+] NAME describe table, view, sequence, or index\n")); fprintf(output, _(" \\da[S] [PATTERN] list aggregates\n")); - fprintf(output, _(" \\dA[+] [PATTERN] list access methods\n")); + fprintf(output, _(" \\dA[+] list access methods\n")); + fprintf(output, _(" \\dA NAME describe properties of access method\n")); + fprintf(output, _(" \\dAc[+] [AMPTRN [TYPEPTRN]] list operator classes of index access methods\n")); + fprintf(output, _(" \\dAo[+] [AMPTRN [OPFPTRN]] list operators of family related to access method\n")); + fprintf(output, _(" \\dAp[+] [AMPTRN [OPFPTRN]] list procedures of operator family related to access method\n")); fprintf(output, _(" \\db[+] [PATTERN] list tablespaces\n")); fprintf(output, _(" \\dc[S+] [PATTERN] list conversions\n")); fprintf(output, _(" \\dC[+] [PATTERN] list casts\n")); diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c index d6d8fd02f5..770d08f843 100644 --- a/src/bin/psql/tab-complete.c +++ b/src/bin/psql/tab-complete.c @@ -472,6 +472,23 @@ static const SchemaQuery Query_for_list_of_relations = { .result = "pg_catalog.quote_ident(c.relname)", }; +static const SchemaQuery Query_for_list_of_operator_families = { + /* min_server_version */ + 0, + /* catname */ + "pg_catalog.pg_opfamily c", + /* selcondition */ + NULL, + /* viscondition */ + "true", + /* namespace */ + "c.opfnamespace", + /* result */ + "pg_catalog.quote_ident(c.opfname)", + /* qualresult */ + NULL +}; + /* Relations supporting INSERT, UPDATE or DELETE */ static const SchemaQuery Query_for_list_of_updatables = { .catname = "pg_catalog.pg_class c", @@ -1378,7 +1395,8 @@ psql_completion(const char *text, int start, int end) "\\a", "\\connect", "\\conninfo", "\\C", "\\cd", "\\copy", "\\copyright", "\\crosstabview", - "\\d", "\\da", "\\dA", "\\db", "\\dc", "\\dC", "\\dd", "\\ddp", "\\dD", + "\\d", "\\da", "\\dA", "\\dAp", "\\dAo", "\\dAp", "\\dAc", + "\\db", "\\dc", "\\dC", "\\dd", "\\ddp", "\\dD", "\\des", "\\det", "\\deu", "\\dew", "\\dE", "\\df", "\\dF", "\\dFd", "\\dFp", "\\dFt", "\\dg", "\\di", "\\dl", "\\dL", "\\dm", "\\dn", "\\do", "\\dO", "\\dp", @@ -3492,6 +3510,12 @@ psql_completion(const char *text, int start, int end) } else if (TailMatchesCS("\\da*")) COMPLETE_WITH_VERSIONED_SCHEMA_QUERY(Query_for_list_of_aggregates, NULL); + else if (TailMatchesCS("\\dAp*", MatchAny)) + COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_operator_families, NULL); + else if (TailMatchesCS("\\dAo*", MatchAny)) + COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_operator_families, NULL); + else if (TailMatchesCS("\\dAc*", MatchAny)) + COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_datatypes, NULL); else if (TailMatchesCS("\\dA*")) COMPLETE_WITH_QUERY(Query_for_list_of_access_methods); else if (TailMatchesCS("\\db*")) diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out index aa101de906..7496ede282 100644 --- a/src/test/regress/expected/psql.out +++ b/src/test/regress/expected/psql.out @@ -4578,3 +4578,56 @@ last error message: division by zero \echo 'last error code:' :LAST_ERROR_SQLSTATE last error code: 22012 \unset FETCH_COUNT +-- check printing info about access methods +\dA gin + Index access method properties + AM | Ordering | Unique indexes | Multicol indexes | Exclusion constraints | Include non-key columns +-----+----------+----------------+------------------+-----------------------+------------------------- + gin | no | no | yes | no | no +(1 row) + +\dAo brin uuid_minmax_ops +List operators of family related to access method + AM | Opfamily Name | Operator +------+-----------------+----------------- + brin | uuid_minmax_ops | < (uuid, uuid) + brin | uuid_minmax_ops | <= (uuid, uuid) + brin | uuid_minmax_ops | = (uuid, uuid) + brin | uuid_minmax_ops | >= (uuid, uuid) + brin | uuid_minmax_ops | > (uuid, uuid) +(5 rows) + +\dAo * pg_catalog.jsonb_path_ops +List operators of family related to access method + AM | Opfamily Name | Operator +-----+----------------+------------------- + gin | jsonb_path_ops | @> (jsonb, jsonb) +(1 row) + +\dAp brin uuid_minmax_ops + List of operator family procedures + AM | Operator family | Left arg type | Right arg type | Support function +------+-----------------+---------------+----------------+------------------ + brin | uuid_minmax_ops | uuid | uuid | 1 + brin | uuid_minmax_ops | uuid | uuid | 2 + brin | uuid_minmax_ops | uuid | uuid | 3 + brin | uuid_minmax_ops | uuid | uuid | 4 +(4 rows) + +\dAp * pg_catalog.uuid_ops + List of operator family procedures + AM | Operator family | Left arg type | Right arg type | Support function +-------+-----------------+---------------+----------------+------------------ + btree | uuid_ops | uuid | uuid | 1 + btree | uuid_ops | uuid | uuid | 2 + hash | uuid_ops | uuid | uuid | 1 + hash | uuid_ops | uuid | uuid | 2 +(4 rows) + +\dAc brin pg*.oid* + Index access method operator classes + AM | Input type | Storage type | Operator class | Default? +------+------------+--------------+----------------+---------- + brin | oid | | oid_minmax_ops | yes +(1 row) + diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql index fb7d17fc76..74cc7142da 100644 --- a/src/test/regress/sql/psql.sql +++ b/src/test/regress/sql/psql.sql @@ -1031,3 +1031,11 @@ select 1/(15-unique2) from tenk1 order by unique2 limit 19; \echo 'last error code:' :LAST_ERROR_SQLSTATE \unset FETCH_COUNT + +-- check printing info about access methods +\dA gin +\dAo brin uuid_minmax_ops +\dAo * pg_catalog.jsonb_path_ops +\dAp brin uuid_minmax_ops +\dAp * pg_catalog.uuid_ops +\dAc brin pg*.oid*