drizzle-kit 0.19.10 → 0.19.11-052f5fd

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");
@@ -12060,7 +12060,7 @@ var init_pgSerializer = __esm({
     indexName2 = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
-    generatePgSnapshot = (tables, enums, schemas, schemaFilter = ["public"]) => {
+    generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
       for (const table4 of tables) {
         const {
@@ -12073,7 +12073,7 @@ var init_pgSerializer = __esm({
           primaryKeys,
           uniqueConstraints
         } = (0, import_pg_core3.getTableConfig)(table4);
-        if (!schemaFilter.includes(schema4 ?? "public")) {
+        if (schemaFilter && !schemaFilter.includes(schema4 ?? "public")) {
           continue;
         }
         const columnsObject = {};
@@ -12240,7 +12240,15 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
       }, {});
       const schemasObject = Object.fromEntries(
         schemas.filter(
-          (it) => it.schemaName !== "public" && schemaFilter.includes(it.schemaName)
+          (it) => {
+            if (it.schemaName !== "public")
+              return true;
+            if (schemaFilter) {
+              return schemaFilter.includes(it.schemaName);
+            } else {
+              return true;
+            }
+          }
         ).map((it) => [it.schemaName, it.schemaName])
       );
       return {
@@ -12312,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;`
@@ -12871,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();
@@ -12917,7 +12920,7 @@ The unique constraint ${source_default.underline.blue(
         const newColumn = {
           default: columnDefault === null ? void 0 : /^-?[\d.]+(?:e-?\d+)?$/.test(columnDefault) ? Number(columnDefault) : ["CURRENT_TIME", "CURRENT_DATE", "CURRENT_TIMESTAMP"].includes(
             columnDefault
-          ) ? `(${columnDefault})` : columnDefault === "false" ? false : columnDefault === "true" ? true : columnDefault.startsWith('"') && columnDefault.endsWith('"') ? columnDefault.substring(1, columnDefault.length - 1) : columnDefault,
+          ) ? `(${columnDefault})` : columnDefault === "false" ? false : columnDefault === "true" ? true : columnDefault.startsWith("'") && columnDefault.endsWith("'") ? columnDefault : `(${columnDefault})`,
           autoincrement: isAutoincrement,
           name: columnName,
           type: mapSqlToSqliteType(columnType),
@@ -13018,7 +13021,7 @@ FROM sqlite_master AS m,
     pragma_index_list(m.name) AS il,
     pragma_index_info(il.name) AS ii
 WHERE 
-    m.type = 'table';`
+    m.type = 'table' and il.name NOT LIKE 'sqlite_autoindex_%';`
       );
       for (const idxRow of idxs) {
         const tableName = idxRow.tableName;
@@ -13091,7 +13094,7 @@ ${filenames.join("\n")}
       const { tables, enums, schemas } = await prepareFromMySqlImports2(filenames);
       return generateMySqlSnapshot2(tables, enums, schemas);
     };
-    serializePg = async (path3, schemaFilter = ["public"]) => {
+    serializePg = async (path3, schemaFilter) => {
       const filenames = prepareFilenames(path3);
       const { prepareFromPgImports: prepareFromPgImports2 } = await Promise.resolve().then(() => (init_pgImports(), pgImports_exports));
       const { generatePgSnapshot: generatePgSnapshot2 } = await Promise.resolve().then(() => (init_pgSerializer(), pgSerializer_exports));
@@ -13149,7 +13152,7 @@ var init_migrationPreparator = __esm({
       const result = { version: version2, dialect: dialect6, id, prevId: idPrev, ...rest };
       return { prev, cur: result };
     };
-    preparePgDbPushSnapshot = async (prev, schemaPath, schemaFilter) => {
+    preparePgDbPushSnapshot = async (prev, schemaPath, schemaFilter = ["public"]) => {
       const serialized = await serializePg(schemaPath, schemaFilter);
       const id = (0, import_crypto.randomUUID)();
       const idPrev = prev.id;
@@ -16568,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",
@@ -16592,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",
@@ -16871,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) => {
@@ -17272,6 +17283,7 @@ var init_snapshotsDiffer = __esm({
             addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
               it.name,
               it.addedCompositePKs,
+              prevFull,
               curFull
             );
             deletedCompositePKs = prepareDeleteCompositePrimaryKeyMySql(
@@ -43072,6 +43084,9 @@ import { sql } from "drizzle-orm"
       if (defaultValue === "NULL") {
         return `sql\`NULL\``;
       }
+      if (typeof defaultValue === "string" && defaultValue.startsWith("'") && defaultValue.endsWith("'")) {
+        return defaultValue.substring(1, defaultValue.length - 1);
+      }
       return defaultValue;
     };
     column6 = (type, name, defaultValue, autoincrement, casing) => {
@@ -43088,7 +43103,7 @@ import { sql } from "drizzle-orm"
       }
       if (lowered === "text") {
         let out = `${withCasing3(name, casing)}: text("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault2(defaultValue)})` : "";
+        out += defaultValue ? `.default("${mapColumnDefault2(defaultValue)}")` : "";
         return out;
       }
       if (lowered === "blob") {
@@ -52110,7 +52125,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.19.10",
+  version: "0.19.11",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.10",
+  "version": "0.19.11-052f5fd",
   "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(