drizzle-kit 0.19.4-befd1c5 → 0.19.5-0b8d69c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.4-befd1c5",
+  "version": "0.19.5-0b8d69c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -79,7 +79,7 @@
     "better-sqlite3": "^8.4.0",
     "dockerode": "^3.3.4",
     "dotenv": "^16.0.3",
-    "drizzle-orm": "0.27.0-e9da18b",
+    "drizzle-orm": "0.27.1-8a21e7b",
     "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",

package/utils.js

@@ -12822,7 +12822,8 @@ var tableSquashed = objectType({
   columns: recordType(stringType(), column),
   indexes: recordType(stringType(), stringType()),
   foreignKeys: recordType(stringType(), stringType()),
-  compositePrimaryKeys: recordType(stringType(), stringType())
+  compositePrimaryKeys: recordType(stringType(), stringType()),
+  uniqueConstraints: recordType(stringType(), stringType()).default({})
 }).strict();
 var schemaSquashed = objectType({
   version: literalType("5"),
@@ -13237,12 +13238,17 @@ var tableV33 = objectType({
   indexes: recordType(stringType(), index3),
   foreignKeys: recordType(stringType(), fk3)
 }).strict();
+var uniqueConstraint3 = objectType({
+  name: stringType(),
+  columns: stringType().array()
+}).strict();
 var table3 = objectType({
   name: stringType(),
   columns: recordType(stringType(), column3),
   indexes: recordType(stringType(), index3),
   foreignKeys: recordType(stringType(), fk3),
-  compositePrimaryKeys: recordType(stringType(), compositePK3)
+  compositePrimaryKeys: recordType(stringType(), compositePK3),
+  uniqueConstraints: recordType(stringType(), uniqueConstraint3).default({})
 }).strict();
 var dialect2 = enumType(["sqlite"]);
 var schemaHash3 = objectType({
@@ -13280,7 +13286,8 @@ var tableSquashed3 = objectType({
   columns: recordType(stringType(), column3),
   indexes: recordType(stringType(), stringType()),
   foreignKeys: recordType(stringType(), stringType()),
-  compositePrimaryKeys: recordType(stringType(), stringType())
+  compositePrimaryKeys: recordType(stringType(), stringType()),
+  uniqueConstraints: recordType(stringType(), stringType()).default({})
 }).strict();
 var schemaSquashed2 = objectType({
   version: latestVersion,
@@ -13303,6 +13310,13 @@ var SQLiteSquasher = {
     });
     return result;
   },
+  squashUnique: (unq) => {
+    return `${unq.name};${unq.columns.join(",")}`;
+  },
+  unsquashUnique: (unq) => {
+    const [name, columns] = unq.split(";");
+    return { name, columns: columns.split(",") };
+  },
   squashFK: (fk4) => {
     return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""}`;
   },
@@ -13666,9 +13680,9 @@ var PgCreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column4.primaryKey ? " PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? " NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
-      const uniqueConstraint3 = column4.isUnique ? ` CONSTRAINT ${column4.uniqueName} UNIQUE${column4.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}` : "";
+      const uniqueConstraint4 = column4.isUnique ? ` CONSTRAINT "${column4.uniqueName}" UNIQUE${column4.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}` : "";
       const type = isPgNativeType(column4.type) ? column4.type : `"${column4.type}"`;
-      statement += `	"${column4.name}" ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${uniqueConstraint3}`;
+      statement += `	"${column4.name}" ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${uniqueConstraint4}`;
       statement += i === columns.length - 1 ? "" : ",\n";
     }
     if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
@@ -13677,10 +13691,10 @@ var PgCreateTableConvertor = class extends Convertor {
       statement += `	CONSTRAINT ${st.compositePkName} PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
     }
     if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
-      for (const uniqueConstraint3 of uniqueConstraints) {
+      for (const uniqueConstraint4 of uniqueConstraints) {
         statement += ",\n";
-        const unsquashedUnique = PgSquasher.unsquashUnique(uniqueConstraint3);
-        statement += `	CONSTRAINT ${unsquashedUnique.name} UNIQUE("${unsquashedUnique.columns.join(`","`)}")`;
+        const unsquashedUnique = PgSquasher.unsquashUnique(uniqueConstraint4);
+        statement += `	CONSTRAINT "${unsquashedUnique.name}" UNIQUE${unsquashedUnique.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}("${unsquashedUnique.columns.join(`","`)}")`;
       }
     }
     statement += `
@@ -13713,13 +13727,13 @@ var MySqlCreateTableConvertor = class extends Convertor {
     if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
       statement += ",\n";
       const compositePK4 = MySqlSquasher.unsquashPK(compositePKs[0]);
-      statement += `	CONSTRAINT ${st.compositePkName} PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
+      statement += `	CONSTRAINT \`${st.compositePkName}\` PRIMARY KEY(\`${compositePK4.columns.join(`\`,\``)}\`)`;
     }
     if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
-      for (const uniqueConstraint3 of uniqueConstraints) {
+      for (const uniqueConstraint4 of uniqueConstraints) {
         statement += ",\n";
-        const unsquashedUnique = MySqlSquasher.unsquashUnique(uniqueConstraint3);
-        statement += `	CONSTRAINT ${unsquashedUnique.name} UNIQUE(\`${unsquashedUnique.columns.join(`\`,\``)}\`)`;
+        const unsquashedUnique = MySqlSquasher.unsquashUnique(uniqueConstraint4);
+        statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(\`${unsquashedUnique.columns.join(`\`,\``)}\`)`;
       }
     }
     statement += `
@@ -13734,22 +13748,29 @@ var SQLiteCreateTableConvertor = class extends Convertor {
     return statement.type === "sqlite_create_table" && dialect3 === "sqlite";
   }
   convert(st) {
-    const { tableName, columns, referenceData, compositePKs } = st;
+    const {
+      tableName,
+      columns,
+      referenceData,
+      compositePKs,
+      uniqueConstraints
+    } = st;
     let statement = "";
-    statement += `CREATE TABLE \`${tableName}\` (`;
+    statement += `CREATE TABLE \`${tableName}\` (
+`;
     for (let i = 0; i < columns.length; i++) {
       const column4 = columns[i];
       const primaryKeyStatement = column4.primaryKey ? " PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? " NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
       const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
-      statement += "\n	";
+      statement += "	";
       statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}`;
-      statement += ",";
+      statement += i === columns.length - 1 ? "" : ",\n";
     }
     compositePKs.forEach((it) => {
-      statement += "\n	";
-      statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")}),`;
+      statement += ",\n	";
+      statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
     });
     for (let i = 0; i < referenceData.length; i++) {
       const referenceAsString = referenceData[i];
@@ -13766,11 +13787,17 @@ var SQLiteCreateTableConvertor = class extends Convertor {
       const onUpdateStatement = onUpdate ? ` ON UPDATE ${onUpdate}` : "";
       const fromColumnsString = columnsFrom.map((it) => `\`${it}\``).join(",");
       const toColumnsString = columnsTo.map((it) => `\`${it}\``).join(",");
+      statement += ",";
       statement += "\n	";
       statement += `FOREIGN KEY (${fromColumnsString}) REFERENCES \`${tableTo}\`(${toColumnsString})${onUpdateStatement}${onDeleteStatement}`;
-      statement += ",";
     }
-    statement = statement.trimChar(",");
+    if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
+      for (const uniqueConstraint4 of uniqueConstraints) {
+        statement += ",\n";
+        const unsquashedUnique = MySqlSquasher.unsquashUnique(uniqueConstraint4);
+        statement += `	CONSTRAINT ${unsquashedUnique.name} UNIQUE(\`${unsquashedUnique.columns.join(`\`,\``)}\`)`;
+      }
+    }
     statement += `
 `;
     statement += `);`;
@@ -13786,7 +13813,7 @@ var PgAlterTableAddUniqueConstraintConvertor = class extends Convertor {
   convert(statement) {
     const unsquashed = PgSquasher.unsquashUnique(statement.data);
     const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
-    return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${unsquashed.name}" UNIQUE("${unsquashed.columns.join('","')}");`;
+    return `ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT "${unsquashed.name}" UNIQUE${unsquashed.nullsNotDistinct ? " NULLS NOT DISTINCT" : ""}("${unsquashed.columns.join('","')}");`;
   }
 };
 var PgAlterTableDropUniqueConstraintConvertor = class extends Convertor {
@@ -13819,6 +13846,32 @@ var MySQLAlterTableDropUniqueConstraintConvertor = class extends Convertor {
     return `ALTER TABLE ${tableNameWithSchema} DROP CONSTRAINT \`${unsquashed.name}\`;`;
   }
 };
+var SQLiteAlterTableAddUniqueConstraintConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "create_unique_constraint" && dialect3 === "sqlite";
+  }
+  convert(statement) {
+    return `/*
+ SQLite does not support "Adding unique constraint to an existing table" out of the box, we do not generate automatic migration for that, so it has to be done manually
+ Please refer to: https://www.techonthenet.com/sqlite/unique.php
+
+ Due to that we don't generate migration automatically and it has to be done manually
+*/`;
+  }
+};
+var SQLiteAlterTableDropUniqueConstraintConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "delete_unique_constraint" && dialect3 === "sqlite";
+  }
+  convert(statement) {
+    return `/*
+ SQLite does not support "Dropping unique constraint from an existing table" out of the box, we do not generate automatic migration for that, so it has to be done manually
+ Please refer to: https://www.techonthenet.com/sqlite/unique.php
+
+ Due to that we don't generate migration automatically and it has to be done manually
+*/`;
+  }
+};
 var CreateTypeEnumConvertor = class extends Convertor {
   can(statement) {
     return statement.type === "create_type_enum";
@@ -14812,6 +14865,8 @@ convertors.push(new SQLiteAlterTableAlterColumnSetTypeConvertor());
 convertors.push(new SqliteAlterForeignKeyConvertor());
 convertors.push(new SqliteDeleteForeignKeyConvertor());
 convertors.push(new SqliteCreateForeignKeyConvertor());
+convertors.push(new SQLiteAlterTableAddUniqueConstraintConvertor());
+convertors.push(new SQLiteAlterTableDropUniqueConstraintConvertor());
 convertors.push(new SqliteAlterTableAlterColumnSetNotNullConvertor());
 convertors.push(new SqliteAlterTableAlterColumnDropNotNullConvertor());
 convertors.push(new SqliteAlterTableAlterColumnSetDefaultConvertor());
@@ -14900,7 +14955,7 @@ var prepareMySqlCreateTableJson = (table4, json2) => {
   };
 };
 var prepareSQLiteCreateTable = (table4) => {
-  const { name, columns } = table4;
+  const { name, columns, uniqueConstraints } = table4;
   const references2 = Object.values(table4.foreignKeys);
   const composites = Object.values(table4.compositePrimaryKeys).map(
     (it) => SQLiteSquasher.unsquashPK(it)
@@ -14910,7 +14965,8 @@ var prepareSQLiteCreateTable = (table4) => {
     tableName: name,
     columns: Object.values(columns),
     referenceData: references2,
-    compositePKs: composites
+    compositePKs: composites,
+    uniqueConstraints: Object.values(uniqueConstraints)
   };
 };
 var prepareDropTableJson = (table4) => {
@@ -15597,7 +15653,37 @@ var diffResultScheme = objectType({
 }).strict();
 var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
   var _a, _b;
-  const diffResult = applyJsonDiff(json1, json2);
+  let diffResult;
+  if (dialect3 === "mysql") {
+    for (const tableName in json1.tables) {
+      const table4 = json1.tables[tableName];
+      for (const indexName in table4.indexes) {
+        const index4 = MySqlSquasher.unsquashIdx(table4.indexes[indexName]);
+        if (index4.isUnique) {
+          table4.uniqueConstraints[indexName] = MySqlSquasher.squashUnique({
+            name: index4.name,
+            columns: index4.columns
+          });
+          delete json1.tables[tableName].indexes[index4.name];
+        }
+      }
+    }
+    for (const tableName in json2.tables) {
+      const table4 = json2.tables[tableName];
+      for (const indexName in table4.indexes) {
+        const index4 = MySqlSquasher.unsquashIdx(table4.indexes[indexName]);
+        if (index4.isUnique) {
+          table4.uniqueConstraints[indexName] = MySqlSquasher.squashUnique({
+            name: index4.name,
+            columns: index4.columns
+          });
+          delete json2.tables[tableName].indexes[index4.name];
+        }
+      }
+    }
+    diffResult = applyJsonDiff(json1, json2);
+  }
+  diffResult = applyJsonDiff(json1, json2);
   if (Object.keys(diffResult).length === 0) {
     return { statements: [], sqlStatements: [], _meta: void 0 };
   }
@@ -15768,7 +15854,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
           prevFull
         );
       }
-      ;
       alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
         it.name,
         it.alteredCompositePKs,