Cosmetic cleanups in initial catalog data.

Write ',' and ';' for typdelim values instead of the obscurantist
ASCII octal equivalents.  Not sure why anybody ever thought the
latter were better; maybe it had something to do with lack of
a better quoting convention, twenty-plus years ago?

Reassign a couple of high-numbered OIDs that were left in during
yesterday's mad rush to commit stuff of uncertain internal
temperature.

The latter requires a catversion bump, though the former wouldn't
since the end-result catalog data is unchanged.

diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index dd69816f9e5d020e4d8a0426bafa66085ce8177b..58ee94b3b139f8f9f99b436322a892883b94aba6 100644 (file)
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*                                                     yyyymmddN */
-#define CATALOG_VERSION_NO     201804073
+#define CATALOG_VERSION_NO     201804081
 
 #endif

diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat
index ad685f7dce41c402f7d9fb04801897a791014092..f3b9c33932517be2e92300347ee03b743946ceb8 100644 (file)
--- a/src/include/catalog/pg_proc.dat
+++ b/src/include/catalog/pg_proc.dat
@@ -8957,7 +8957,7 @@
 { oid => '5006', descr => 'transform to tsquery',
   proname => 'phraseto_tsquery', procost => '100', prorettype => 'tsquery',
   proargtypes => 'regconfig text', prosrc => 'phraseto_tsquery_byid' },
-{ oid => '8889', descr => 'transform to tsquery',
+{ oid => '5007', descr => 'transform to tsquery',
   proname => 'websearch_to_tsquery', procost => '100', prorettype => 'tsquery',
   proargtypes => 'regconfig text', prosrc => 'websearch_to_tsquery_byid' },
 { oid => '3749', descr => 'transform to tsvector',
@@ -8973,7 +8973,7 @@
   proname => 'phraseto_tsquery', procost => '100', provolatile => 's',
   prorettype => 'tsquery', proargtypes => 'text',
   prosrc => 'phraseto_tsquery' },
-{ oid => '8890', descr => 'transform to tsquery',
+{ oid => '5009', descr => 'transform to tsquery',
   proname => 'websearch_to_tsquery', procost => '100', provolatile => 's',
   prorettype => 'tsquery', proargtypes => 'text',
   prosrc => 'websearch_to_tsquery' },

diff --git a/src/include/catalog/pg_type.dat b/src/include/catalog/pg_type.dat
index 3c2c813756760d0941611ad5b8339d7c7f92636e..ae7e89b32226903ac66410d439eb2bb6771aad38 100644 (file)
--- a/src/include/catalog/pg_type.dat
+++ b/src/include/catalog/pg_type.dat
@@ -198,9 +198,9 @@
   typstorage => 'x' },
 { oid => '603', descr => 'geometric box \'(lower left,upper right)\'',
   typname => 'box', typlen => '32', typbyval => 'f', typcategory => 'G',
-  typdelim => '\073', typelem => 'point', typarray => '_box',
-  typinput => 'box_in', typoutput => 'box_out', typreceive => 'box_recv',
-  typsend => 'box_send', typalign => 'd' },
+  typdelim => ';', typelem => 'point', typarray => '_box', typinput => 'box_in',
+  typoutput => 'box_out', typreceive => 'box_recv', typsend => 'box_send',
+  typalign => 'd' },
 { oid => '604', descr => 'geometric polygon \'(pt1,...)\'',
   typname => 'polygon', typlen => '-1', typbyval => 'f', typcategory => 'G',
   typarray => '_polygon', typinput => 'poly_in', typoutput => 'poly_out',
@@ -402,7 +402,7 @@
   typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
 { oid => '1020',
   typname => '_box', typlen => '-1', typbyval => 'f', typcategory => 'A',
-  typdelim => '\073', typelem => 'box', typinput => 'array_in',
+  typdelim => ';', typelem => 'box', typinput => 'array_in',
   typoutput => 'array_out', typreceive => 'array_recv', typsend => 'array_send',
   typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
 { oid => '1021',

diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index ade771ddd3798df2374544860c2f878579967419..8f301db91c5fc077729e63b86e0a64029f158b36 100644 (file)
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -93,7 +93,7 @@ CATALOG(pg_type,1247,TypeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71,TypeRelati
        bool            typisdefined BKI_DEFAULT(t);
 
        /* delimiter for arrays of this type */
-       char            typdelim BKI_DEFAULT("\054");
+       char            typdelim BKI_DEFAULT(',');
 
        /* associated pg_class OID if a composite type, else 0 */
        Oid                     typrelid BKI_DEFAULT(0);