drizzle-kit 0.18.0-a7a8954 → 0.18.1-c38539c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.18.0-a7a8954",
+  "version": "0.18.1-c38539c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -11,11 +11,11 @@
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg",
     "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
     "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
-    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --config drizzle.config2.ts",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
     "drop": "node -r esbuild-register ./src/cli/index.ts drop --out ./dev/migrations-pg",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",

package/readme.md

@@ -3,6 +3,10 @@
 DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like deletions and renames by prompting user input.
 <https://github.com/drizzle-team/drizzle-kit-mirror> - is a mirror repository for issues.
 
+## Documentation
+
+Check the full documenation on [the website](https://orm.drizzle.team/kit-docs/overview)
+
 ### How it works
 
 `drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version, if there's one.
@@ -61,8 +65,17 @@ npm install -D drizzle-kit
 
 Running with CLI options
 
+```jsonc
+// package.json
+{
+ "scripts": {
+  "generate": "drizzle-kit generate:pg --out migrations-folder --schema src/db/schema.ts"
+ }
+}
+```
+
 ```shell
-npx drizzle-kit generate:pg --out migrations-folder --schema src/db/schema.ts
+npm run generate
 ```
 
 ### Configuration

package/utils.js

@@ -21546,9 +21546,28 @@ var AlterTypeAddValueConvertor = class extends Convertor {
     return `ALTER TYPE "${name}" ADD VALUE '${value}';`;
   }
 };
-var DropTableConvertor = class extends Convertor {
-  can(statement) {
-    return statement.type === "drop_table";
+var PgDropTableConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "drop_table" && dialect3 === "pg";
+  }
+  convert(statement) {
+    const { tableName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `DROP TABLE ${tableNameWithSchema};`;
+  }
+};
+var MySQLDropTableConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "drop_table" && dialect3 === "mysql";
+  }
+  convert(statement) {
+    const { tableName } = statement;
+    return `DROP TABLE \`${tableName}\`;`;
+  }
+};
+var SQLiteDropTableConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "drop_table" && dialect3 === "sqlite";
   }
   convert(statement) {
     const { tableName } = statement;
@@ -21591,8 +21610,9 @@ var PgAlterTableRenameColumnConvertor = class extends Convertor {
     return statement.type === "alter_table_rename_column" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, oldColumnName, newColumnName } = statement;
-    return `ALTER TABLE "${tableName}" RENAME COLUMN "${oldColumnName}" TO "${newColumnName}";`;
+    const { tableName, oldColumnName, newColumnName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} RENAME COLUMN "${oldColumnName}" TO "${newColumnName}";`;
   }
 };
 var MySqlAlterTableRenameColumnConvertor = class extends Convertor {
@@ -21618,8 +21638,9 @@ var PgAlterTableDropColumnConvertor = class extends Convertor {
     return statement.type === "alter_table_drop_column" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" DROP COLUMN IF EXISTS "${columnName}";`;
+    const { tableName, columnName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} DROP COLUMN IF EXISTS "${columnName}";`;
   }
 };
 var MySqlAlterTableDropColumnConvertor = class extends Convertor {
@@ -21645,12 +21666,13 @@ var PgAlterTableAddColumnConvertor = class extends Convertor {
     return statement.type === "alter_table_add_column" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, column: column4 } = statement;
+    const { tableName, column: column4, schema: schema4 } = statement;
     const { name, type, notNull } = column4;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
     const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
     const fixedType = isPgNativeType(column4.type) ? column4.type : `"${column4.type}"`;
     const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
-    return `ALTER TABLE "${tableName}" ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement};`;
+    return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement};`;
   }
 };
 var MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -21688,8 +21710,9 @@ var PgAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
     return statement.type === "alter_table_alter_column_set_type" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, columnName, newDataType } = statement;
-    return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET DATA TYPE ${newDataType};`;
+    const { tableName, columnName, newDataType, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET DATA TYPE ${newDataType};`;
   }
 };
 var SQLiteAlterTableAlterColumnSetTypeConvertor = class extends Convertor {
@@ -21712,8 +21735,9 @@ var PgAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
     return statement.type === "alter_table_alter_column_set_default" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET DEFAULT ${statement.newDefaultValue};`;
+    const { tableName, columnName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET DEFAULT ${statement.newDefaultValue};`;
   }
 };
 var SqliteAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
@@ -21736,8 +21760,9 @@ var PgAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
     return statement.type === "alter_table_alter_column_drop_default" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP DEFAULT;`;
+    const { tableName, columnName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
   }
 };
 var MySqlAlterTableAddPk = class extends Convertor {
@@ -21848,7 +21873,8 @@ var PgAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
   }
   convert(statement) {
     const { name, columns } = PgSquasher.unsquashPK(statement.data);
-    return `ALTER TABLE "${statement.tableName}" ADD CONSTRAINT "${statement.constraintName}" PRIMARY KEY("${columns.join('","')}");`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${statement.constraintName}" PRIMARY KEY("${columns.join('","')}");`;
   }
 };
 var PgAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
@@ -21857,7 +21883,8 @@ var PgAlterTableDeleteCompositePrimaryKeyConvertor = class extends Convertor {
   }
   convert(statement) {
     const { name, columns } = PgSquasher.unsquashPK(statement.data);
-    return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT "${statement.constraintName}";`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${statement.constraintName}";`;
   }
 };
 var PgAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
@@ -21869,8 +21896,9 @@ var PgAlterTableAlterCompositePrimaryKeyConvertor = class extends Convertor {
     const { name: newName, columns: newColumns } = PgSquasher.unsquashPK(
       statement.new
     );
-    return `ALTER TABLE "${statement.tableName}" DROP CONSTRAINT ${statement.oldConstraintName};
-${BREAKPOINT}ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT ${statement.oldConstraintName};
+${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newConstraintName} PRIMARY KEY(${newColumns.join(",")});`;
   }
 };
 var MySqlAlterTableCreateCompositePrimaryKeyConvertor = class extends Convertor {
@@ -21988,7 +22016,9 @@ var PgAlterTableAlterColumnSetPrimaryKeyConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" ADD PRIMARY KEY ("${columnName}");`;
+    console.log(statement);
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ADD PRIMARY KEY ("${columnName}");`;
   }
 };
 var PgAlterTableAlterColumnDropPrimaryKeyConvertor = class extends Convertor {
@@ -22021,7 +22051,8 @@ var PgAlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" SET NOT NULL;`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" SET NOT NULL;`;
   }
 };
 var SqliteAlterTableAlterColumnSetNotNullConvertor = class extends Convertor {
@@ -22045,7 +22076,8 @@ var PgAlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    return `ALTER TABLE "${tableName}" ALTER COLUMN "${columnName}" DROP NOT NULL;`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} ALTER COLUMN "${columnName}" DROP NOT NULL;`;
   }
 };
 var SqliteAlterTableAlterColumnDropNotNullConvertor = class extends Convertor {
@@ -22081,7 +22113,9 @@ var PgCreateForeignKeyConvertor = class extends Convertor {
     const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
     const fromColumnsString = columnsFrom.map((it) => `"${it}"`).join(",");
     const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
-    const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
+    const tableToNameWithSchema = statement.schema ? `"${statement.schema}"."${tableTo}"` : `"${tableTo}"`;
+    const alterStatement = `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${name}" FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableToNameWithSchema}(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
     let sql = "DO $$ BEGIN\n";
     sql += " " + alterStatement + ";\n";
     sql += "EXCEPTION\n";
@@ -22132,13 +22166,15 @@ var PgAlterForeignKeyConvertor = class extends Convertor {
   convert(statement) {
     const newFk = PgSquasher.unsquashFK(statement.data);
     const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
-    let sql = `ALTER TABLE "${oldFk.tableFrom}" DROP CONSTRAINT "${oldFk.name}";
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${oldFk.tableFrom}"` : `"${oldFk.tableFrom}"`;
+    let sql = `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${oldFk.name}";
 `;
     const onDeleteStatement = newFk.onDelete ? ` ON DELETE ${newFk.onDelete}` : "";
     const onUpdateStatement = newFk.onUpdate ? ` ON UPDATE ${newFk.onUpdate}` : "";
     const fromColumnsString = newFk.columnsFrom.map((it) => `"${it}"`).join(",");
     const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
-    const alterStatement = `ALTER TABLE "${newFk.tableFrom}" ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${newFk.tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
+    const tableFromNameWithSchema = statement.schema ? `"${statement.schema}"."${newFk.tableFrom}"` : `"${newFk.tableFrom}"`;
+    const alterStatement = `ALTER TABLE ${tableFromNameWithSchema} ADD CONSTRAINT "${newFk.name}" FOREIGN KEY (${fromColumnsString}) REFERENCES "${newFk.tableTo}"(${toColumnsString})${onDeleteStatement}${onUpdateStatement}`;
     sql += "DO $$ BEGIN\n";
     sql += " " + alterStatement + ";\n";
     sql += "EXCEPTION\n";
@@ -22168,7 +22204,8 @@ var PgDeleteForeignKeyConvertor = class extends Convertor {
   convert(statement) {
     const tableFrom = statement.tableName;
     const { name } = PgSquasher.unsquashFK(statement.data);
-    return `ALTER TABLE "${tableFrom}" DROP CONSTRAINT "${name}";
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${tableFrom}"` : `"${tableFrom}"`;
+    return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT "${name}";
 `;
   }
 };
@@ -22205,7 +22242,8 @@ var CreatePgIndexConvertor = class extends Convertor {
     const { name, columns, isUnique } = PgSquasher.unsquashIdx(statement.data);
     const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
     const value = columns.map((it) => `"${it}"`).join(",");
-    return `CREATE ${indexPart} IF NOT EXISTS "${name}" ON "${statement.tableName}" (${value});`;
+    const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
+    return `CREATE ${indexPart} IF NOT EXISTS "${name}" ON ${tableNameWithSchema} (${value});`;
   }
 };
 var CreateMySqlIndexConvertor = class extends Convertor {
@@ -22289,8 +22327,9 @@ var PgAlterTableSetNewSchemaConvertor = class extends Convertor {
     return statement.type === "alter_table_set_new_schema" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName, to } = statement;
-    return `ALTER TABLE "${tableName}" SET SCHEMA "${to}";
+    const { tableName, to, from } = statement;
+    const tableNameWithSchema = from ? `"${from}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} SET SCHEMA "${to}";
 `;
   }
 };
@@ -22299,8 +22338,9 @@ var PgAlterTableRemoveFromSchemaConvertor = class extends Convertor {
     return statement.type === "alter_table_remove_from_schema" && dialect3 === "pg";
   }
   convert(statement) {
-    const { tableName } = statement;
-    return `ALTER TABLE "${tableName}" SET SCHEMA public;
+    const { tableName, schema: schema4 } = statement;
+    const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
+    return `ALTER TABLE ${tableNameWithSchema} SET SCHEMA public;
 `;
   }
 };
@@ -22384,7 +22424,9 @@ convertors.push(new PgCreateTableConvertor());
 convertors.push(new MySqlCreateTableConvertor());
 convertors.push(new SQLiteCreateTableConvertor());
 convertors.push(new CreateTypeEnumConvertor());
-convertors.push(new DropTableConvertor());
+convertors.push(new PgDropTableConvertor());
+convertors.push(new MySQLDropTableConvertor());
+convertors.push(new SQLiteDropTableConvertor());
 convertors.push(new PgRenameTableConvertor());
 convertors.push(new MySqlRenameTableConvertor());
 convertors.push(new SqliteRenameTableConvertor());
@@ -22764,6 +22806,7 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
         tableName,
         columnName,
         newDefaultValue: column4.default.new,
+        oldDefaultValue: column4.default.old,
         schema: schema4,
         columnOnUpdate,
         columnNotNull,
@@ -22837,6 +22880,7 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
         setPkStatements.push({
           type: "alter_table_alter_column_set_pk",
           tableName,
+          schema: schema4,
           columnName
         });
       }
@@ -22903,15 +22947,21 @@ var prepareDropReferencesJson = (tableName, schema4, foreignKeys) => {
   });
 };
 var prepareAlterReferencesJson = (tableName, schema4, foreignKeys) => {
-  return Object.values(foreignKeys).map((fkData) => {
-    return {
-      type: "alter_reference",
-      tableName,
-      data: fkData.__new,
-      oldFkey: fkData.__old,
-      schema: schema4
-    };
-  });
+  const keys = Object.keys(foreignKeys);
+  const stmts = [];
+  if (keys.length > 0) {
+    stmts.push(
+      ...prepareDropReferencesJson(tableName, schema4, {
+        [keys[0]]: foreignKeys[keys[0]].__old
+      })
+    );
+    stmts.push(
+      ...prepareCreateReferencesJson(tableName, schema4, {
+        [keys[0]]: foreignKeys[keys[0]].__new
+      })
+    );
+  }
+  return stmts;
 };
 var prepareDropIndexesJson = (tableName, schema4, indexes) => {
   return Object.values(indexes).map((indexData) => {
@@ -22951,33 +23001,36 @@ var prepareAlterCompositePrimaryKeySqlite = (tableName, pks) => {
     };
   });
 };
-var prepareAddCompositePrimaryKeyPg = (tableName, pks, json2) => {
+var prepareAddCompositePrimaryKeyPg = (tableName, schema4, pks, json2) => {
   return Object.values(pks).map((it) => {
     return {
       type: "create_composite_pk",
       tableName,
       data: it,
+      schema: schema4,
       constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
     };
   });
 };
-var prepareDeleteCompositePrimaryKeyPg = (tableName, pks, json1) => {
+var prepareDeleteCompositePrimaryKeyPg = (tableName, schema4, pks, json1) => {
   return Object.values(pks).map((it) => {
     return {
       type: "delete_composite_pk",
       tableName,
       data: it,
+      schema: schema4,
       constraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it).columns.join("_")}`].name
     };
   });
 };
-var prepareAlterCompositePrimaryKeyPg = (tableName, pks, json1, json2) => {
+var prepareAlterCompositePrimaryKeyPg = (tableName, schema4, pks, json1, json2) => {
   return Object.values(pks).map((it) => {
     return {
       type: "alter_composite_pk",
       tableName,
       old: it.__old,
       new: it.__new,
+      schema: schema4,
       oldConstraintName: json1.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__old).columns.join("_")}`].name,
       newConstraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${PgSquasher.unsquashPK(it.__new).columns.join("_")}`].name
     };
@@ -23252,6 +23305,7 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   const jsonRemoveTableFromSchemas = [];
   const jsonSetNewTableSchemas = [];
   allAlteredResolved.forEach((it) => {
+    const schemaUnwrapped = valueFromSelfOrPatchedNew(it.schema);
     let addedCompositePKs;
     let deletedCompositePKs;
     let alteredCompositePKs;
@@ -23271,16 +23325,19 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
     } else if (dialect3 === "pg") {
       addedCompositePKs = prepareAddCompositePrimaryKeyPg(
         it.name,
+        schemaUnwrapped,
         it.addedCompositePKs,
         curFull
       );
       deletedCompositePKs = prepareDeleteCompositePrimaryKeyPg(
         it.name,
+        schemaUnwrapped,
         it.deletedCompositePKs,
         prevFull
       );
       alteredCompositePKs = prepareAlterCompositePrimaryKeyPg(
         it.name,
+        schemaUnwrapped,
         it.alteredCompositePKs,
         prevFull,
         curFull
@@ -23389,8 +23446,12 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
       },
       {}
     );
-    jsonCreateIndexesForAllAlteredTables.push(...prepareCreateIndexesJson(it.name, schema4, createdIndexes || {}));
-    jsonDropIndexesForAllAlteredTables.push(...prepareDropIndexesJson(it.name, schema4, droppedIndexes || {}));
+    jsonCreateIndexesForAllAlteredTables.push(
+      ...prepareCreateIndexesJson(it.name, schema4, createdIndexes || {})
+    );
+    jsonDropIndexesForAllAlteredTables.push(
+      ...prepareDropIndexesJson(it.name, schema4, droppedIndexes || {})
+    );
   });
   const jsonCreateReferencesForCreatedTables = created.map((it) => {
     return prepareCreateReferencesJson(it.name, it.schema, it.foreignKeys);
@@ -23411,7 +23472,12 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
     return [...forAdded, ...forAltered, ...alteredFKs];
   }).flat();
   const jsonCreateReferences = jsonCreateReferencesForCreatedTables;
-  const jsonAlterReferencesForAlteredTables = jsonReferencesForAllAlteredTables;
+  const jsonCreatedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+    (t) => t.type === "create_reference"
+  );
+  const jsonDroppedReferencesForAlteredTables = jsonReferencesForAllAlteredTables.filter(
+    (t) => t.type === "delete_reference"
+  );
   const createEnums = (_b = (_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
     return prepareCreateEnumJson(it.name, it.values);
   })) != null ? _b : [];
@@ -23459,15 +23525,16 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   jsonStatements.push(...jsonRenameTables);
   jsonStatements.push(...jsonRenameColumnsStatements);
   jsonStatements.push(...jsonDeletedCompositePKs);
+  jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
   jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
   jsonStatements.push(...jsonTableAlternations.alterColumns);
   jsonStatements.push(...jsonTableAlternations.createColumns);
-  jsonStatements.push(...jsonAlterReferencesForAlteredTables);
+  jsonStatements.push(...jsonCreateIndexesForCreatedTables);
+  jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
+  jsonStatements.push(...jsonCreatedReferencesForAlteredTables);
   jsonStatements.push(...jsonTableAlternations.dropColumns);
   if (dialect3 !== "sqlite")
     jsonStatements.push(...jsonCreateReferences);
-  jsonStatements.push(...jsonCreateIndexesForCreatedTables);
-  jsonStatements.push(...jsonCreateIndexesForAllAlteredTables);
   jsonStatements.push(...jsonAddedCompositePKs);
   jsonStatements.push(...jsonAlteredCompositePKs);
   jsonStatements.push(...jsonSetTableSchemas);