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

Commit20858bd

Browse files
committed
Make \d commands not wrap over 80 cols.
1 parent79daac6 commit20858bd

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-
SELECTo.oprname AS operator_, \
1733-
p.proname AS func_name, \
1732+
SELECTo.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
SELECTo.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
SELECTo.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
elseif (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/1805:22:49 momjian Exp $
10+
* $Id: pg_operator.h,v 1.20 1997/11/1806: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(insertOID=1282 (":"PGUID0ltf07017010000dexp-- ));
451451
DESCR("exponential");
452452
DATA(insertOID=1283 (";"PGUID0ltf07017010000dlog1-- ));
453-
DESCR("natural logarith (in psql, protect withparentheses)");
453+
DESCR("natural logarith (in psql, protect with'()'");
454454
DATA(insertOID=1284 ("|"PGUID0ltf07047020000intervalstart-- ));
455455
DESCR("start of interval");
456456
DATA(insertOID=606 ("<#>"PGUID0btf7027027040000mktinterval-- ));
@@ -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(insertOID=639 ("~"PGUID0btf192516064000nameregexeqeqseleqjoinsel ));
527-
DESCR("matchesregular expression, case-sensitive");
527+
DESCR("matchesregex., case-sensitive");
528528
DATA(insertOID=640 ("!~"PGUID0btf192516063900nameregexneneqselneqjoinsel ));
529-
DESCR("does not matchregular expression, case-sensitive");
529+
DESCR("does not matchregex., case-sensitive");
530530
DATA(insertOID=641 ("~"PGUID0btf252516064200textregexeqeqseleqjoinsel ));
531-
DESCR("matchesregular expression, case-sensitive");
531+
DESCR("matchesregex., case-sensitive");
532532
DATA(insertOID=642 ("!~"PGUID0btf252516064100textregexneeqseleqjoinsel ));
533-
DESCR("does not matchregular expression, case-sensitive");
533+
DESCR("does not matchregex., case-sensitive");
534534
DATA(insertOID=643 ("<>"PGUID0btf1919166439300nameneneqselneqjoinsel ));
535535
DESCR("not equal");
536536
DATA(insertOID=644 ("<>"PGUID0btf202016644126700char16neneqselneqjoinsel ));
@@ -544,9 +544,9 @@ DESCR("greater-than");
544544
DATA(insertOID=648 (">="PGUID0btf20201664664500char16geintltselintltjoinsel ));
545545
DESCR("greater-than-or-equals");
546546
DATA(insertOID=649 ("~"PGUID0btf202516065000char16regexeqintltselintltjoinsel ));
547-
DESCR("matchesregular expression, case-sensitive");
547+
DESCR("matchesregex., case-sensitive");
548548
DATA(insertOID=650 ("!~"PGUID0btf202516650000char16regexneintltselintltjoinsel ));
549-
DESCR("does not matchregular expression, case-sensitive");
549+
DESCR("does not matchregex., case-sensitive");
550550
DATA(insertOID=651 ("~~"PGUID0btf202516065100char16likeeqseleqjoinsel ));
551551
DESCR("matches LIKE expression");
552552
DATA(insertOID=652 ("!~~"PGUID0btf202516651000char16nlikeneqselneqjoinsel ));
@@ -598,9 +598,9 @@ DATA(insert OID = 681 ( "<>" PGUID 0 b t f 911 91116 681 6780 0 oidnamen
598598
DESCR("not equal");
599599

600600
DATA(insertOID=697 ("~"PGUID0btf4112516069800char8regexeqeqseleqjoinsel ));
601-
DESCR("matchesregular expression, case-sensitive");
601+
DESCR("matchesregex., case-sensitive");
602602
DATA(insertOID=698 ("!~"PGUID0btf4112516069700char8regexneneqselneqjoinsel ));
603-
DESCR("does not matchregular expression, case-sensitive");
603+
DESCR("does not matchregex., case-sensitive");
604604

605605
DATA(insertOID=706 ("<->"PGUID0btf603603701706000box_distanceintltselintltjoinsel ));
606606
DESCR("distance between");
@@ -710,13 +710,13 @@ DATA(insert OID = 835 ( "<>" PGUID 0 b t f 810 81016 835 8320 0 oidint2n
710710
DESCR("not equal");
711711

712712
DATA(insertOID=839 ("~"PGUID0btf4092516084100char2regexeqeqseleqjoinsel ));
713-
DESCR("matchesregular expression, case-sensitive");
713+
DESCR("matchesregex., case-sensitive");
714714
DATA(insertOID=841 ("!~"PGUID0btf4092516083900char2regexneneqselneqjoinsel ));
715-
DESCR("does not matchregular expression, case-sensitive");
715+
DESCR("does not matchregex., case-sensitive");
716716
DATA(insertOID=840 ("~"PGUID0btf4102516084200char4regexeqeqseleqjoinsel ));
717-
DESCR("matchesregular expression, case-sensitive");
717+
DESCR("matchesregex., case-sensitive");
718718
DATA(insertOID=842 ("!~"PGUID0btf4102516084000char4regexneneqselneqjoinsel ));
719-
DESCR("does not matchregular expression, case-sensitive");
719+
DESCR("does not matchregex., case-sensitive");
720720

721721
DATA(insertOID=843 ("*"PGUID0btf790700790845000cash_mul_flt4-- ));
722722
DESCR("multiply");
@@ -780,7 +780,7 @@ DESCR("addition");
780780
DATA(insertOID=967 ("-"PGUID0btf1034103310340000aclremoveintltselintltjoinsel ));
781781
DESCR("subtract");
782782
DATA(insertOID=968 ("~"PGUID0btf10341033160000aclcontainsintltselintltjoinsel ));
783-
DESCR("matchesregular expression, case-sensitive");
783+
DESCR("matchesregex., case-sensitive");
784784

785785
/* additional geometric operators - thomas 1997-07-09 */
786786
DATA(insertOID=969 ("@@"PGUID0ltf06016000000lseg_center-- ));
@@ -798,9 +798,9 @@ DESCR("concat");
798798
DATA(insertOID=1054 ("="PGUID0btt10421042161054105710581058bpchareqeqseleqjoinsel ));
799799
DESCR("equals");
800800
DATA(insertOID=1055 ("~"PGUID0btf104225160105600textregexeqeqseleqjoinsel ));
801-
DESCR("matchesregular expression, case-sensitive");
801+
DESCR("matchesregex., case-sensitive");
802802
DATA(insertOID=1056 ("!~"PGUID0btf104225160105500textregexneneqselneqjoinsel ));
803-
DESCR("does not matchregular expression, case-sensitive");
803+
DESCR("does not matchregex., case-sensitive");
804804
DATA(insertOID=1057 ("<>"PGUID0btf10421042161057105400bpcharneneqselneqjoinsel ));
805805
DESCR("not equal");
806806
DATA(insertOID=1058 ("<"PGUID0btf10421042161060106100bpcharltintltselintltjoinsel ));
@@ -815,9 +815,9 @@ DESCR("greater-than-or-equals");
815815
DATA(insertOID=1062 ("="PGUID0btt10431043161062106510661066varchareqeqseleqjoinsel ));
816816
DESCR("equals");
817817
DATA(insertOID=1063 ("~"PGUID0btf104325160106400textregexeqeqseleqjoinsel ));
818-
DESCR("matchesregular expression, case-sensitive");
818+
DESCR("matchesregex., case-sensitive");
819819
DATA(insertOID=1064 ("!~"PGUID0btf104325160106300textregexneneqselneqjoinsel ));
820-
DESCR("does not matchregular expression, case-sensitive");
820+
DESCR("does not matchregex., case-sensitive");
821821
DATA(insertOID=1065 ("<>"PGUID0btf10431043161065106200varcharneneqselneqjoinsel ));
822822
DESCR("not equal");
823823
DATA(insertOID=1066 ("<"PGUID0btf10431043161068106900varcharltintltselintltjoinsel ));
@@ -988,37 +988,37 @@ DESCR("does not match LIKE expression");
988988

989989
/* case-insensitive LIKE hacks */
990990
DATA(insertOID=1220 ("~*"PGUID0btf40925160122100char2icregexeqeqseleqjoinsel ));
991-
DESCR("matchesregular expression, case-insensitive");
991+
DESCR("matchesregex., case-insensitive");
992992
DATA(insertOID=1221 ("!~*"PGUID0btf40925160122000char2icregexneneqselneqjoinsel ));
993-
DESCR("does not matchregular expression, case-insensitive");
993+
DESCR("does not matchregex., case-insensitive");
994994
DATA(insertOID=1222 ("~*"PGUID0btf41025160122300char4icregexeqeqseleqjoinsel ));
995-
DESCR("matchesregular expression, case-insensitive");
995+
DESCR("matchesregex., case-insensitive");
996996
DATA(insertOID=1223 ("!~*"PGUID0btf41025160122200char4icregexneneqselneqjoinsel ));
997-
DESCR("does not matchregular expression, case-insensitive");
997+
DESCR("does not matchregex., case-insensitive");
998998
DATA(insertOID=1224 ("~*"PGUID0btf41125160122500char8icregexeqeqseleqjoinsel ));
999-
DESCR("matchesregular expression, case-insensitive");
999+
DESCR("matchesregex., case-insensitive");
10001000
DATA(insertOID=1225 ("!~*"PGUID0btf41125160122400char8icregexneneqselneqjoinsel ));
1001-
DESCR("does not matchregular expression, case-insensitive");
1001+
DESCR("does not matchregex., case-insensitive");
10021002
DATA(insertOID=1226 ("~*"PGUID0btf1925160122700nameicregexeqeqseleqjoinsel ));
1003-
DESCR("matchesregular expression, case-insensitive");
1003+
DESCR("matchesregex., case-insensitive");
10041004
DATA(insertOID=1227 ("!~*"PGUID0btf1925160122600nameicregexneneqselneqjoinsel ));
1005-
DESCR("does not matchregular expression, case-insensitive");
1005+
DESCR("does not matchregex., case-insensitive");
10061006
DATA(insertOID=1228 ("~*"PGUID0btf2525160122900texticregexeqeqseleqjoinsel ));
1007-
DESCR("matchesregular expression, case-insensitive");
1007+
DESCR("matchesregex., case-insensitive");
10081008
DATA(insertOID=1229 ("!~*"PGUID0btf2525160122800texticregexneeqseleqjoinsel ));
1009-
DESCR("does not matchregular expression, case-insensitive");
1009+
DESCR("does not matchregex., case-insensitive");
10101010
DATA(insertOID=1230 ("~*"PGUID0btf2025160123100char16icregexeqeqseleqjoinsel ));
1011-
DESCR("matchesregular expression, case-insensitive");
1011+
DESCR("matchesregex., case-insensitive");
10121012
DATA(insertOID=1231 ("!~*"PGUID0btf2025160123000char16icregexneneqselneqjoinsel ));
1013-
DESCR("does not matchregular expression, case-insensitive");
1013+
DESCR("does not matchregex., case-insensitive");
10141014
DATA(insertOID=1232 ("~*"PGUID0btf104325160123300texticregexeqeqseleqjoinsel ));
1015-
DESCR("matchesregular expression, case-insensitive");
1015+
DESCR("matchesregex., case-insensitive");
10161016
DATA(insertOID=1233 ("!~*"PGUID0btf104325160123200texticregexneneqselneqjoinsel ));
1017-
DESCR("does not matchregular expression, case-insensitive");
1017+
DESCR("does not matchregex., case-insensitive");
10181018
DATA(insertOID=1234 ("~*"PGUID0btf104225160123500texticregexeqeqseleqjoinsel ));
1019-
DESCR("matchesregular expression, case-insensitive");
1019+
DESCR("matchesregex., case-insensitive");
10201020
DATA(insertOID=1235 ("!~*"PGUID0btf104225160123400texticregexneneqselneqjoinsel ));
1021-
DESCR("does not matchregular expression, case-insensitive");
1021+
DESCR("does not matchregex., case-insensitive");
10221022

10231023
DATA(insertOID=1300 ("="PGUID0btt12961296161300130113021302timestampeqeqseleqjoinsel ));
10241024
DESCR("equals");

0 commit comments

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