aboutsummaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/psql/command.c25
-rw-r--r--src/bin/psql/describe.c71
-rw-r--r--src/bin/psql/describe.h5
-rw-r--r--src/bin/psql/help.c3
4 files changed, 77 insertions, 27 deletions
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 06d31598566..419e44a6326 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
*
* Copyright 2000-2002 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.86 2002/12/12 21:02:21 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.87 2003/01/07 20:56:06 tgl Exp $
*/
#include "postgres_fe.h"
#include "command.h"
@@ -350,15 +350,27 @@ exec_command(const char *cmd,
case 'a':
success = describeAggregates(pattern, show_verbose);
break;
+ case 'c':
+ success = listConversions(pattern);
+ break;
+ case 'C':
+ success = listCasts(pattern);
+ break;
case 'd':
success = objectDescription(pattern);
break;
+ case 'D':
+ success = listDomains(pattern);
+ break;
case 'f':
success = describeFunctions(pattern, show_verbose);
break;
case 'l':
success = do_lo_list();
break;
+ case 'n':
+ success = listSchemas(pattern);
+ break;
case 'o':
success = describeOperators(pattern);
break;
@@ -378,16 +390,7 @@ exec_command(const char *cmd,
case 'u':
success = describeUsers(pattern);
break;
- case 'D':
- success = listDomains(pattern);
- break;
- case 'c':
- success = listConversions(pattern);
- break;
- case 'C':
- success = listCasts(pattern);
- break;
-
+
default:
status = CMD_UNKNOWN;
}
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index d4f7e1ededd..0614b63da8d 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
*
* Copyright 2000-2002 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.73 2002/12/21 01:07:07 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.74 2003/01/07 20:56:06 tgl Exp $
*/
#include "postgres_fe.h"
#include "describe.h"
@@ -1426,15 +1426,16 @@ listConversions(const char *pattern)
" pg_catalog.pg_encoding_to_char(c.conforencoding) AS \"%s\",\n"
" pg_catalog.pg_encoding_to_char(c.contoencoding) AS \"%s\",\n"
" CASE WHEN c.condefault THEN '%s'\n"
- " ELSE NULL END AS \"%s\"\n"
+ " ELSE '%s' END AS \"%s\"\n"
"FROM pg_catalog.pg_conversion c, pg_catalog.pg_namespace n\n"
"WHERE n.oid = c.connamespace\n",
_("Schema"),
_("Name"),
_("Source"),
- _("Dest"),
- _("default"),
- _("Modifier"));
+ _("Destination"),
+ _("yes"),
+ _("no"),
+ _("Default?"));
processNamePattern(&buf, pattern, true, false,
"n.nspname", "c.conname", NULL,
@@ -1471,9 +1472,9 @@ listCasts(const char *pattern)
initPQExpBuffer(&buf);
/* NEED LEFT JOIN FOR BINARY CASTS */
printfPQExpBuffer(&buf,
- "SELECT t1.typname AS \"%s\",\n"
- " t2.typname AS \"%s\",\n"
- " CASE WHEN p.proname IS NULL THEN '%s'\n"
+ "SELECT pg_catalog.format_type(castsource, NULL) AS \"%s\",\n"
+ " pg_catalog.format_type(casttarget, NULL) AS \"%s\",\n"
+ " CASE WHEN castfunc = 0 THEN '%s'\n"
" ELSE p.proname\n"
" END as \"%s\",\n"
" CASE WHEN c.castcontext = 'e' THEN '%s'\n"
@@ -1481,16 +1482,16 @@ listCasts(const char *pattern)
" ELSE '%s'\n"
" END as \"%s\"\n"
"FROM pg_catalog.pg_cast c LEFT JOIN pg_catalog.pg_proc p\n"
- " ON c.castfunc=p.oid, pg_catalog.pg_type t1, pg_catalog.pg_type t2\n"
- "WHERE c.castsource=t1.oid AND c.casttarget=t2.oid ORDER BY 1, 2",
+ " ON c.castfunc = p.oid\n"
+ "ORDER BY 1, 2",
_("Source"),
_("Target"),
_("BINARY"),
_("Function"),
- _("explicit"),
- _("assignment explicit"),
- _("implicit"),
- _("Context"));
+ _("no"),
+ _("in assignment"),
+ _("yes"),
+ _("Implicit?"));
res = PSQLexec(buf.data, false);
termPQExpBuffer(&buf);
@@ -1507,6 +1508,48 @@ listCasts(const char *pattern)
}
/*
+ * \dn
+ *
+ * Describes schemas (namespaces)
+ */
+bool
+listSchemas(const char *pattern)
+{
+ PQExpBufferData buf;
+ PGresult *res;
+ printQueryOpt myopt = pset.popt;
+
+ initPQExpBuffer(&buf);
+ printfPQExpBuffer(&buf,
+ "SELECT n.nspname AS \"%s\",\n"
+ " u.usename AS \"%s\"\n"
+ "FROM pg_catalog.pg_namespace n LEFT JOIN pg_catalog.pg_user u\n"
+ " ON n.nspowner=u.usesysid\n",
+ _("Name"),
+ _("Owner"));
+
+ processNamePattern(&buf, pattern, false, false,
+ NULL, "n.nspname", NULL,
+ NULL);
+
+ appendPQExpBuffer(&buf, "ORDER BY 1;");
+
+ res = PSQLexec(buf.data, false);
+ termPQExpBuffer(&buf);
+ if (!res)
+ return false;
+
+ myopt.nullPrint = NULL;
+ myopt.title = _("List of schemas");
+
+ printQuery(res, &myopt, pset.queryFout);
+
+ PQclear(res);
+ return true;
+}
+
+
+/*
* processNamePattern
*
* Scan a wildcard-pattern option and generate appropriate WHERE clauses
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index 6461b41d303..40a94b0efd2 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -3,7 +3,7 @@
*
* Copyright 2000-2002 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.19 2002/12/12 21:02:24 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.20 2003/01/07 20:56:07 tgl Exp $
*/
#ifndef DESCRIBE_H
#define DESCRIBE_H
@@ -49,5 +49,8 @@ bool listConversions(const char *pattern);
/* \dC */
bool listCasts(const char *pattern);
+/* \dn */
+bool listSchemas(const char *pattern);
+
#endif /* DESCRIBE_H */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index e921f1da4b8..2dcf798d9dd 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -3,7 +3,7 @@
*
* Copyright 2000 by PostgreSQL Global Development Group
*
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.68 2002/12/13 22:17:57 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.69 2003/01/07 20:56:07 tgl Exp $
*/
#include "postgres_fe.h"
#include "common.h"
@@ -211,6 +211,7 @@ slashUsage(unsigned short int pager)
fprintf(output, _(" \\dd [PATTERN] show comment for object\n"));
fprintf(output, _(" \\dD [PATTERN] list domains\n"));
fprintf(output, _(" \\df [PATTERN] list functions (add \"+\" for more detail)\n"));
+ fprintf(output, _(" \\dn [PATTERN] list schemas\n"));
fprintf(output, _(" \\do [NAME] list operators\n"));
fprintf(output, _(" \\dl list large objects, same as \\lo_list\n"));
fprintf(output, _(" \\dp [PATTERN] list table access privileges\n"));
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 11:02:44 +0000