drizzle-kit 0.19.11-6427e88 → 0.19.11-6f50bf8

package/index.cjs

@@ -11539,16 +11539,21 @@ var init_mysqlSerializer = __esm({
         const uniqueConstraintObject = {};
         columns.forEach((column7) => {
           const notNull = column7.notNull;
-          const primaryKey = column7.primary;
           const sqlTypeLowered = column7.getSQLType().toLowerCase();
           const columnToSet = {
             name: column7.name,
             type: column7.getSQLType(),
-            primaryKey,
+            primaryKey: false,
             notNull,
             autoincrement: typeof column7.autoIncrement === "undefined" ? false : column7.autoIncrement,
             onUpdate: column7.hasOnUpdateNow
           };
+          if (column7.primary) {
+            primaryKeysObject[`${tableName}_${column7.name}`] = {
+              name: `${tableName}_${column7.name}`,
+              columns: [column7.name]
+            };
+          }
           if (column7.isUnique) {
             const existingUnique = uniqueConstraintObject[column7.uniqueName];
             if (typeof existingUnique !== "undefined") {
@@ -11862,17 +11867,12 @@ We have encountered a collision between the index name on columns ${source_defau
         }
       }
       for (const [key, value] of Object.entries(tableToPk)) {
-        if (value.length > 1) {
-          result[key].compositePrimaryKeys = {
-            [`${key}_${value.sort().join("_")}`]: {
-              name: `${key}_${value.join("_")}`,
-              columns: value.sort()
-            }
-          };
-        } else if (value.length === 1) {
-          result[key].columns[value[0]].primaryKey = true;
-        } else {
-        }
+        result[key].compositePrimaryKeys = {
+          [`${key}_${value.sort().join("_")}`]: {
+            name: `${key}_${value.join("_")}`,
+            columns: value.sort()
+          }
+        };
       }
       if (progressCallback) {
         progressCallback("columns", columnsCount, "done");
@@ -12320,7 +12320,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
            END AS data_type, INFORMATION_SCHEMA.COLUMNS.table_name, INFORMATION_SCHEMA.COLUMNS.column_name, INFORMATION_SCHEMA.COLUMNS.column_default, INFORMATION_SCHEMA.COLUMNS.data_type as additional_dt
    FROM  pg_attribute  a
    JOIN INFORMATION_SCHEMA.COLUMNS ON INFORMATION_SCHEMA.COLUMNS.column_name = a.attname
-   WHERE  a.attrelid = '${tableSchema}.${tableName}'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
+   WHERE  a.attrelid = '"${tableSchema}"."${tableName}"'::regclass and INFORMATION_SCHEMA.COLUMNS.table_name = '${tableName}'
    AND    a.attnum > 0
    AND    NOT a.attisdropped
    ORDER  BY a.attnum;`
@@ -12879,17 +12879,12 @@ The unique constraint ${source_default.underline.blue(
     WHERE m.type = 'table' and m.tbl_name != 'sqlite_sequence' and m.tbl_name != 'sqlite_stat1' and m.tbl_name != '_litestream_seq' and m.tbl_name != '_litestream_lock';
     `
       );
-      const isSeqExists = await db.query(
-        `SELECT * FROM sqlite_master WHERE type='table' AND name='sqlite_sequence';`
-      );
       const tablesWithSeq = [];
-      if (isSeqExists.length > 0) {
-        const seq = await db.query(
-          `SELECT * FROM sqlite_sequence WHERE name != 'sqlite_sequence' and name != 'sqlite_stat1' and name != '_litestream_seq' and name != '_litestream_lock';`
-        );
-        for (const s of seq) {
-          tablesWithSeq.push(s.name);
-        }
+      const seq = await db.query(
+        `SELECT * FROM sqlite_master WHERE name != 'sqlite_sequence' and name != 'sqlite_stat1' and name != '_litestream_seq' and name != '_litestream_lock' and sql GLOB '*[ *' || CHAR(9) || CHAR(10) || CHAR(13) || ']AUTOINCREMENT[^'']*';`
+      );
+      for (const s of seq) {
+        tablesWithSeq.push(s.name);
       }
       let columnsCount = 0;
       let tablesCount = /* @__PURE__ */ new Set();
@@ -16576,6 +16571,7 @@ var init_jsonStatements = __esm({
         const columnNotNull = json2.tables[tableName].columns[columnName].notNull;
         const columnAutoIncrement = json2.tables[tableName].columns[columnName].autoincrement;
         const columnPk = json2.tables[tableName].columns[columnName].primaryKey;
+        const compositePk = json2.tables[tableName].compositePrimaryKeys[`${tableName}_${columnName}`];
         if (typeof column7.name !== "string") {
           statements.push({
             type: "alter_table_rename_column",
@@ -16600,7 +16596,7 @@ var init_jsonStatements = __esm({
             columnPk
           });
         }
-        if (((_e = column7.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column7.primaryKey) == null ? void 0 : _f.type) === "changed" && !column7.primaryKey.new) {
+        if (((_e = column7.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column7.primaryKey) == null ? void 0 : _f.type) === "changed" && !column7.primaryKey.new && typeof compositePk === "undefined") {
           dropPkStatements.push({
             ////
             type: "alter_table_alter_column_drop_pk",
@@ -16879,15 +16875,22 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareAddCompositePrimaryKeyMySql = (tableName, pks, json2) => {
-      return Object.values(pks).map((it) => {
-        return {
+    prepareAddCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
+      var _a, _b;
+      const res = [];
+      for (const it of Object.values(pks)) {
+        const unsquashed = MySqlSquasher.unsquashPK(it);
+        if (unsquashed.columns.length === 1 && ((_b = (_a = json1.tables[tableName]) == null ? void 0 : _a.columns[unsquashed.columns[0]]) == null ? void 0 : _b.primaryKey)) {
+          continue;
+        }
+        res.push({
           type: "create_composite_pk",
           tableName,
           data: it,
-          constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it).columns.join("_")}`].name
-        };
-      });
+          constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${unsquashed.columns.join("_")}`].name
+        });
+      }
+      return res;
     };
     prepareDeleteCompositePrimaryKeyMySql = (tableName, pks, json1) => {
       return Object.values(pks).map((it) => {
@@ -17280,6 +17283,7 @@ var init_snapshotsDiffer = __esm({
             addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
               it.name,
               it.addedCompositePKs,
+              prevFull,
               curFull
             );
             deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.11-6427e88",
+  "version": "0.19.11-6f50bf8",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/utils.js

@@ -15178,6 +15178,7 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
     const columnNotNull = json2.tables[tableName].columns[columnName].notNull;
     const columnAutoIncrement = json2.tables[tableName].columns[columnName].autoincrement;
     const columnPk = json2.tables[tableName].columns[columnName].primaryKey;
+    const compositePk = json2.tables[tableName].compositePrimaryKeys[`${tableName}_${columnName}`];
     if (typeof column4.name !== "string") {
       statements.push({
         type: "alter_table_rename_column",
@@ -15202,7 +15203,7 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
         columnPk
       });
     }
-    if (((_e = column4.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column4.primaryKey) == null ? void 0 : _f.type) === "changed" && !column4.primaryKey.new) {
+    if (((_e = column4.primaryKey) == null ? void 0 : _e.type) === "deleted" || ((_f = column4.primaryKey) == null ? void 0 : _f.type) === "changed" && !column4.primaryKey.new && typeof compositePk === "undefined") {
       dropPkStatements.push({
         ////
         type: "alter_table_alter_column_drop_pk",
@@ -15481,15 +15482,22 @@ var prepareDeleteUniqueConstraintPg = (tableName, schema4, unqs) => {
     };
   });
 };
-var prepareAddCompositePrimaryKeyMySql = (tableName, pks, json2) => {
-  return Object.values(pks).map((it) => {
-    return {
+var prepareAddCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
+  var _a, _b;
+  const res = [];
+  for (const it of Object.values(pks)) {
+    const unsquashed = MySqlSquasher.unsquashPK(it);
+    if (unsquashed.columns.length === 1 && ((_b = (_a = json1.tables[tableName]) == null ? void 0 : _a.columns[unsquashed.columns[0]]) == null ? void 0 : _b.primaryKey)) {
+      continue;
+    }
+    res.push({
       type: "create_composite_pk",
       tableName,
       data: it,
-      constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${MySqlSquasher.unsquashPK(it).columns.join("_")}`].name
-    };
-  });
+      constraintName: json2.tables[tableName].compositePrimaryKeys[`${tableName}_${unsquashed.columns.join("_")}`].name
+    });
+  }
+  return res;
 };
 var prepareDeleteCompositePrimaryKeyMySql = (tableName, pks, json1) => {
   return Object.values(pks).map((it) => {
@@ -15870,6 +15878,7 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
           it.name,
           it.addedCompositePKs,
+          prevFull,
           curFull
         );
         deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(