rake-db 2.23.20 → 2.23.22

package/dist/index.d.ts

@@ -59,7 +59,7 @@ declare namespace RakeDbAst {
         comment?: string | null;
         compression?: string;
         primaryKey?: boolean;
-        check?: ColumnDataCheckBase;
+        checks?: ColumnDataCheckBase[];
         foreignKeys?: TableData.ColumnReferences[];
         indexes?: TableData.ColumnIndex[];
         excludes?: TableData.ColumnExclude[];
@@ -198,7 +198,7 @@ declare namespace RakeDbAst {
 
 declare function add(item: ColumnType, options?: {
     dropMode?: DropMode;
-}): number;
+}): EmptyObject;
 declare function add(emptyObject: EmptyObject): EmptyObject;
 declare function add(items: Record<string, ColumnType>, options?: {
     dropMode?: DropMode;
@@ -1641,7 +1641,7 @@ declare namespace DbStructure {
         dateTimePrecision?: number;
         collate?: string;
         default?: string;
-        check?: string;
+        checks?: string[];
     }
     interface Collation {
         schemaName: string;
@@ -1692,8 +1692,11 @@ declare const instantiateDbColumn: (ctx: StructureToAstCtx, data: IntrospectedSt
 declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: 'create' | 'drop', domains: DbStructureDomainsMap) => RakeDbAst.Table;
 declare const getDbStructureTableData: (data: IntrospectedStructure, { name, schemaName }: DbStructure.Table) => StructureToAstTableData;
 declare const makeDbStructureColumnsShape: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, table: DbStructure.Table | DbStructure.View, tableData?: StructureToAstTableData) => ColumnsShape;
-declare const getDbTableColumnsChecks: (tableData: StructureToAstTableData) => RecordString;
-declare const dbColumnToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, tableName: string, item: DbStructure.Column, table?: DbStructure.Table, tableData?: StructureToAstTableData, checks?: RecordString) => [key: string, column: ColumnType];
+interface ColumnChecks {
+    [K: string]: string[];
+}
+declare const getDbTableColumnsChecks: (tableData: StructureToAstTableData) => ColumnChecks;
+declare const dbColumnToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, tableName: string, item: DbStructure.Column, table?: DbStructure.Table, tableData?: StructureToAstTableData, checks?: ColumnChecks) => [key: string, column: ColumnType];
 
 declare const astToMigration: (currentSchema: string, config: AnyRakeDbConfig, asts: RakeDbAst[]) => string | undefined;
 
@@ -1746,6 +1749,11 @@ declare const commentsToQuery: (schemaTable: {
 }, comments: ColumnComment[]) => SingleSql[];
 declare const primaryKeyToSql: (primaryKey: Exclude<TableData['primaryKey'], undefined>) => string;
 declare const interpolateSqlValues: ({ text, values }: TableQuery) => string;
+interface ColumnNamedCheck extends ColumnDataCheckBase {
+    name: string;
+}
+declare const nameColumnChecks: (table: string, column: string, checks: ColumnDataCheckBase[]) => ColumnNamedCheck[];
+declare const cmpRawSql: (a: RawSQLBase, b: RawSQLBase) => boolean;
 
 /**
  * Type of {@link rakeDb} function
@@ -1831,4 +1839,4 @@ declare const promptText: ({ message, default: def, password, min, }: {
     min?: number;
 }) => Promise<string>;
 
-export { type AnyRakeDbConfig, type ChangeCallback, type ChangeTableCallback, type ChangeTableOptions, type ColumnComment, type ColumnsShapeCallback, type CommandFn, type DbMigration, DbStructure, type DbStructureDomainsMap, type DropMode, type GetIndexOrExcludeName, type InputRakeDbConfig, type InputRakeDbConfigBase, type IntrospectedStructure, Migration, type MigrationAdapter, type MigrationColumnTypes, type ModuleExportsRecord, NoMigrationsTableError, RAKE_DB_LOCK_KEY, type RakeDbAppliedVersions, RakeDbAst, type RakeDbBaseTable, type RakeDbChangeFn, type RakeDbConfig, type RakeDbCtx, type RakeDbFn, type RakeDbFnReturns, type RakeDbLazyFn, type RakeDbMigrationId, type RakeDbRenameMigrations, type RakeDbRenameMigrationsInput, type RakeDbRenameMigrationsMap, type RakeDbResult, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, type TableOptions, 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 { type AnyRakeDbConfig, type ChangeCallback, type ChangeTableCallback, type ChangeTableOptions, type ColumnChecks, type ColumnComment, type ColumnNamedCheck, type ColumnsShapeCallback, type CommandFn, type DbMigration, DbStructure, type DbStructureDomainsMap, type DropMode, type GetIndexOrExcludeName, type InputRakeDbConfig, type InputRakeDbConfigBase, type IntrospectedStructure, Migration, type MigrationAdapter, type MigrationColumnTypes, type ModuleExportsRecord, NoMigrationsTableError, RAKE_DB_LOCK_KEY, type RakeDbAppliedVersions, RakeDbAst, type RakeDbBaseTable, type RakeDbChangeFn, type RakeDbConfig, type RakeDbCtx, type RakeDbFn, type RakeDbFnReturns, type RakeDbLazyFn, type RakeDbMigrationId, type RakeDbRenameMigrations, type RakeDbRenameMigrationsInput, type RakeDbRenameMigrationsMap, type RakeDbResult, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, type TableOptions, 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 };

package/dist/index.js

@@ -128,8 +128,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}`);
@@ -449,6 +453,19 @@ const interpolateSqlValues = ({ text, values }) => {
     return pqb.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) {
@@ -496,6 +513,10 @@ const createTable = async (migration, up, tableName, first, second, third) => {
       language
     );
     tableData = pqb.parseTableData(dataFn);
+    tableData.constraints?.forEach((x, i) => {
+      if (x.name || !x.check) return;
+      x.name = `${tableName}_check${i === 0 ? "" : i}`;
+    });
   } else {
     shape = tableData = orchidCore.emptyObject;
   }
@@ -745,7 +766,7 @@ const addOrDrop = (type, item, options) => {
       type: "change",
       from: {},
       to: {
-        check: item.data.check
+        checks: item.data.checks
       }
     });
     return {
@@ -1194,20 +1215,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
@@ -2315,9 +2339,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}`;
@@ -3938,7 +3962,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
@@ -3952,7 +3980,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",
@@ -4171,10 +4198,10 @@ const makeDomainsMap = (ctx, data) => {
       default: it.default,
       typmod: -1
     });
-    if (it.check) {
-      column.data.check = {
-        sql: new pqb.RawSQL([[it.check]])
-      };
+    if (it.checks) {
+      column.data.checks = it.checks.map((check) => ({
+        sql: new pqb.RawSQL([[check]])
+      }));
     }
     domains[`${it.schemaName}.${it.name}`] = column;
   }
@@ -4403,8 +4430,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;
 }, {});
@@ -4439,11 +4467,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 pqb.RawSQL([[check]])
-    };
+    }));
   }
   const camelCaseName = orchidCore.toCamelCase(item.name);
   if (ctx.snakeCase) {
@@ -5792,6 +5820,7 @@ exports.astToMigration = astToMigration;
 exports.changeCache = changeCache;
 exports.changeEnumValues = changeEnumValues;
 exports.clearChanges = clearChanges;
+exports.cmpRawSql = cmpRawSql;
 exports.colors = colors;
 exports.columnToSql = columnToSql;
 exports.columnTypeToSql = columnTypeToSql;
@@ -5836,6 +5865,7 @@ exports.makeStructureToAstCtx = makeStructureToAstCtx;
 exports.migrate = migrate;
 exports.migrateOrRollback = migrateOrRollback;
 exports.migrationConfigDefaults = migrationConfigDefaults;
+exports.nameColumnChecks = nameColumnChecks;
 exports.newMigration = newMigration;
 exports.pluralize = pluralize;
 exports.primaryKeyToSql = primaryKeyToSql;