drizzle-kit 0.14.7 → 0.14.8

package/index.js

@@ -11516,10 +11516,11 @@ var init_serializer = __esm({
 });
 
 // src/sqlgenerator.ts
-var pgNativeTypes, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, AlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, SqliteDropIndexConvertor, convertors, fromJson;
+var pgNativeTypes, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, SqliteDropIndexConvertor, convertors, fromJson;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
     init_schemaValidator();
+    init_mysqlSchema();
     init_sqliteSchema();
     pgNativeTypes = /* @__PURE__ */ new Set([
       "uuid",
@@ -11982,7 +11983,7 @@ var init_sqlgenerator = __esm({
           columnsTo,
           onDelete,
           onUpdate
-        } = PgSquasher.unsquashFK(statement.data);
+        } = MySqlSquasher.unsquashFK(statement.data);
         const onDeleteStatement = onDelete ? `ON DELETE ${onDelete}` : "";
         const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
         const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
@@ -11990,11 +11991,26 @@ var init_sqlgenerator = __esm({
         return `ALTER TABLE ${tableFrom} ADD CONSTRAINT ${name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement};`.replace(/  +/g, " ").trim();
       }
     };
-    AlterForeignKeyConvertor = class extends Convertor {
-      can(statement) {
-        return statement.type === "alter_reference";
+    PgAlterForeignKeyConvertor = class extends Convertor {
+      can(statement, dialect8) {
+        return statement.type === "alter_reference" && dialect8 === "pg";
       }
       convert(statement) {
+        const newFk = PgSquasher.unsquashFK(statement.data);
+        const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
+        let sql = `ALTER TABLE ${oldFk.tableFrom} DROP FOREIGN KEY ${oldFk.name};
+`;
+        const onDeleteStatement = newFk.onDelete || "";
+        const onUpdateStatement = 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}`.replace(/  +/g, " ").trim();
+        sql += "DO $$ BEGIN\n";
+        sql += " " + alterStatement + ";\n";
+        sql += "EXCEPTION\n";
+        sql += " WHEN duplicate_object THEN null;\n";
+        sql += "END $$;\n";
+        return sql;
         throw new Error("TODO");
       }
     };
@@ -12133,7 +12149,7 @@ var init_sqlgenerator = __esm({
     convertors.push(new PgAlterTableAlterColumnDropDefaultConvertor());
     convertors.push(new PgCreateForeignKeyConvertor());
     convertors.push(new MySqlCreateForeignKeyConvertor());
-    convertors.push(new AlterForeignKeyConvertor());
+    convertors.push(new PgAlterForeignKeyConvertor());
     convertors.push(new PgDeleteForeignKeyConvertor());
     convertors.push(new MySqlDeleteForeignKeyConvertor());
     convertors.push(new SQLiteAlterTableAlterColumnSetTypeConvertor());
@@ -18384,6 +18400,7 @@ var init_jsonDiffer = __esm({
       const addedForeignKeys = Object.fromEntries(
         Object.entries(table4.foreignKeys__added || {}).concat(Object.entries(table4.foreignKeys || {}).filter((it) => it[0].includes("__added"))).map((entry) => [entry[0].replace("__added", ""), entry[1]])
       );
+      const alteredForeignKeys = Object.fromEntries(Object.entries(table4.foreignKeys || {}).filter((it) => !it[0].endsWith("__added") && !it[0].endsWith("__deleted")).map((entry) => [entry[0], entry[1]]));
       const mappedAltered = altered.map((it) => alternationsInColumn(it));
       return {
         name: table4.name,
@@ -18393,7 +18410,8 @@ var init_jsonDiffer = __esm({
         addedIndexes,
         deletedIndexes,
         addedForeignKeys,
-        deletedForeignKeys
+        deletedForeignKeys,
+        alteredForeignKeys
       };
     };
     alternationsInColumn = (column5) => {
@@ -18441,7 +18459,7 @@ var init_jsonDiffer = __esm({
 });
 
 // src/jsonStatements.ts
-var prepareCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareRenameColumns, prepareAlterTableColumnsJson, _prepareDropColumns, _prepareAddColumns, _prepareSQLiteAddColumns, _prepareAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareDropIndexesJson;
+var prepareCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareRenameColumns, prepareAlterTableColumnsJson, _prepareDropColumns, _prepareAddColumns, _prepareSQLiteAddColumns, _prepareAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson;
 var init_jsonStatements = __esm({
   "src/jsonStatements.ts"() {
     init_sqliteSchema();
@@ -18652,6 +18670,16 @@ var init_jsonStatements = __esm({
         };
       });
     };
+    prepareAlterReferencesJson = (tableName, foreignKeys) => {
+      return Object.values(foreignKeys).map((fkData) => {
+        return {
+          type: "alter_reference",
+          tableName,
+          data: fkData.__new,
+          oldFkey: fkData.__old
+        };
+      });
+    };
     prepareDropIndexesJson = (tableName, indexes) => {
       return Object.values(indexes).map((indexData) => {
         return {
@@ -18820,7 +18848,14 @@ var init_snapshotsDiffer = __esm({
       addedIndexes: recordType(stringType(), stringType()),
       deletedIndexes: recordType(stringType(), stringType()),
       addedForeignKeys: recordType(stringType(), stringType()),
-      deletedForeignKeys: recordType(stringType(), stringType())
+      deletedForeignKeys: recordType(stringType(), stringType()),
+      alteredForeignKeys: recordType(
+        stringType(),
+        objectType({
+          __new: stringType(),
+          __old: stringType()
+        }).strict()
+      )
     }).strict();
     diffResultScheme = objectType({
       addedTables: tableScheme.array(),
@@ -18889,7 +18924,8 @@ var init_snapshotsDiffer = __esm({
           addedIndexes: table4.addedIndexes,
           deletedIndexes: table4.deletedIndexes,
           addedForeignKeys: table4.addedForeignKeys,
-          deletedForeignKeys: table4.deletedForeignKeys
+          deletedForeignKeys: table4.deletedForeignKeys,
+          alteredForeignKeys: table4.alteredForeignKeys
         };
         allAlteredResolved.push(resolved);
       }
@@ -18909,7 +18945,7 @@ var init_snapshotsDiffer = __esm({
       const jsonDropIndexesForAllAlteredTables = allAltered.map((it) => {
         return prepareDropIndexesJson(it.name, it.deletedIndexes || {});
       }).flat();
-      const jsonReferencesForCreatedTables = created.map((it) => {
+      const jsonCreateReferencesForCreatedTables = created.map((it) => {
         return prepareCreateReferencesJson(it.name, it.foreignKeys);
       }).flat();
       const jsonReferencesForAllAlteredTables = allAltered.map((it) => {
@@ -18918,9 +18954,13 @@ var init_snapshotsDiffer = __esm({
           it.name,
           it.deletedForeignKeys
         );
-        return [...forAdded, ...forAltered];
+        const alteredFKs = prepareAlterReferencesJson(
+          it.name,
+          it.alteredForeignKeys
+        );
+        return [...forAdded, ...forAltered, ...alteredFKs];
       }).flat();
-      const jsonCreateReferences = jsonReferencesForCreatedTables;
+      const jsonCreateReferences = jsonCreateReferencesForCreatedTables;
       const jsonAlterReferencesForAlteredTables = jsonReferencesForAllAlteredTables;
       const createEnums = (_b = (_a = typedResult.addedEnums) == null ? void 0 : _a.map((it) => {
         return prepareCreateEnumJson(it.name, it.values);
@@ -25632,7 +25672,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.14.7",
+  version: "0.14.8",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.14.7",
+  "version": "0.14.8",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",