aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2000-12-22 18:00:24 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2000-12-22 18:00:24 +0000
commit61784c54b59ccf810f95de88ca42c60a0d7d798e (patch)
tree755d3a57e4306201900cd4c70ea1fa35015f74e1 /src/include
parent13b78a2400efe11ae3929b43992d261ed20b5305 (diff)
downloadpostgresql-61784c54b59ccf810f95de88ca42c60a0d7d798e.tar.gz
postgresql-61784c54b59ccf810f95de88ca42c60a0d7d798e.zip
Change default output formatting for CIDR to be unabbreviated, per
recommendation from Paul Vixie. Add a new abbrev() function to produce abbreviated format as text. No forced initdb, but new function is not available unless you do an initdb or add the pg_proc row manually.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/catalog/pg_proc.h4
-rw-r--r--src/include/utils/builtins.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index c0914fd601b..5c43faf1b01 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pg_proc.h,v 1.180 2000/12/21 20:48:16 petere Exp $
+ * $Id: pg_proc.h,v 1.181 2000/12/22 18:00:17 tgl Exp $
*
* NOTES
* The script catalog/genbki.sh reads this file and generates .bki
@@ -2294,6 +2294,8 @@ DATA(insert OID = 930 ( network_supeq PGUID 12 f t t t 2 f 16 "869 869" 100 0
DESCR("is-supernet-or-equal");
/* inet/cidr functions */
+DATA(insert OID = 605 ( abbrev PGUID 12 f t t t 1 f 25 "869" 100 0 0 100 network_abbrev - ));
+DESCR("abbreviated display of inet/cidr value");
DATA(insert OID = 683 ( network PGUID 12 f t t t 1 f 650 "869" 100 0 0 100 network_network - ));
DESCR("network part of address");
DATA(insert OID = 696 ( netmask PGUID 12 f t t t 1 f 869 "869" 100 0 0 100 network_netmask - ));
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 97f03b75a2d..c23e2f33124 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: builtins.h,v 1.144 2000/12/08 23:57:00 tgl Exp $
+ * $Id: builtins.h,v 1.145 2000/12/22 18:00:18 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -508,6 +508,7 @@ extern Datum network_masklen(PG_FUNCTION_ARGS);
extern Datum network_broadcast(PG_FUNCTION_ARGS);
extern Datum network_host(PG_FUNCTION_ARGS);
extern Datum network_show(PG_FUNCTION_ARGS);
+extern Datum network_abbrev(PG_FUNCTION_ARGS);
/* mac.c */
extern Datum macaddr_in(PG_FUNCTION_ARGS);