Skip to content

Commit 20858bd

Browse files
bmomjianbmomjian
committed
Make \d commands not wrap over 80 cols.
1 parent 79daac6 commit 20858bd

File tree

2 files changed

+40
-44
lines changed

2 files changed

+40
-44
lines changed

‎src/bin/psql/psql.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.111 1997/11/17 22:14:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.112 1997/11/18 06:46:21 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1729,8 +1729,7 @@ HandleSlashCmds(PsqlSettings *pset,
17291729
{
17301730
/* operators */
17311731
SendQuery(&success, pset,"\
1732-
SELECT o.oprname AS operator_, \
1733-
p.proname AS func_name, \
1732+
SELECT o.oprname AS op, \
17341733
t0.typname AS result, \
17351734
t1.typname AS left_type, \
17361735
t2.typname AS right_type, \
@@ -1743,12 +1742,10 @@ HandleSlashCmds(PsqlSettings *pset,
17431742
p.pronargs = 2 AND \
17441743
o.oprleft = t1.oid AND \
17451744
o.oprright = t2.oid \
1746-
ORDER BY operator_, func_name, result, left_type, \
1747-
right_type;",
1745+
ORDER BY op, result, left_type, right_type;",
17481746
false, false, 0);
17491747
SendQuery(&success, pset,"\
17501748
SELECT o.oprname AS left_unary, \
1751-
p.proname AS func_name, \
17521749
t0.typname AS return_type, \
17531750
t1.typname AS operand, \
17541751
obj_description(o.oid) as description \
@@ -1757,11 +1754,10 @@ HandleSlashCmds(PsqlSettings *pset,
17571754
o.oprresult = t0.oid AND \
17581755
o.oprkind = 'l' AND \
17591756
o.oprright = t1.oid \
1760-
ORDER BY left_unary, func_name, return_type, operand;",
1757+
ORDER BY left_unary, return_type, operand;",
17611758
false, false, 0);
17621759
SendQuery(&success, pset,"\
17631760
SELECT o.oprname AS right_unary, \
1764-
p.proname AS func_name, \
17651761
t0.typname AS return_type, \
17661762
t1.typname AS operand, \
17671763
obj_description(o.oid) as description \
@@ -1770,7 +1766,7 @@ HandleSlashCmds(PsqlSettings *pset,
17701766
o.oprresult = t0.oid AND \
17711767
o.oprkind = 'r' AND \
17721768
o.oprleft = t1.oid \
1773-
ORDER BY right_unary, func_name, return_type, operand;",
1769+
ORDER BY right_unary, return_type, operand;",
17741770
false, false, 0);
17751771
}
17761772
else if (strncmp(cmd, "ds", 2) == 0)

‎src/include/catalog/pg_operator.h

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: pg_operator.h,v 1.19 1997/11/18 05:22:49 momjian Exp $
10+
* $Id: pg_operator.h,v 1.20 1997/11/18 06:46:31 momjian Exp $
1111
*
1212
* NOTES
1313
* the genbki.sh script reads this file and generates .bki
@@ -450,7 +450,7 @@ DESCR("truncate to integer");
450450
DATA(insert OID = 1282 ( ":" PGUID 0 l t f 0 701 701 0 0 0 0 dexp - - ));
451451
DESCR("exponential");
452452
DATA(insert OID = 1283 ( ";" PGUID 0 l t f 0 701 701 0 0 0 0 dlog1 - - ));
453-
DESCR("natural logarith (in psql, protect with parentheses)");
453+
DESCR("natural logarith (in psql, protect with '()'");
454454
DATA(insert OID = 1284 ( "|" PGUID 0 l t f 0 704 702 0 0 0 0 intervalstart - - ));
455455
DESCR("start of interval");
456456
DATA(insert OID = 606 ( "<#>" PGUID 0 b t f 702 702 704 0 0 0 0 mktinterval - - ));
@@ -524,13 +524,13 @@ DATA(insert OID = 638 ( "/" PGUID 0 b t f 18 18 18 0 0 0 0 chardiv eqsel
524524
DESCR("divide");
525525

526526
DATA(insert OID = 639 ( "~" PGUID 0 b t f 19 25 16 0 640 0 0 nameregexeq eqsel eqjoinsel ));
527-
DESCR("matches regular expression, case-sensitive");
527+
DESCR("matches regex., case-sensitive");
528528
DATA(insert OID = 640 ( "!~" PGUID 0 b t f 19 25 16 0 639 0 0 nameregexne neqsel neqjoinsel ));
529-
DESCR("does not match regular expression, case-sensitive");
529+
DESCR("does not match regex., case-sensitive");
530530
DATA(insert OID = 641 ( "~" PGUID 0 b t f 25 25 16 0 642 0 0 textregexeq eqsel eqjoinsel ));
531-
DESCR("matches regular expression, case-sensitive");
531+
DESCR("matches regex., case-sensitive");
532532
DATA(insert OID = 642 ( "!~" PGUID 0 b t f 25 25 16 0 641 0 0 textregexne eqsel eqjoinsel ));
533-
DESCR("does not match regular expression, case-sensitive");
533+
DESCR("does not match regex., case-sensitive");
534534
DATA(insert OID = 643 ( "<>" PGUID 0 b t f 19 19 16 643 93 0 0 namene neqsel neqjoinsel ));
535535
DESCR("not equal");
536536
DATA(insert OID = 644 ( "<>" PGUID 0 b t f 20 20 16 644 1267 0 0 char16ne neqsel neqjoinsel ));
@@ -544,9 +544,9 @@ DESCR("greater-than");
544544
DATA(insert OID = 648 ( ">=" PGUID 0 b t f 20 20 16 646 645 0 0 char16ge intltsel intltjoinsel ));
545545
DESCR("greater-than-or-equals");
546546
DATA(insert OID = 649 ( "~" PGUID 0 b t f 20 25 16 0 650 0 0 char16regexeq intltsel intltjoinsel ));
547-
DESCR("matches regular expression, case-sensitive");
547+
DESCR("matches regex., case-sensitive");
548548
DATA(insert OID = 650 ( "!~" PGUID 0 b t f 20 25 16 650 0 0 0 char16regexne intltsel intltjoinsel ));
549-
DESCR("does not match regular expression, case-sensitive");
549+
DESCR("does not match regex., case-sensitive");
550550
DATA(insert OID = 651 ( "~~" PGUID 0 b t f 20 25 16 0 651 0 0 char16like eqsel eqjoinsel ));
551551
DESCR("matches LIKE expression");
552552
DATA(insert OID = 652 ( "!~~" PGUID 0 b t f 20 25 16 651 0 0 0 char16nlike neqsel neqjoinsel ));
@@ -598,9 +598,9 @@ DATA(insert OID = 681 ( "<>" PGUID 0 b t f 911 911 16 681 678 0 0 oidnamen
598598
DESCR("not equal");
599599

600600
DATA(insert OID = 697 ( "~" PGUID 0 b t f 411 25 16 0 698 0 0 char8regexeq eqsel eqjoinsel ));
601-
DESCR("matches regular expression, case-sensitive");
601+
DESCR("matches regex., case-sensitive");
602602
DATA(insert OID = 698 ( "!~" PGUID 0 b t f 411 25 16 0 697 0 0 char8regexne neqsel neqjoinsel ));
603-
DESCR("does not match regular expression, case-sensitive");
603+
DESCR("does not match regex., case-sensitive");
604604

605605
DATA(insert OID = 706 ( "<->" PGUID 0 b t f 603 603 701 706 0 0 0 box_distance intltsel intltjoinsel ));
606606
DESCR("distance between");
@@ -710,13 +710,13 @@ DATA(insert OID = 835 ( "<>" PGUID 0 b t f 810 810 16 835 832 0 0 oidint2n
710710
DESCR("not equal");
711711

712712
DATA(insert OID = 839 ( "~" PGUID 0 b t f 409 25 16 0 841 0 0 char2regexeq eqsel eqjoinsel ));
713-
DESCR("matches regular expression, case-sensitive");
713+
DESCR("matches regex., case-sensitive");
714714
DATA(insert OID = 841 ( "!~" PGUID 0 b t f 409 25 16 0 839 0 0 char2regexne neqsel neqjoinsel ));
715-
DESCR("does not match regular expression, case-sensitive");
715+
DESCR("does not match regex., case-sensitive");
716716
DATA(insert OID = 840 ( "~" PGUID 0 b t f 410 25 16 0 842 0 0 char4regexeq eqsel eqjoinsel ));
717-
DESCR("matches regular expression, case-sensitive");
717+
DESCR("matches regex., case-sensitive");
718718
DATA(insert OID = 842 ( "!~" PGUID 0 b t f 410 25 16 0 840 0 0 char4regexne neqsel neqjoinsel ));
719-
DESCR("does not match regular expression, case-sensitive");
719+
DESCR("does not match regex., case-sensitive");
720720

721721
DATA(insert OID = 843 ( "*" PGUID 0 b t f 790 700 790 845 0 0 0 cash_mul_flt4 - - ));
722722
DESCR("multiply");
@@ -780,7 +780,7 @@ DESCR("addition");
780780
DATA(insert OID = 967 ( "-" PGUID 0 b t f 1034 1033 1034 0 0 0 0 aclremove intltsel intltjoinsel ));
781781
DESCR("subtract");
782782
DATA(insert OID = 968 ( "~" PGUID 0 b t f 1034 1033 16 0 0 0 0 aclcontains intltsel intltjoinsel ));
783-
DESCR("matches regular expression, case-sensitive");
783+
DESCR("matches regex., case-sensitive");
784784

785785
/* additional geometric operators - thomas 1997-07-09 */
786786
DATA(insert OID = 969 ( "@@" PGUID 0 l t f 0 601 600 0 0 0 0 lseg_center - - ));
@@ -798,9 +798,9 @@ DESCR("concat");
798798
DATA(insert OID = 1054 ( "=" PGUID 0 b t t 1042 1042 16 1054 1057 1058 1058 bpchareq eqsel eqjoinsel ));
799799
DESCR("equals");
800800
DATA(insert OID = 1055 ( "~" PGUID 0 b t f 1042 25 16 0 1056 0 0 textregexeq eqsel eqjoinsel ));
801-
DESCR("matches regular expression, case-sensitive");
801+
DESCR("matches regex., case-sensitive");
802802
DATA(insert OID = 1056 ( "!~" PGUID 0 b t f 1042 25 16 0 1055 0 0 textregexne neqsel neqjoinsel ));
803-
DESCR("does not match regular expression, case-sensitive");
803+
DESCR("does not match regex., case-sensitive");
804804
DATA(insert OID = 1057 ( "<>" PGUID 0 b t f 1042 1042 16 1057 1054 0 0 bpcharne neqsel neqjoinsel ));
805805
DESCR("not equal");
806806
DATA(insert OID = 1058 ( "<" PGUID 0 b t f 1042 1042 16 1060 1061 0 0 bpcharlt intltsel intltjoinsel ));
@@ -815,9 +815,9 @@ DESCR("greater-than-or-equals");
815815
DATA(insert OID = 1062 ( "=" PGUID 0 b t t 1043 1043 16 1062 1065 1066 1066 varchareq eqsel eqjoinsel ));
816816
DESCR("equals");
817817
DATA(insert OID = 1063 ( "~" PGUID 0 b t f 1043 25 16 0 1064 0 0 textregexeq eqsel eqjoinsel ));
818-
DESCR("matches regular expression, case-sensitive");
818+
DESCR("matches regex., case-sensitive");
819819
DATA(insert OID = 1064 ( "!~" PGUID 0 b t f 1043 25 16 0 1063 0 0 textregexne neqsel neqjoinsel ));
820-
DESCR("does not match regular expression, case-sensitive");
820+
DESCR("does not match regex., case-sensitive");
821821
DATA(insert OID = 1065 ( "<>" PGUID 0 b t f 1043 1043 16 1065 1062 0 0 varcharne neqsel neqjoinsel ));
822822
DESCR("not equal");
823823
DATA(insert OID = 1066 ( "<" PGUID 0 b t f 1043 1043 16 1068 1069 0 0 varcharlt intltsel intltjoinsel ));
@@ -988,37 +988,37 @@ DESCR("does not match LIKE expression");
988988

989989
/* case-insensitive LIKE hacks */
990990
DATA(insert OID = 1220 ( "~*" PGUID 0 b t f 409 25 16 0 1221 0 0 char2icregexeq eqsel eqjoinsel ));
991-
DESCR("matches regular expression, case-insensitive");
991+
DESCR("matches regex., case-insensitive");
992992
DATA(insert OID = 1221 ( "!~*" PGUID 0 b t f 409 25 16 0 1220 0 0 char2icregexne neqsel neqjoinsel ));
993-
DESCR("does not match regular expression, case-insensitive");
993+
DESCR("does not match regex., case-insensitive");
994994
DATA(insert OID = 1222 ( "~*" PGUID 0 b t f 410 25 16 0 1223 0 0 char4icregexeq eqsel eqjoinsel ));
995-
DESCR("matches regular expression, case-insensitive");
995+
DESCR("matches regex., case-insensitive");
996996
DATA(insert OID = 1223 ( "!~*" PGUID 0 b t f 410 25 16 0 1222 0 0 char4icregexne neqsel neqjoinsel ));
997-
DESCR("does not match regular expression, case-insensitive");
997+
DESCR("does not match regex., case-insensitive");
998998
DATA(insert OID = 1224 ( "~*" PGUID 0 b t f 411 25 16 0 1225 0 0 char8icregexeq eqsel eqjoinsel ));
999-
DESCR("matches regular expression, case-insensitive");
999+
DESCR("matches regex., case-insensitive");
10001000
DATA(insert OID = 1225 ( "!~*" PGUID 0 b t f 411 25 16 0 1224 0 0 char8icregexne neqsel neqjoinsel ));
1001-
DESCR("does not match regular expression, case-insensitive");
1001+
DESCR("does not match regex., case-insensitive");
10021002
DATA(insert OID = 1226 ( "~*" PGUID 0 b t f 19 25 16 0 1227 0 0 nameicregexeq eqsel eqjoinsel ));
1003-
DESCR("matches regular expression, case-insensitive");
1003+
DESCR("matches regex., case-insensitive");
10041004
DATA(insert OID = 1227 ( "!~*" PGUID 0 b t f 19 25 16 0 1226 0 0 nameicregexne neqsel neqjoinsel ));
1005-
DESCR("does not match regular expression, case-insensitive");
1005+
DESCR("does not match regex., case-insensitive");
10061006
DATA(insert OID = 1228 ( "~*" PGUID 0 b t f 25 25 16 0 1229 0 0 texticregexeq eqsel eqjoinsel ));
1007-
DESCR("matches regular expression, case-insensitive");
1007+
DESCR("matches regex., case-insensitive");
10081008
DATA(insert OID = 1229 ( "!~*" PGUID 0 b t f 25 25 16 0 1228 0 0 texticregexne eqsel eqjoinsel ));
1009-
DESCR("does not match regular expression, case-insensitive");
1009+
DESCR("does not match regex., case-insensitive");
10101010
DATA(insert OID = 1230 ( "~*" PGUID 0 b t f 20 25 16 0 1231 0 0 char16icregexeq eqsel eqjoinsel ));
1011-
DESCR("matches regular expression, case-insensitive");
1011+
DESCR("matches regex., case-insensitive");
10121012
DATA(insert OID = 1231 ( "!~*" PGUID 0 b t f 20 25 16 0 1230 0 0 char16icregexne neqsel neqjoinsel ));
1013-
DESCR("does not match regular expression, case-insensitive");
1013+
DESCR("does not match regex., case-insensitive");
10141014
DATA(insert OID = 1232 ( "~*" PGUID 0 b t f 1043 25 16 0 1233 0 0 texticregexeq eqsel eqjoinsel ));
1015-
DESCR("matches regular expression, case-insensitive");
1015+
DESCR("matches regex., case-insensitive");
10161016
DATA(insert OID = 1233 ( "!~*" PGUID 0 b t f 1043 25 16 0 1232 0 0 texticregexne neqsel neqjoinsel ));
1017-
DESCR("does not match regular expression, case-insensitive");
1017+
DESCR("does not match regex., case-insensitive");
10181018
DATA(insert OID = 1234 ( "~*" PGUID 0 b t f 1042 25 16 0 1235 0 0 texticregexeq eqsel eqjoinsel ));
1019-
DESCR("matches regular expression, case-insensitive");
1019+
DESCR("matches regex., case-insensitive");
10201020
DATA(insert OID = 1235 ( "!~*" PGUID 0 b t f 1042 25 16 0 1234 0 0 texticregexne neqsel neqjoinsel ));
1021-
DESCR("does not match regular expression, case-insensitive");
1021+
DESCR("does not match regex., case-insensitive");
10221022

10231023
DATA(insert OID = 1300 ( "=" PGUID 0 b t t 1296 1296 16 1300 1301 1302 1302 timestampeq eqsel eqjoinsel ));
10241024
DESCR("equals");

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy