initdb: Set collversion for standard collation UNICODE

petere · petere · commit e32701b8d285 · 2023-05-12T10:03:05.000+02:00
Since the behavior of the UNICODE collation can change with new ICU/Unicode versions, we need to apply the versioning mechanism to it. We do this with an UPDATE command in initdb; this is similar to how we put the collation version into pg_database already. Reported-by: Daniel Verite <daniel@manitou-mail.org> Discussion: https://www.postgresql.org/message-id/49417853-7bdd-4b23-a4e9-04c7aff33821@manitou-mail.org
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -1695,6 +1695,13 @@ setup_description(FILE *cmdfd)
 static void
 setup_collation(FILE *cmdfd)
 {
+	/*
+	 * Set the collation version for collations defined in pg_collation.dat,
+	 * but not the ones where we know that the collation behavior will never
+	 * change.
+	 */
+	PG_CMD_PUTS("UPDATE pg_collation SET collversion = pg_collation_actual_version(oid) WHERE collname = 'unicode';\n\n");
+
 	/* Import all collations we can find in the operating system */
 	PG_CMD_PUTS("SELECT pg_import_system_collations('pg_catalog');\n\n");
 }
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
@@ -57,6 +57,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202305041
+#define CATALOG_VERSION_NO	202305121
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1695,6 +1695,13 @@ setup_description(FILE *cmdfd)`
`1695`	`1695`	`static void`
`1696`	`1696`	`setup_collation(FILE *cmdfd)`
`1697`	`1697`	`{`
	`1698`	`+ /*`
	`1699`	`+ * Set the collation version for collations defined in pg_collation.dat,`
	`1700`	`+ * but not the ones where we know that the collation behavior will never`
	`1701`	`+ * change.`
	`1702`	`+ */`
	`1703`	`+ PG_CMD_PUTS("UPDATE pg_collation SET collversion = pg_collation_actual_version(oid) WHERE collname = 'unicode';\n\n");`
	`1704`	`+`
`1698`	`1705`	`/* Import all collations we can find in the operating system */`
`1699`	`1706`	`PG_CMD_PUTS("SELECT pg_import_system_collations('pg_catalog');\n\n");`
`1700`	`1707`	`}`