drizzle-kit 0.19.4 → 0.19.5-10646d0

package/index.cjs

@@ -4656,7 +4656,8 @@ var init_mysqlSchema = __esm({
       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();
     schemaSquashed = objectType({
       version: literalType("5"),
@@ -5228,7 +5229,8 @@ var init_sqliteSchema = __esm({
       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();
     schemaSquashed2 = objectType({
       version: latestVersion,
@@ -11690,7 +11692,6 @@ The unique constraint ${source_default.underline.blue(
       let tablesCount = /* @__PURE__ */ new Set();
       let indexesCount = 0;
       let foreignKeysCount = 0;
-      const tableToPk = {};
       for (const column7 of response) {
         if (!tablesFilter(column7["TABLE_NAME"]))
           continue;
@@ -11719,13 +11720,6 @@ The unique constraint ${source_default.underline.blue(
           isAutoincrement = column7["EXTRA"] === "auto_increment";
           isDefaultAnExpression = column7["EXTRA"].includes("DEFAULT_GENERATED");
         }
-        if (isPrimary) {
-          if (typeof tableToPk[tableName] === "undefined") {
-            tableToPk[tableName] = [columnName];
-          } else {
-            tableToPk[tableName].push(columnName);
-          }
-        }
         if (schema4 !== inputSchema) {
           schemas.push(schema4);
         }
@@ -11763,6 +11757,26 @@ The unique constraint ${source_default.underline.blue(
           result[tableName].columns[columnName] = newColumn;
         }
       }
+      const tablePks = await db.execute(
+        `SELECT table_name, column_name
+  FROM information_schema.table_constraints t
+  LEFT JOIN information_schema.key_column_usage k
+  USING(constraint_name,table_schema,table_name)
+  WHERE t.constraint_type='PRIMARY KEY'
+      AND t.table_schema='${inputSchema}'`,
+        []
+      );
+      const tableToPk = {};
+      const tableToPkRows = tablePks[0];
+      for (const tableToPkRow of tableToPkRows) {
+        const tableName = tableToPkRow["TABLE_NAME"];
+        const columnName = tableToPkRow["COLUMN_NAME"];
+        if (typeof tableToPk[tableName] === "undefined") {
+          tableToPk[tableName] = [columnName];
+        } else {
+          tableToPk[tableName].push(columnName);
+        }
+      }
       for (const [key, value] of Object.entries(tableToPk)) {
         if (value.length > 1) {
           result[key].compositePrimaryKeys = {
@@ -15011,7 +15025,7 @@ var init_sqlgenerator = __esm({
         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 uniqueConstraint4 of uniqueConstraints) {
@@ -15054,7 +15068,7 @@ var init_sqlgenerator = __esm({
         }
         compositePKs.forEach((it) => {
           statement += ",\n	";
-          statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")}),`;
+          statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
         });
         for (let i = 0; i < referenceData.length; i++) {
           const referenceAsString = referenceData[i];
@@ -15657,7 +15671,6 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
       }
       convert(statement) {
         const { tableName, columnName } = statement;
-        console.log(statement);
         const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
         return `ALTER TABLE ${tableNameWithSchema} ADD PRIMARY KEY ("${columnName}");`;
       }
@@ -16954,7 +16967,37 @@ var init_snapshotsDiffer = __esm({
     }).strict();
     applySnapshotsDiff = async (json1, json2, dialect6, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
       var _a, _b;
-      const diffResult = applyJsonDiff(json1, json2);
+      let diffResult;
+      if (dialect6 === "mysql") {
+        for (const tableName in json1.tables) {
+          const table4 = json1.tables[tableName];
+          for (const indexName4 in table4.indexes) {
+            const index4 = MySqlSquasher.unsquashIdx(table4.indexes[indexName4]);
+            if (index4.isUnique) {
+              table4.uniqueConstraints[indexName4] = 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 indexName4 in table4.indexes) {
+            const index4 = MySqlSquasher.unsquashIdx(table4.indexes[indexName4]);
+            if (index4.isUnique) {
+              table4.uniqueConstraints[indexName4] = 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 };
       }
@@ -17125,7 +17168,6 @@ var init_snapshotsDiffer = __esm({
               prevFull
             );
           }
-          ;
           alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
             it.name,
             it.alteredCompositePKs,
@@ -17319,7 +17361,6 @@ var init_snapshotsDiffer = __esm({
         jsonStatements.push(...jsonSQLiteCreateTables);
       } else if (dialect6 === "pg") {
         const jsonPgCreateTables = created.map((it) => {
-          console.log(it);
           return preparePgCreateTableJson(it, curFull);
         });
         jsonStatements.push(...jsonPgCreateTables);
@@ -37657,6 +37698,9 @@ import { sql } from "drizzle-orm"
       if (typeof defaultValue === "string" && defaultValue.startsWith("(") && defaultValue.endsWith(")")) {
         return `sql\`${defaultValue}\``;
       }
+      if (defaultValue === "NULL") {
+        return `sql\`NULL\``;
+      }
       return defaultValue;
     };
     column5 = (type, name, defaultValue, autoincrement, casing) => {
@@ -51858,7 +51902,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.19.4",
+  version: "0.19.5",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",
@@ -52700,7 +52744,7 @@ var dbPushMysqlCommand = new import_commander.Command("push:mysql").option(
 var dbPushSqliteCommand = new import_commander.Command("push:sqlite").option(
   "--config <config>",
   "Path to a config.ts file, drizzle.config.ts by default"
-).option("--tableFilters", `Table name filters`).option("--connectionString <connectionString>", "SQLite connection string").option("--driver <driver>", "SQLite database path").option("--url <url>", "SQLite database path").option("--auth-token <authToken>", "SQLite database path").option("--verbose", "Print all statements for each push").option("--strict", "Always ask for confirmation").action(async (options) => {
+).option("--schema <schema>", "Path to a schema file or folder").option("--tableFilters", `Table name filters`).option("--connectionString <connectionString>", "SQLite connection string").option("--driver <driver>", "SQLite database path").option("--url <url>", "SQLite database path").option("--auth-token <authToken>", "SQLite database path").option("--verbose", "Print all statements for each push").option("--strict", "Always ask for confirmation").action(async (options) => {
   printVersions();
   assertPackages("drizzle-orm");
   assertOrmCoreVersion();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.4",
+  "version": "0.19.5-10646d0",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

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"),
@@ -13285,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,
@@ -13725,7 +13727,7 @@ 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 uniqueConstraint4 of uniqueConstraints) {
@@ -13768,7 +13770,7 @@ var SQLiteCreateTableConvertor = class extends Convertor {
     }
     compositePKs.forEach((it) => {
       statement += ",\n	";
-      statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")}),`;
+      statement += `PRIMARY KEY(${it.map((it2) => `\`${it2}\``).join(", ")})`;
     });
     for (let i = 0; i < referenceData.length; i++) {
       const referenceAsString = referenceData[i];
@@ -14371,7 +14373,6 @@ var PgAlterTableAlterColumnSetPrimaryKeyConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, columnName } = statement;
-    console.log(statement);
     const tableNameWithSchema = statement.schema ? `"${statement.schema}"."${statement.tableName}"` : `"${statement.tableName}"`;
     return `ALTER TABLE ${tableNameWithSchema} ADD PRIMARY KEY ("${columnName}");`;
   }
@@ -15651,7 +15652,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 };
   }
@@ -15822,7 +15853,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
           prevFull
         );
       }
-      ;
       alteredCompositePKs = prepareAlterCompositePrimaryKeyMySql(
         it.name,
         it.alteredCompositePKs,
@@ -16016,7 +16046,6 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
     jsonStatements.push(...jsonSQLiteCreateTables);
   } else if (dialect3 === "pg") {
     const jsonPgCreateTables = created.map((it) => {
-      console.log(it);
       return preparePgCreateTableJson(it, curFull);
     });
     jsonStatements.push(...jsonPgCreateTables);