Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 4f85f66

Browse files
committed
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.
1 parent cca563f commit 4f85f66

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/include/catalog/catversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 201804073
56+
#define CATALOG_VERSION_NO 201804081
5757

5858
#endif

src/include/catalog/pg_proc.dat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8957,7 +8957,7 @@
89578957
{ oid => '5006', descr => 'transform to tsquery',
89588958
proname => 'phraseto_tsquery', procost => '100', prorettype => 'tsquery',
89598959
proargtypes => 'regconfig text', prosrc => 'phraseto_tsquery_byid' },
8960-
{ oid => '8889', descr => 'transform to tsquery',
8960+
{ oid => '5007', descr => 'transform to tsquery',
89618961
proname => 'websearch_to_tsquery', procost => '100', prorettype => 'tsquery',
89628962
proargtypes => 'regconfig text', prosrc => 'websearch_to_tsquery_byid' },
89638963
{ oid => '3749', descr => 'transform to tsvector',
@@ -8973,7 +8973,7 @@
89738973
proname => 'phraseto_tsquery', procost => '100', provolatile => 's',
89748974
prorettype => 'tsquery', proargtypes => 'text',
89758975
prosrc => 'phraseto_tsquery' },
8976-
{ oid => '8890', descr => 'transform to tsquery',
8976+
{ oid => '5009', descr => 'transform to tsquery',
89778977
proname => 'websearch_to_tsquery', procost => '100', provolatile => 's',
89788978
prorettype => 'tsquery', proargtypes => 'text',
89798979
prosrc => 'websearch_to_tsquery' },

src/include/catalog/pg_type.dat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@
198198
typstorage => 'x' },
199199
{ oid => '603', descr => 'geometric box \'(lower left,upper right)\'',
200200
typname => 'box', typlen => '32', typbyval => 'f', typcategory => 'G',
201-
typdelim => '\073', typelem => 'point', typarray => '_box',
202-
typinput => 'box_in', typoutput => 'box_out', typreceive => 'box_recv',
203-
typsend => 'box_send', typalign => 'd' },
201+
typdelim => ';', typelem => 'point', typarray => '_box', typinput => 'box_in',
202+
typoutput => 'box_out', typreceive => 'box_recv', typsend => 'box_send',
203+
typalign => 'd' },
204204
{ oid => '604', descr => 'geometric polygon \'(pt1,...)\'',
205205
typname => 'polygon', typlen => '-1', typbyval => 'f', typcategory => 'G',
206206
typarray => '_polygon', typinput => 'poly_in', typoutput => 'poly_out',
@@ -402,7 +402,7 @@
402402
typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
403403
{ oid => '1020',
404404
typname => '_box', typlen => '-1', typbyval => 'f', typcategory => 'A',
405-
typdelim => '\073', typelem => 'box', typinput => 'array_in',
405+
typdelim => ';', typelem => 'box', typinput => 'array_in',
406406
typoutput => 'array_out', typreceive => 'array_recv', typsend => 'array_send',
407407
typanalyze => 'array_typanalyze', typalign => 'd', typstorage => 'x' },
408408
{ oid => '1021',

src/include/catalog/pg_type.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ CATALOG(pg_type,1247,TypeRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71,TypeRelati
9393
bool typisdefined BKI_DEFAULT(t);
9494

9595
/* delimiter for arrays of this type */
96-
char typdelim BKI_DEFAULT("\054");
96+
char typdelim BKI_DEFAULT(',');
9797

9898
/* associated pg_class OID if a composite type, else 0 */
9999
Oid typrelid BKI_DEFAULT(0);

0 commit comments

Comments
 (0)