From ec7129b7812ce276520f749d0946875663c34093 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 13 Jun 2017 08:55:09 -0400 Subject: [PATCH] Fix collprovider of predefined collations An earlier version of the patch had collprovider as an integer and thus set these to 0, but the correct setting is now null. --- src/include/catalog/catversion.h | 2 +- src/include/catalog/pg_collation.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index c657241082..ae34f75a84 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 201706081 +#define CATALOG_VERSION_NO 201706131 #endif diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h index 1e44ce0949..901c0b5115 100644 --- a/src/include/catalog/pg_collation.h +++ b/src/include/catalog/pg_collation.h @@ -70,13 +70,13 @@ typedef FormData_pg_collation *Form_pg_collation; * ---------------- */ -DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" 0 )); +DATA(insert OID = 100 ( default PGNSP PGUID d -1 "" "" _null_ )); DESCR("database's default collation"); #define DEFAULT_COLLATION_OID 100 -DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" 0 )); +DATA(insert OID = 950 ( C PGNSP PGUID c -1 "C" "C" _null_ )); DESCR("standard C collation"); #define C_COLLATION_OID 950 -DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" 0 )); +DATA(insert OID = 951 ( POSIX PGNSP PGUID c -1 "POSIX" "POSIX" _null_ )); DESCR("standard POSIX collation"); #define POSIX_COLLATION_OID 951 -- 2.40.0