From 735848230ea1b5f3794eeeba2f45290e4d0dfe96 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 19 Mar 2002 02:32:21 +0000 Subject: [PATCH] Add psql \dD listing of domains, from Jonathan Eisler. --- doc/src/sgml/ref/psql-ref.sgml | 23 ++++++++++++++++ src/bin/psql/command.c | 4 +++ src/bin/psql/describe.c | 48 ++++++++++++++++++++++++++++++++++ src/bin/psql/describe.h | 3 +++ src/bin/psql/help.c | 1 + 5 files changed, 79 insertions(+) diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index 6536f1a072..212195e70d 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -415,6 +415,29 @@ testdb=> + + \dD [ pattern ] + + + Lists all database domains. + + + + Descriptions for objects can be generated with the COMMENT ON + SQL command. + + + + + PostgreSQL stores the object descriptions in the + pg_description system table. + + + + + + + \df [ pattern ] diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c index 90da4ee91c..a1ca03df55 100644 --- a/src/bin/psql/command.c +++ b/src/bin/psql/command.c @@ -380,6 +380,10 @@ exec_command(const char *cmd, case 'u': success = describeUsers(name); break; + case 'D': + success = listDomains(name); + break; + default: status = CMD_UNKNOWN; } diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c index a98de98afc..74d41a371b 100644 --- a/src/bin/psql/describe.c +++ b/src/bin/psql/describe.c @@ -1036,3 +1036,51 @@ listTables(const char *infotype, const char *name, bool desc) PQclear(res); return true; } + +/* + * \dD [domain] + * + * Describes domains, possibly based on a simplistic prefix search on the + * argument. + */ + +bool +listDomains(const char *name) +{ + char buf[512 + REGEXP_CUTOFF]; + PGresult *res; + printQueryOpt myopt = pset.popt; + + snprintf(buf, sizeof(buf), + "SELECT t.typname as \"%s\",\n" + " format_type( t.typbasetype, t.typmod) as \"%s\",\n" + " CASE WHEN t.typnotnull AND t.typdefault IS NOT NULL THEN 'not null default '||t.typdefault\n" + " WHEN t.typnotnull AND t.typdefault IS NULL THEN 'not null'\n" + " WHEN NOT t.typnotnull AND t.typdefault IS NOT NULL THEN 'default '||t.typdefault\n" + " ELSE ''\n" + " END as \"%s\"\n" + "FROM pg_type t\n" + "WHERE t.typtype = 'd'\n", + _("Name"), + _("Type"), + _("Modifier")); + if (name) + { + strcat(buf, "AND t.typname ~ '^"); + strncat(buf, name, REGEXP_CUTOFF); + strcat(buf, "'\n"); + } + strcat(buf, "ORDER BY 1;"); + + res = PSQLexec(buf); + if (!res) + return false; + + myopt.nullPrint = NULL; + myopt.title = _("List of database domains"); + + printQuery(res, &myopt, pset.queryFout); + + PQclear(res); + return true; +} diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h index 943a4ce2d5..8adbd3b72e 100644 --- a/src/bin/psql/describe.h +++ b/src/bin/psql/describe.h @@ -40,4 +40,7 @@ bool listAllDbs(bool desc); /* \dt, \di, \ds, \dS, etc. */ bool listTables(const char *infotype, const char *name, bool desc); +/* \dD */ +bool listDomains(const char *name); + #endif /* DESCRIBE_H */ diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index a99c401387..8d3a50db1f 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -202,6 +202,7 @@ slashUsage(void) fprintf(fout, _(" \\d{p|S|l} list access privileges, system tables, or large objects\n")); fprintf(fout, _(" \\da list aggregate functions\n")); fprintf(fout, _(" \\dd [NAME] show comment for table, type, function, or operator\n")); + fprintf(fout, _(" \\dD [NAME] list domains\n")); fprintf(fout, _(" \\df list functions\n")); fprintf(fout, _(" \\do list operators\n")); fprintf(fout, _(" \\dT list data types\n")); -- 2.39.5