rake-db 2.23.34 → 2.23.36

package/dist/index.js

@@ -3981,33 +3981,40 @@ JOIN pg_catalog.pg_type t
   ) = d.typbasetype
 JOIN pg_catalog.pg_namespace s ON s.oid = t.typnamespace
 WHERE d.typtype = 'd' AND ${filterSchema("n.nspname")}`;
-const collationsSql = `SELECT
+const collationsSql = (version) => `SELECT
   nspname "schemaName",
   collname "name",
   CASE WHEN collprovider = 'i' THEN 'icu' WHEN collprovider = 'c' THEN 'libc' ELSE collprovider::text END "provider",
   collisdeterministic "deterministic",
   collcollate "lcCollate",
   collctype "lcCType",
-  colliculocale "locale",
+  ${version >= 17 ? "colllocale" : "colliculocale"} "locale",
   collversion "version"
 FROM pg_collation
 JOIN pg_namespace n on pg_collation.collnamespace = n.oid
 WHERE ${filterSchema("n.nspname")}`;
-const sql = `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
+const sql = (version) => `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
   tablesSql,
   "tables"
-)}, ${jsonAgg(viewsSql, "views")}, ${jsonAgg(indexesSql, "indexes")}, ${jsonAgg(
-  constraintsSql,
-  "constraints"
-)}, ${jsonAgg(triggersSql, "triggers")}, ${jsonAgg(
-  extensionsSql,
-  "extensions"
-)}, ${jsonAgg(enumsSql, "enums")}, ${jsonAgg(domainsSql, "domains")}, ${jsonAgg(
-  collationsSql,
+)}, ${jsonAgg(viewsSql, "views")}, ${jsonAgg(
+  indexesSql,
+  "indexes"
+)}, ${jsonAgg(constraintsSql, "constraints")}, ${jsonAgg(
+  triggersSql,
+  "triggers"
+)}, ${jsonAgg(extensionsSql, "extensions")}, ${jsonAgg(
+  enumsSql,
+  "enums"
+)}, ${jsonAgg(domainsSql, "domains")}, ${jsonAgg(
+  collationsSql(version),
   "collations"
 )}`;
 async function introspectDbSchema(db) {
-  const data = await db.query(sql);
+  const {
+    rows: [{ version: versionString }]
+  } = await db.query("SELECT version()");
+  const version = +versionString.match(/\d+/)[0];
+  const data = await db.query(sql(version));
   const result = data.rows[0];
   for (const domain of result.domains) {
     nullsToUndefined(domain);