rake-db 2.23.19 → 2.23.21

package/dist/index.mjs

@@ -126,8 +126,12 @@ const columnToSql = (name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
   } else if (!item.data.isNullable) {
     line.push("NOT NULL");
   }
-  if (item.data.check) {
-    line.push(checkToSql(item.data.check.sql, values));
+  if (item.data.checks) {
+    line.push(
+      item.data.checks.map(
+        (check) => (check.name ? `CONSTRAINT "${check.name}" ` : "") + checkToSql(check.sql, values)
+      ).join(", ")
+    );
   }
   const def = encodeColumnDefault(item.data.default, values, item);
   if (def !== null) line.push(`DEFAULT ${def}`);
@@ -447,6 +451,19 @@ const interpolateSqlValues = ({ text, values }) => {
     return escapeForMigration(values[i]);
   }) : text;
 };
+const nameColumnChecks = (table, column, checks) => checks.map((check, i) => ({
+  ...check,
+  name: check.name || `${table}_${column}_check${i === 0 ? "" : i}`
+}));
+const cmpRawSql = (a, b) => {
+  const values = [];
+  const aSql = a.makeSQL({ values });
+  const aValues = JSON.stringify(values);
+  values.length = 0;
+  const bSql = b.makeSQL({ values });
+  const bValues = JSON.stringify(values);
+  return aSql === bSql && aValues === bValues;
+};
 
 const tableMethods = {
   enum(name) {
@@ -494,6 +511,10 @@ const createTable = async (migration, up, tableName, first, second, third) => {
       language
     );
     tableData = parseTableData(dataFn);
+    tableData.constraints?.forEach((x, i) => {
+      if (x.name || !x.check) return;
+      x.name = `${tableName}_check${i === 0 ? "" : i}`;
+    });
   } else {
     shape = tableData = emptyObject;
   }
@@ -743,7 +764,7 @@ const addOrDrop = (type, item, options) => {
       type: "change",
       from: {},
       to: {
-        check: item.data.check
+        checks: item.data.checks
       }
     });
     return {
@@ -1192,20 +1213,23 @@ const handleTableItemChange = (key, item, ast, alterTable, renameItems, values,
         `ALTER COLUMN "${name}" SET COMPRESSION ${to.compression || "DEFAULT"}`
       );
     }
-    if (from.check !== to.check) {
-      const checkName = `${ast.name}_${name}_check`;
-      if (from.check) {
-        alterTable.push(`DROP CONSTRAINT "${checkName}"`);
+    const fromChecks = from.checks && nameColumnChecks(ast.name, fromName, from.checks);
+    const toChecks = to.checks && nameColumnChecks(ast.name, name, to.checks);
+    fromChecks?.forEach((fromCheck) => {
+      if (!toChecks?.some((toCheck) => cmpRawSql(fromCheck.sql, toCheck.sql))) {
+        alterTable.push(`DROP CONSTRAINT "${fromCheck.name}"`);
       }
-      if (to.check) {
+    });
+    toChecks?.forEach((toCheck) => {
+      if (!fromChecks?.some((fromCheck) => cmpRawSql(fromCheck.sql, toCheck.sql))) {
         alterTable.push(
-          `ADD CONSTRAINT "${checkName}"
-    CHECK (${to.check.sql.toSQL({
+          `ADD CONSTRAINT "${toCheck.name}"
+    CHECK (${toCheck.sql.toSQL({
             values
           })})`
         );
       }
-    }
+    });
     const foreignKeysLen = Math.max(
       from.foreignKeys?.length || 0,
       to.foreignKeys?.length || 0
@@ -2313,9 +2337,9 @@ const createDomain = async (migration, up, name, fn) => {
     const column = ast.baseType;
     query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(column)}${column.data.collate ? `
 COLLATE "${column.data.collate}"` : ""}${column.data.default !== void 0 ? `
-DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data.isNullable || column.data.check ? "\n" : ""}${[
+DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data.isNullable || column.data.checks ? "\n" : ""}${[
       !column.data.isNullable && "NOT NULL",
-      column.data.check && `CHECK (${column.data.check.sql.toSQL({ values })})`
+      column.data.checks?.map((check) => `CHECK (${check.sql.toSQL({ values })})`).join(" ")
     ].filter(Boolean).join(" ")}`;
   } else {
     query = `DROP DOMAIN ${quotedName}`;
@@ -3936,7 +3960,11 @@ const domainsSql = `SELECT
   datetime_precision AS "dateTimePrecision",
   collation_name AS "collate",
   domain_default AS "default",
-  pg_get_expr(conbin, conrelid) AS "check"
+  (
+    SELECT json_agg(pg_get_expr(conbin, conrelid))
+    FROM pg_catalog.pg_constraint c
+    WHERE c.contypid = d.oid
+  ) AS "checks"
 FROM pg_catalog.pg_type d
 JOIN pg_catalog.pg_namespace n ON n.oid = d.typnamespace
 JOIN information_schema.domains i
@@ -3950,7 +3978,6 @@ JOIN pg_catalog.pg_type t
     END
   ) = d.typbasetype
 JOIN pg_catalog.pg_namespace s ON s.oid = t.typnamespace
-LEFT JOIN pg_catalog.pg_constraint c ON c.contypid = d.oid
 WHERE d.typtype = 'd' AND ${filterSchema("n.nspname")}`;
 const collationsSql = `SELECT
   nspname "schemaName",
@@ -4169,10 +4196,10 @@ const makeDomainsMap = (ctx, data) => {
       default: it.default,
       typmod: -1
     });
-    if (it.check) {
-      column.data.check = {
-        sql: new RawSQL([[it.check]])
-      };
+    if (it.checks) {
+      column.data.checks = it.checks.map((check) => ({
+        sql: new RawSQL([[check]])
+      }));
     }
     domains[`${it.schemaName}.${it.name}`] = column;
   }
@@ -4401,8 +4428,9 @@ const makeDbStructureColumnsShape = (ctx, data, domains, table, tableData) => {
   return shape;
 };
 const getDbTableColumnsChecks = (tableData) => tableData.constraints.reduce((acc, item) => {
+  var _a;
   if (isColumnCheck(item)) {
-    acc[item.check.columns[0]] = item.check.expression;
+    (acc[_a = item.check.columns[0]] ?? (acc[_a] = [])).push(item.check.expression);
   }
   return acc;
 }, {});
@@ -4437,11 +4465,11 @@ const dbColumnToAst = (ctx, data, domains, tableName, item, table, tableData, ch
       );
     }
   }
-  const check = checks?.[item.name];
-  if (check) {
-    column.data.check = {
+  const columnChecks = checks?.[item.name];
+  if (columnChecks) {
+    column.data.checks = columnChecks.map((check) => ({
       sql: new RawSQL([[check]])
-    };
+    }));
   }
   const camelCaseName = toCamelCase(item.name);
   if (ctx.snakeCase) {
@@ -5779,5 +5807,5 @@ const rakeDbCommands = {
   }
 };
 
-export { Migration, NoMigrationsTableError, RAKE_DB_LOCK_KEY, addColumnComment, addColumnExclude, addColumnIndex, addOrDropEnumValues, astToMigration, changeCache, changeEnumValues, clearChanges, colors, columnToSql, columnTypeToSql, commentsToQuery, concatSchemaAndName, constraintToSql, createDb, createMigrationInterface, dbColumnToAst, deleteMigratedVersion, dropDb, encodeColumnDefault, excludesToQuery, exhaustive, generateTimeStamp, getColumnName, getConstraintName, getCurrentChanges, getDatabaseAndUserFromOptions, getDbStructureTableData, getDbTableColumnsChecks, getExcludeName, getFirstWordAndRest, getForeignKeyTable, getIndexName, getMigratedVersionsMap, getSchemaAndTableFromName, getTextAfterFrom, getTextAfterTo, identityToSql, indexesToQuery, instantiateDbColumn, interpolateSqlValues, introspectDbSchema, joinColumns, joinWords, makeDbStructureColumnsShape, makeDomainsMap, makeFileVersion, makePopulateEnumQuery, makeStructureToAstCtx, migrate, migrateOrRollback, migrationConfigDefaults, newMigration, pluralize, primaryKeyToSql, processRakeDbConfig, promptConfirm, promptSelect, promptText, pushChange, queryLock, quoteCustomType, quoteNameFromString, quoteSchemaTable, quoteTable, quoteWithSchema, rakeDb, rakeDbAliases, rakeDbCommands, redo, referencesToSql, renameType, resetDb, rollback, saveMigratedVersion, structureToAst, tableToAst, transaction, versionToString, writeMigrationFile };
+export { Migration, NoMigrationsTableError, RAKE_DB_LOCK_KEY, addColumnComment, addColumnExclude, addColumnIndex, addOrDropEnumValues, astToMigration, changeCache, changeEnumValues, clearChanges, cmpRawSql, colors, columnToSql, columnTypeToSql, commentsToQuery, concatSchemaAndName, constraintToSql, createDb, createMigrationInterface, dbColumnToAst, deleteMigratedVersion, dropDb, encodeColumnDefault, excludesToQuery, exhaustive, generateTimeStamp, getColumnName, getConstraintName, getCurrentChanges, getDatabaseAndUserFromOptions, getDbStructureTableData, getDbTableColumnsChecks, getExcludeName, getFirstWordAndRest, getForeignKeyTable, getIndexName, getMigratedVersionsMap, getSchemaAndTableFromName, getTextAfterFrom, getTextAfterTo, identityToSql, indexesToQuery, instantiateDbColumn, interpolateSqlValues, introspectDbSchema, joinColumns, joinWords, makeDbStructureColumnsShape, makeDomainsMap, makeFileVersion, makePopulateEnumQuery, makeStructureToAstCtx, migrate, migrateOrRollback, migrationConfigDefaults, nameColumnChecks, newMigration, pluralize, primaryKeyToSql, processRakeDbConfig, promptConfirm, promptSelect, promptText, pushChange, queryLock, quoteCustomType, quoteNameFromString, quoteSchemaTable, quoteTable, quoteWithSchema, rakeDb, rakeDbAliases, rakeDbCommands, redo, referencesToSql, renameType, resetDb, rollback, saveMigratedVersion, structureToAst, tableToAst, transaction, versionToString, writeMigrationFile };
 //# sourceMappingURL=index.mjs.map