drizzle-kit 0.14.7 → 0.15.0

package/index.js

@@ -10901,10 +10901,11 @@ var init_pgSerializer = __esm({
       const result = {};
       for (const table4 of tables) {
         const tableName = (0, import_table.getTableName)(table4);
+        const { columns, indexes, foreignKeys, checks } = (0, import_utils.getTableConfig)(table4);
         const columnsObject = {};
         const indexesObject = {};
         const foreignKeysObject = {};
-        (0, import_utils.getTableColumns)(table4).forEach((column5) => {
+        columns.forEach((column5) => {
           const notNull = column5.notNull;
           const primaryKey = column5.primary;
           const sqlTypeLowered = column5.getSQLType().toLowerCase();
@@ -10940,7 +10941,7 @@ var init_pgSerializer = __esm({
           }
           columnsObject[column5.name] = columnToSet;
         });
-        const foreignKeys = (0, import_utils.getTableForeignKeys)(table4).map((fk4) => {
+        const fks = foreignKeys.map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
           const onDelete = fk4.onDelete;
@@ -10959,18 +10960,18 @@ var init_pgSerializer = __esm({
             onUpdate
           };
         });
-        foreignKeys.forEach((it) => {
+        fks.forEach((it) => {
           foreignKeysObject[it.name] = it;
         });
-        (0, import_utils.getTableIndexes)(table4).forEach((value) => {
+        indexes.forEach((value) => {
           var _a;
-          const columns = value.config.columns;
+          const columns2 = value.config.columns;
           let name = value.config.name;
           name = name ? name : indexName(
             tableName,
-            columns.map((it) => it.name)
+            columns2.map((it) => it.name)
           );
-          let indexColumns = columns.map((it) => {
+          let indexColumns = columns2.map((it) => {
             if (it instanceof import_sql.SQL) {
               return dialect4.sqlToQuery(it).sql;
             } else {
@@ -11516,10 +11517,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 +11984,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 +11992,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 +12150,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 +18401,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 +18411,8 @@ var init_jsonDiffer = __esm({
         addedIndexes,
         deletedIndexes,
         addedForeignKeys,
-        deletedForeignKeys
+        deletedForeignKeys,
+        alteredForeignKeys
       };
     };
     alternationsInColumn = (column5) => {
@@ -18441,7 +18460,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 +18671,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 +18849,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 +18925,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 +18946,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 +18955,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);
@@ -25094,7 +25135,7 @@ var init_introspect = __esm({
         );
         statement += "}";
         const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
-          return it.columnsFrom.length > 1 || isSelf(it) || isCyclic(it);
+          return it.columnsFrom.length > 1 || isSelf(it);
         });
         if (Object.keys(table4.indexes).length > 0 || filteredFKs.length > 0) {
           statement += ",\n";
@@ -25108,7 +25149,12 @@ var init_introspect = __esm({
         statement += ");";
         return statement;
       });
-      const uniquePgImports = ["pgTable", "pgEnum", ...new Set(imports.pg)];
+      const uniquePgImports = [
+        "pgTable",
+        "pgEnum",
+        "AnyPgColumn",
+        ...new Set(imports.pg)
+      ];
       let result = `import { ${uniquePgImports.join(
         ", "
       )} } from "drizzle-orm-pg"
@@ -25253,7 +25299,7 @@ var init_introspect = __esm({
     createTableColumns = (columns, fks, enumTypes) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
-        return !isSelf(it) && !isCyclic(it);
+        return !isSelf(it);
       }).filter((it) => it.columnsFrom.length === 1);
       const fkByColumnName = oneColumnsFKs.reduce((res, it) => {
         const arr = res[it.columnsFrom[0]] || [];
@@ -25272,11 +25318,12 @@ var init_introspect = __esm({
             const onDelete = it2.onDelete && it2.onDelete !== "no action" ? it2.onDelete : null;
             const onUpdate = it2.onUpdate && it2.onUpdate !== "no action" ? it2.onUpdate : null;
             const params = { onDelete, onUpdate };
+            const typeSuffix = isCyclic(it2) ? ": AnyPgColumn" : "";
             const paramsStr = objToStatement2(params);
             if (paramsStr) {
-              return `.references(() => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()}, ${paramsStr} )`;
+              return `.references(()${typeSuffix} => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()}, ${paramsStr} )`;
             }
-            return `.references(() => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()})`;
+            return `.references(()${typeSuffix} => ${it2.tableTo.camelCase()}.${it2.columnsTo[0].camelCase()})`;
           }).join("");
           statement += fksStatement;
         }
@@ -25304,11 +25351,13 @@ var init_introspect = __esm({
     createTableFKs = (fks) => {
       let statement = "";
       fks.forEach((it) => {
+        const isSelf2 = it.tableTo === it.tableFrom;
+        const tableTo = isSelf2 ? "table" : `${it.tableTo.camelCase()}`;
         statement += `		${it.name.camelCase()}: foreignKey({
 `;
         statement += `			columns: [${it.columnsFrom.map((i) => `table.${i.camelCase()}`).join(", ")}],
 `;
-        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${it.tableTo.camelCase()}.${i.camelCase()}`).join(", ")}]
+        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${tableTo}.${i.camelCase()}`).join(", ")}]
 `;
         statement += `		})`;
         statement += it.onUpdate && it.onUpdate !== "no action" ? `.onUpdate("${it.onUpdate}")` : "";
@@ -25632,7 +25681,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.14.7",
+  version: "0.15.0",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",
@@ -25685,10 +25734,10 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^5.1.0",
     dockerode: "^3.3.4",
-    "drizzle-orm": "0.15.0-a90d3bc",
-    "drizzle-orm-mysql": "0.15.0-a90d3bc",
-    "drizzle-orm-pg": "0.15.0-a90d3bc",
-    "drizzle-orm-sqlite": "0.15.0-a90d3bc",
+    "drizzle-orm": "0.15.0-60954a3",
+    "drizzle-orm-mysql": "0.15.0-60954a3",
+    "drizzle-orm-pg": "0.15.0-60954a3",
+    "drizzle-orm-sqlite": "0.15.0-60954a3",
     esbuild: "^0.15.7",
     "esbuild-register": "^3.3.3",
     eslint: "^8.29.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.14.7",
+  "version": "0.15.0",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
@@ -35,10 +35,10 @@
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
-    "drizzle-orm": "0.15.0-a90d3bc",
-    "drizzle-orm-mysql": "0.15.0-a90d3bc",
-    "drizzle-orm-pg": "0.15.0-a90d3bc",
-    "drizzle-orm-sqlite": "0.15.0-a90d3bc",
+    "drizzle-orm": "0.15.0-60954a3",
+    "drizzle-orm-mysql": "0.15.0-60954a3",
+    "drizzle-orm-pg": "0.15.0-60954a3",
+    "drizzle-orm-sqlite": "0.15.0-60954a3",
     "esbuild": "^0.15.7",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.29.0",