Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit59414cd

Browse files
committed
Change psql's \dd command to do something more useful.
Instead of displaying comments on an arbitrary subset of the objecttypes which support them, make \dd display comments on exactly thoseobject types which don't have their own backlash commands. We nowregard the display of comments as properly the job of the relevantbackslash command (though many of them do so only in verbose mode)rather than something that \dd should be responsible for. However,a handful of object types have no backlash command, so make \ddgive information about those.Josh Kupershmidt
1 parentcff7513 commit59414cd

File tree

3 files changed

+81
-114
lines changed

3 files changed

+81
-114
lines changed

‎doc/src/sgml/ref/psql-ref.sgml‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -990,24 +990,21 @@ testdb=>
990990
<term><literal>\dd[S] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
991991
<listitem>
992992
<para>
993-
Shows the descriptions of objects matching the <replaceable
994-
class="parameter">pattern</replaceable>, or of all visible objects if
995-
no argument is given. But in either case, only objects that have
996-
a description are listed.
993+
Shows the descriptions of objects of type <literal>constraint</>,
994+
<literal>operator class</>, <literal>operator family</>,
995+
<literal>rule</>, and <literal>trigger</>. All
996+
other comments may be viewed by the respective backslash commands for
997+
those object types.
998+
</para>
999+
1000+
<para>
1001+
<literal>\dd</literal> displays descriptions for objects matching the
1002+
<replaceable class="parameter">pattern</replaceable>, or of visible
1003+
objects of the appropriate type if no argument is given. But in either
1004+
case, only objects that have a description are listed.
9971005
By default, only user-created objects are shown; supply a
9981006
pattern or the <literal>S</literal> modifier to include system
9991007
objects.
1000-
<quote>Object</quote> covers aggregates, functions, operators,
1001-
types, relations (tables, views, indexes, sequences), large
1002-
objects, rules, and triggers. For example:
1003-
<programlisting>
1004-
=&gt; <userinput>\dd version</userinput>
1005-
Object descriptions
1006-
Schema | Name | Object | Description
1007-
------------+---------+----------+---------------------------
1008-
pg_catalog | version | function | PostgreSQL version string
1009-
(1 row)
1010-
</programlisting>
10111008
</para>
10121009

10131010
<para>

‎src/bin/psql/describe.c‎

Lines changed: 68 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -830,8 +830,11 @@ listDefaultACLs(const char *pattern)
830830
*
831831
* \dd [foo]
832832
*
833-
* Note: This only lists things that actually have a description. For complete
834-
* lists of things, there are other \d? commands.
833+
* Note: This command only lists comments for object types which do not have
834+
* their comments displayed by their own backslash commands. The following
835+
* types of objects will be displayed: constraint, operator class,
836+
* operator family, rule, and trigger.
837+
*
835838
*/
836839
bool
837840
objectDescription(constchar*pattern,boolshowSystem)
@@ -851,110 +854,78 @@ objectDescription(const char *pattern, bool showSystem)
851854
gettext_noop("Object"),
852855
gettext_noop("Description"));
853856

854-
/* Aggregate descriptions */
855-
appendPQExpBuffer(&buf,
856-
" SELECT p.oid as oid, p.tableoid as tableoid,\n"
857-
" n.nspname as nspname,\n"
858-
" CAST(p.proname AS pg_catalog.text) as name,"
859-
" CAST('%s' AS pg_catalog.text) as object\n"
860-
" FROM pg_catalog.pg_proc p\n"
861-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace\n"
862-
" WHERE p.proisagg\n",
863-
gettext_noop("aggregate"));
864-
865-
if (!showSystem&& !pattern)
866-
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
867-
" AND n.nspname <> 'information_schema'\n");
868-
869-
processSQLNamePattern(pset.db,&buf,pattern, true, false,
870-
"n.nspname","p.proname",NULL,
871-
"pg_catalog.pg_function_is_visible(p.oid)");
872-
873-
/* Function descriptions */
857+
/* Constraint descriptions */
874858
appendPQExpBuffer(&buf,
875-
"UNION ALL\n"
876-
" SELECT p.oid as oid, p.tableoid as tableoid,\n"
859+
" SELECT pgc.oid as oid, pgc.tableoid AS tableoid,\n"
877860
" n.nspname as nspname,\n"
878-
" CAST(p.proname AS pg_catalog.text) as name,"
861+
" CAST(pgc.conname AS pg_catalog.text) as name,"
879862
" CAST('%s' AS pg_catalog.text) as object\n"
880-
" FROM pg_catalog.pg_proc p\n"
881-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = p.pronamespace\n"
882-
" WHERE NOT p.proisagg\n",
883-
gettext_noop("function"));
884-
885-
if (!showSystem&& !pattern)
886-
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
887-
" AND n.nspname <> 'information_schema'\n");
888-
889-
processSQLNamePattern(pset.db,&buf,pattern, true, false,
890-
"n.nspname","p.proname",NULL,
891-
"pg_catalog.pg_function_is_visible(p.oid)");
892-
893-
/* Operator descriptions */
894-
appendPQExpBuffer(&buf,
895-
"UNION ALL\n"
896-
" SELECT o.oid as oid, o.tableoid as tableoid,\n"
897-
" n.nspname as nspname,\n"
898-
" CAST(o.oprname AS pg_catalog.text) as name,"
899-
" CAST('%s' AS pg_catalog.text) as object\n"
900-
" FROM pg_catalog.pg_operator o\n"
901-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = o.oprnamespace\n",
902-
gettext_noop("operator"));
863+
" FROM pg_catalog.pg_constraint pgc\n"
864+
" JOIN pg_catalog.pg_class c "
865+
"ON c.oid = pgc.conrelid\n"
866+
" LEFT JOIN pg_catalog.pg_namespace n "
867+
" ON n.oid = c.relnamespace\n",
868+
gettext_noop("constraint"));
903869

904870
if (!showSystem&& !pattern)
905871
appendPQExpBuffer(&buf,"WHERE n.nspname <> 'pg_catalog'\n"
906872
" AND n.nspname <> 'information_schema'\n");
907873

908-
processSQLNamePattern(pset.db,&buf,pattern, !showSystem&& !pattern, false,
909-
"n.nspname","o.oprname",NULL,
910-
"pg_catalog.pg_operator_is_visible(o.oid)");
911-
912-
/* Type descriptions */
913-
appendPQExpBuffer(&buf,
914-
"UNION ALL\n"
915-
" SELECT t.oid as oid, t.tableoid as tableoid,\n"
916-
" n.nspname as nspname,\n"
917-
" pg_catalog.format_type(t.oid, NULL) as name,"
918-
" CAST('%s' AS pg_catalog.text) as object\n"
919-
" FROM pg_catalog.pg_type t\n"
920-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace\n",
921-
gettext_noop("data type"));
922-
923-
if (!showSystem&& !pattern)
924-
appendPQExpBuffer(&buf,"WHERE n.nspname <> 'pg_catalog'\n"
925-
" AND n.nspname <> 'information_schema'\n");
926-
927-
processSQLNamePattern(pset.db,&buf,pattern, !showSystem&& !pattern, false,
928-
"n.nspname","pg_catalog.format_type(t.oid, NULL)",
929-
NULL,
930-
"pg_catalog.pg_type_is_visible(t.oid)");
931-
932-
/* Relation (tables, views, indexes, sequences) descriptions */
933-
appendPQExpBuffer(&buf,
934-
"UNION ALL\n"
935-
" SELECT c.oid as oid, c.tableoid as tableoid,\n"
936-
" n.nspname as nspname,\n"
937-
" CAST(c.relname AS pg_catalog.text) as name,\n"
938-
" CAST(\n"
939-
" CASE c.relkind WHEN 'r' THEN '%s' WHEN 'v' THEN '%s' WHEN 'i' THEN '%s' WHEN 'S' THEN '%s' WHEN 'f' THEN '%s' END"
940-
" AS pg_catalog.text) as object\n"
941-
" FROM pg_catalog.pg_class c\n"
942-
" LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace\n"
943-
" WHERE c.relkind IN ('r', 'v', 'i', 'S', 'f')\n",
944-
gettext_noop("table"),
945-
gettext_noop("view"),
946-
gettext_noop("index"),
947-
gettext_noop("sequence"),
948-
gettext_noop("foreign table"));
949-
950-
if (!showSystem&& !pattern)
951-
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
952-
" AND n.nspname <> 'information_schema'\n");
953-
954-
processSQLNamePattern(pset.db,&buf,pattern, true, false,
955-
"n.nspname","c.relname",NULL,
874+
processSQLNamePattern(pset.db,&buf,pattern, !showSystem&& !pattern,
875+
false,"n.nspname","pgc.conname",NULL,
956876
"pg_catalog.pg_table_is_visible(c.oid)");
957877

878+
/*
879+
* pg_opclass.opcmethod only available in 8.3+, and comment on operator
880+
* family only available in 8.3+
881+
*/
882+
if (pset.sversion >=80300)
883+
{
884+
/* Operator class descriptions */
885+
appendPQExpBuffer(&buf,
886+
"UNION ALL\n"
887+
" SELECT o.oid as oid, o.tableoid as tableoid,\n"
888+
" n.nspname as nspname,\n"
889+
" CAST(o.opcname AS pg_catalog.text) as name,\n"
890+
" CAST('%s' AS pg_catalog.text) as object\n"
891+
" FROM pg_catalog.pg_opclass o\n"
892+
" JOIN pg_catalog.pg_am am ON "
893+
"o.opcmethod = am.oid\n"
894+
" JOIN pg_catalog.pg_namespace n ON "
895+
"n.oid = o.opcnamespace\n",
896+
gettext_noop("operator class"));
897+
898+
if (!showSystem&& !pattern)
899+
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
900+
" AND n.nspname <> 'information_schema'\n");
901+
902+
processSQLNamePattern(pset.db,&buf,pattern, true, false,
903+
"n.nspname","o.opcname",NULL,
904+
"pg_catalog.pg_opclass_is_visible(o.oid)");
905+
906+
/* Operator family descriptions */
907+
appendPQExpBuffer(&buf,
908+
"UNION ALL\n"
909+
" SELECT opf.oid as oid, opf.tableoid as tableoid,\n"
910+
" n.nspname as nspname,\n"
911+
" CAST(opf.opfname AS pg_catalog.text) AS name,\n"
912+
" CAST('%s' AS pg_catalog.text) as object\n"
913+
" FROM pg_catalog.pg_opfamily opf\n"
914+
" JOIN pg_catalog.pg_am am "
915+
"ON opf.opfmethod = am.oid\n"
916+
" JOIN pg_catalog.pg_namespace n "
917+
"ON opf.opfnamespace = n.oid\n",
918+
gettext_noop("operator family"));
919+
920+
if (!showSystem&& !pattern)
921+
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
922+
" AND n.nspname <> 'information_schema'\n");
923+
924+
processSQLNamePattern(pset.db,&buf,pattern, true, false,
925+
"n.nspname","opf.opfname",NULL,
926+
"pg_catalog.pg_opfamily_is_visible(opf.oid)");
927+
}
928+
958929
/* Rule descriptions (ignore rules for views) */
959930
appendPQExpBuffer(&buf,
960931
"UNION ALL\n"
@@ -972,7 +943,6 @@ objectDescription(const char *pattern, bool showSystem)
972943
appendPQExpBuffer(&buf," AND n.nspname <> 'pg_catalog'\n"
973944
" AND n.nspname <> 'information_schema'\n");
974945

975-
/* XXX not sure what to do about visibility rule here? */
976946
processSQLNamePattern(pset.db,&buf,pattern, true, false,
977947
"n.nspname","r.rulename",NULL,
978948
"pg_catalog.pg_table_is_visible(c.oid)");
@@ -993,7 +963,6 @@ objectDescription(const char *pattern, bool showSystem)
993963
appendPQExpBuffer(&buf,"WHERE n.nspname <> 'pg_catalog'\n"
994964
" AND n.nspname <> 'information_schema'\n");
995965

996-
/* XXX not sure what to do about visibility rule here? */
997966
processSQLNamePattern(pset.db,&buf,pattern, !showSystem&& !pattern, false,
998967
"n.nspname","t.tgname",NULL,
999968
"pg_catalog.pg_table_is_visible(c.oid)");
@@ -2739,6 +2708,7 @@ listDomains(const char *pattern, bool verbose, bool showSystem)
27392708
gettext_noop("Schema"),
27402709
gettext_noop("Name"),
27412710
gettext_noop("Type"));
2711+
27422712
if (pset.sversion >=90100)
27432713
appendPQExpBuffer(&buf,
27442714
" COALESCE((SELECT ' collate ' || c.collname FROM pg_catalog.pg_collation c, pg_catalog.pg_type bt\n"

‎src/bin/psql/help.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ slashUsage(unsigned short int pager)
197197
fprintf(output,_(" \\db[+] [PATTERN] list tablespaces\n"));
198198
fprintf(output,_(" \\dc[S+] [PATTERN] list conversions\n"));
199199
fprintf(output,_(" \\dC[+] [PATTERN] list casts\n"));
200-
fprintf(output,_(" \\dd[S] [PATTERN] showcomments on objects\n"));
200+
fprintf(output,_(" \\dd[S] [PATTERN] showobject descriptions not displayed elsewhere\n"));
201201
fprintf(output,_(" \\ddp [PATTERN] list default privileges\n"));
202202
fprintf(output,_(" \\dD[S+] [PATTERN] list domains\n"));
203203
fprintf(output,_(" \\det[+] [PATTERN] list foreign tables\n"));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp