Commit 4f85f664 authored by Tom Lane's avatar Tom Lane

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.
parent cca563f3
...@@ -53,6 +53,6 @@ ...@@ -53,6 +53,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 201804073 #define CATALOG_VERSION_NO 201804081
#endif #endif
...@@ -8957,7 +8957,7 @@ ...@@ -8957,7 +8957,7 @@
{ oid => '5006', descr => 'transform to tsquery', { oid => '5006', descr => 'transform to tsquery',
proname => 'phraseto_tsquery', procost => '100', prorettype => 'tsquery', proname => 'phraseto_tsquery', procost => '100', prorettype => 'tsquery',
proargtypes => 'regconfig text', prosrc => 'phraseto_tsquery_byid' }, 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', proname => 'websearch_to_tsquery', procost => '100', prorettype => 'tsquery',
proargtypes => 'regconfig text', prosrc => 'websearch_to_tsquery_byid' }, proargtypes => 'regconfig text', prosrc => 'websearch_to_tsquery_byid' },
{ oid => '3749', descr => 'transform to tsvector', { oid => '3749', descr => 'transform to tsvector',
...@@ -8973,7 +8973,7 @@ ...@@ -8973,7 +8973,7 @@
proname => 'phraseto_tsquery', procost => '100', provolatile => 's', proname => 'phraseto_tsquery', procost => '100', provolatile => 's',
prorettype => 'tsquery', proargtypes => 'text', prorettype => 'tsquery', proargtypes => 'text',
prosrc => 'phraseto_tsquery' }, prosrc => 'phraseto_tsquery' },
{ oid => '8890', descr => 'transform to tsquery', { oid => '5009', descr => 'transform to tsquery',
proname => 'websearch_to_tsquery', procost => '100', provolatile => 's', proname => 'websearch_to_tsquery', procost => '100', provolatile => 's',
prorettype => 'tsquery', proargtypes => 'text', prorettype => 'tsquery', proargtypes => 'text',
prosrc => 'websearch_to_tsquery' }, prosrc => 'websearch_to_tsquery' },
......
...@@ -198,9 +198,9 @@ ...@@ -198,9 +198,9 @@
typstorage => 'x' }, typstorage => 'x' },
{ oid => '603', descr => 'geometric box \'(lower left,upper right)\'', { oid => '603', descr => 'geometric box \'(lower left,upper right)\'',
typname => 'box', typlen => '32', typbyval => 'f', typcategory => 'G', typname => 'box', typlen => '32', typbyval => 'f', typcategory => 'G',
typdelim => '\073', typelem => 'point', typarray => '_box', typdelim => ';', typelem => 'point', typarray => '_box', typinput => 'box_in',
typinput => 'box_in', typoutput => 'box_out', typreceive => 'box_recv', typoutput => 'box_out', typreceive => 'box_recv', typsend => 'box_send',
typsend => 'box_send', typalign => 'd' }, typalign => 'd' },
{ oid => '604', descr => 'geometric polygon \'(pt1,...)\'', { oid => '604', descr => 'geometric polygon \'(pt1,...)\'',
typname => 'polygon', typlen => '-1', typbyval => 'f', typcategory => 'G', typname => 'polygon', typlen => '-1', typbyval => 'f', typcategory => 'G',
typarray => '_polygon', typinput => 'poly_in', typoutput => 'poly_out', typarray => '_polygon', typinput => 'poly_in', typoutput => 'poly_out',
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' }, typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
{ oid => '1020', { oid => '1020',
typname => '_box', typlen => '-1', typbyval => 'f', typcategory => 'A', 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', typoutput => 'array_out', typreceive => 'array_recv', typsend => 'array_send',
typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' }, typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
{ oid => '1021', { oid => '1021',
......
...@@ -93,7 +93,7 @@ CATALOG(pg_type,1247,TypeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71,TypeRelati ...@@ -93,7 +93,7 @@ CATALOG(pg_type,1247,TypeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71,TypeRelati
bool typisdefined BKI_DEFAULT(t); bool typisdefined BKI_DEFAULT(t);
/* delimiter for arrays of this type */ /* 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 */ /* associated pg_class OID if a composite type, else 0 */
Oid typrelid BKI_DEFAULT(0); Oid typrelid BKI_DEFAULT(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment