Back out psql domain improvements until domain is applied.

bmomjian · bmomjian · commit 7d1b8fe71622 · 2002-03-07T17:54:42.000Z
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.68 2002/03/06 20:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.69 2002/03/07 17:54:39 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "command.h"
@@ -380,10 +380,6 @@ 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
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.44 2002/03/06 20:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.c,v 1.45 2002/03/07 17:54:39 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1036,51 +1036,3 @@ 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
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.14 2002/03/06 20:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/describe.h,v 1.15 2002/03/07 17:54:41 momjian Exp $
  */
 #ifndef DESCRIBE_H
 #define DESCRIBE_H
@@ -40,7 +40,4 @@ 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
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.45 2002/03/06 20:39:45 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.46 2002/03/07 17:54:42 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "help.h"
@@ -202,7 +202,6 @@ 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"));

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright 2000 by PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.68 2002/03/06 20:39:45 momjian Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.69 2002/03/07 17:54:39 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "command.h"`
`@@ -380,10 +380,6 @@ exec_command(const char *cmd,`
`380`	`380`	`case 'u':`
`381`	`381`	`success = describeUsers(name);`
`382`	`382`	`break;`
`383`		`- case 'D':`
`384`		`- success = listDomains(name);`
`385`		`- break;`
`386`		`-`
`387`	`383`	`default:`
`388`	`384`	`status = CMD_UNKNOWN;`
`389`	`385`	`}`