drizzle-kit 0.22.7-a16c9a1 → 0.22.7-c827f86

package/bin.cjs

@@ -22391,13 +22391,19 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split("\n");
+  const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].slice(1, parts[0].length - 1);
+      const columnName = parts[0].replace(/[`'"]/g, "");
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
+      const typeIndex = parts.findIndex(
+        (part) => part.match(/(stored|virtual)/i)
+      );
+      let type = "virtual";
+      if (typeIndex !== -1) {
+        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
+      }
       columns[columnName] = {
         columnName,
         expression,
@@ -22445,7 +22451,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: (0, import_drizzle_orm7.is)(column7, import_sqlite_core2.SQLiteBaseInteger) ? column7.autoIncrement : false,
             generated: generated ? {
-              as: (0, import_drizzle_orm7.is)(generated.as, import_drizzle_orm7.SQL) ? dialect6.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect6.sqlToQuery(generated.as(), "indexes").sql : generated.as,
+              as: (0, import_drizzle_orm7.is)(generated.as, import_drizzle_orm7.SQL) ? `(${dialect6.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect6.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -23202,7 +23208,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column7.notNull ? " NOT NULL" : "";
           const defaultStatement = column7.default !== void 0 ? ` DEFAULT ${column7.default}` : "";
           const autoincrementStatement = column7.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column7.generated ? ` GENERATED ALWAYS AS (${column7.generated.as}) ${column7.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column7.generated ? ` GENERATED ALWAYS AS ${column7.generated.as} ${column7.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column7.name}\` ${column7.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i2 === columns.length - 1 ? "" : ",\n";
@@ -23277,8 +23283,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema5 ? `"${schema5}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
-        const oldIdentityWithSchema = schema5 ? `"${schema5}"."${unsquashedOldIdentity == null ? void 0 : unsquashedOldIdentity.name}"` : `"${unsquashedOldIdentity == null ? void 0 : unsquashedOldIdentity.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -23587,14 +23591,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column7, schema: schema5 } = statement;
-        const { name, type, notNull, generated } = column7;
+        const { name, type, notNull, generated, primaryKey, identity } = column7;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column7.default !== void 0 ? ` DEFAULT ${column7.default}` : ""}`;
         const schemaPrefix = column7.typeSchema && column7.typeSchema !== "public" ? `"${column7.typeSchema}".` : "";
         const fixedType = isPgNativeType(column7.type) ? column7.type : `${schemaPrefix}"${column7.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema5 ? `"${schema5}"."${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"` : `"${unsquashedIdentity == null ? void 0 : unsquashedIdentity.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated == null ? void 0 : generated.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -23633,7 +23641,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -23922,8 +23930,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema5 ? `"${schema5}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema5 ? `\`${schema5}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema5,
           tableName,
           column: {
@@ -23939,7 +23947,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29549,6 +29557,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -122357,14 +122372,14 @@ var init_sqlitePushUtils = __esm({
               }
               tablesContext[newTableName] = _moveDataStatements(
                 statement.tableName,
-                json2,
+                json1,
                 true
               );
             } else {
               if (typeof tablesContext[newTableName] === "undefined") {
                 tablesContext[newTableName] = _moveDataStatements(
                   statement.tableName,
-                  json2
+                  json1
                 );
               }
             }
@@ -122383,7 +122398,7 @@ var init_sqlitePushUtils = __esm({
             const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
             for (const table4 of uniqueTableRefs) {
               if (typeof tablesContext[table4] === "undefined") {
-                tablesContext[table4] = [..._moveDataStatements(table4, json2)];
+                tablesContext[table4] = [..._moveDataStatements(table4, json1)];
               }
             }
           }
@@ -122404,9 +122419,9 @@ var init_sqlitePushUtils = __esm({
             );
           }
         } else {
-          const stmnt = fromJson([statement], "sqlite")[0];
+          const stmnt = fromJson([statement], "sqlite");
           if (typeof stmnt !== "undefined") {
-            statementsToExecute.push(stmnt);
+            statementsToExecute.push(...stmnt);
           }
         }
       }
@@ -124236,25 +124251,24 @@ var init_push = __esm({
             process.exit(0);
           }
         }
-        if (!("driver" in credentials2)) {
-          await db2.query("begin");
-          try {
-            for (const dStmnt of statementsToExecute) {
-              await db2.query(dStmnt);
-            }
-            await db2.query("commit");
-          } catch (e2) {
-            await db2.query("rollback");
-          }
-        } else if (credentials2.driver === "turso") {
-          await db2.batch(statementsToExecute.map((it) => ({ query: it })));
-        }
         if (statementsToExecute.length === 0) {
           (0, import_hanji11.render)(`
 [${source_default.blue("i")}] No changes detected`);
         } else {
-          for (const dStmnt of statementsToExecute) {
-            await db2.run(dStmnt);
+          if (!("driver" in credentials2)) {
+            await db2.query("begin");
+            try {
+              for (const dStmnt of statementsToExecute) {
+                await db2.query(dStmnt);
+              }
+              await db2.query("commit");
+            } catch (e2) {
+              console.error(e2);
+              await db2.query("rollback");
+              process.exit(1);
+            }
+          } else if (credentials2.driver === "turso") {
+            await db2.batch(statementsToExecute.map((it) => ({ query: it })));
           }
           (0, import_hanji11.render)(`[${source_default.green("\u2713")}] Changes applied`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.22.7-a16c9a1",
+  "version": "0.22.7-c827f86",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.js

@@ -23102,6 +23102,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -24156,7 +24163,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column4.notNull ? " NOT NULL" : "";
           const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
           const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS (${column4.generated.as}) ${column4.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS ${column4.generated.as} ${column4.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i === columns.length - 1 ? "" : ",\n";
@@ -24231,8 +24238,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
-        const oldIdentityWithSchema = schema4 ? `"${schema4}"."${unsquashedOldIdentity?.name}"` : `"${unsquashedOldIdentity?.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -24541,14 +24546,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column4, schema: schema4 } = statement;
-        const { name: name2, type, notNull, generated } = column4;
+        const { name: name2, type, notNull, generated, primaryKey, identity } = column4;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
         const schemaPrefix = column4.typeSchema && column4.typeSchema !== "public" ? `"${column4.typeSchema}".` : "";
         const fixedType = isPgNativeType(column4.type) ? column4.type : `${schemaPrefix}"${column4.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated?.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -24587,7 +24596,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name2}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -24876,8 +24885,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema4,
           tableName,
           column: {
@@ -24893,7 +24902,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29070,13 +29079,19 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split("\n");
+  const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].slice(1, parts[0].length - 1);
+      const columnName = parts[0].replace(/[`'"]/g, "");
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
+      const typeIndex = parts.findIndex(
+        (part) => part.match(/(stored|virtual)/i)
+      );
+      let type = "virtual";
+      if (typeIndex !== -1) {
+        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
+      }
       columns[columnName] = {
         columnName,
         expression,
@@ -29124,7 +29139,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: is(column4, SQLiteBaseInteger) ? column4.autoIncrement : false,
             generated: generated ? {
-              as: is(generated.as, SQL) ? dialect5.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect5.sqlToQuery(generated.as(), "indexes").sql : generated.as,
+              as: is(generated.as, SQL) ? `(${dialect5.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect5.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -35048,14 +35063,14 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
           }
           tablesContext[newTableName] = _moveDataStatements(
             statement.tableName,
-            json2,
+            json1,
             true
           );
         } else {
           if (typeof tablesContext[newTableName] === "undefined") {
             tablesContext[newTableName] = _moveDataStatements(
               statement.tableName,
-              json2
+              json1
             );
           }
         }
@@ -35074,7 +35089,7 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
         for (const table4 of uniqueTableRefs) {
           if (typeof tablesContext[table4] === "undefined") {
-            tablesContext[table4] = [..._moveDataStatements(table4, json2)];
+            tablesContext[table4] = [..._moveDataStatements(table4, json1)];
           }
         }
       }
@@ -35095,9 +35110,9 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         );
       }
     } else {
-      const stmnt = fromJson([statement], "sqlite")[0];
+      const stmnt = fromJson([statement], "sqlite");
       if (typeof stmnt !== "undefined") {
-        statementsToExecute.push(stmnt);
+        statementsToExecute.push(...stmnt);
       }
     }
   }

package/payload.mjs

@@ -23107,6 +23107,13 @@ var init_snapshotsDiffer = __esm({
             return false;
           }
         }
+        if (st.type === "alter_table_alter_column_set_notnull") {
+          if (jsonStatements.find(
+            (it) => it.type === "alter_table_alter_column_set_identity" && it.tableName === st.tableName && it.schema === st.schema
+          )) {
+            return false;
+          }
+        }
         return true;
       });
       const sqlStatements = fromJson(filteredJsonStatements, "postgresql");
@@ -24161,7 +24168,7 @@ var init_sqlgenerator = __esm({
           const notNullStatement = column4.notNull ? " NOT NULL" : "";
           const defaultStatement = column4.default !== void 0 ? ` DEFAULT ${column4.default}` : "";
           const autoincrementStatement = column4.autoincrement ? " AUTOINCREMENT" : "";
-          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS (${column4.generated.as}) ${column4.generated.type.toUpperCase()}` : "";
+          const generatedStatement = column4.generated ? ` GENERATED ALWAYS AS ${column4.generated.as} ${column4.generated.type.toUpperCase()}` : "";
           statement += "	";
           statement += `\`${column4.name}\` ${column4.type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${generatedStatement}`;
           statement += i === columns.length - 1 ? "" : ",\n";
@@ -24236,8 +24243,6 @@ var init_sqlgenerator = __esm({
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const unsquashedIdentity = PgSquasher.unsquashIdentity(identity);
         const unsquashedOldIdentity = PgSquasher.unsquashIdentity(oldIdentity);
-        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
-        const oldIdentityWithSchema = schema4 ? `"${schema4}"."${unsquashedOldIdentity?.name}"` : `"${unsquashedOldIdentity?.name}"`;
         const statementsToReturn = [];
         if (unsquashedOldIdentity.type !== unsquashedIdentity.type) {
           statementsToReturn.push(
@@ -24546,14 +24551,18 @@ var init_sqlgenerator = __esm({
       }
       convert(statement) {
         const { tableName, column: column4, schema: schema4 } = statement;
-        const { name: name2, type, notNull, generated } = column4;
+        const { name: name2, type, notNull, generated, primaryKey, identity } = column4;
+        const primaryKeyStatement = primaryKey ? " PRIMARY KEY" : "";
         const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
         const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
         const schemaPrefix = column4.typeSchema && column4.typeSchema !== "public" ? `"${column4.typeSchema}".` : "";
         const fixedType = isPgNativeType(column4.type) ? column4.type : `${schemaPrefix}"${column4.type}"`;
         const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+        const unsquashedIdentity = identity ? PgSquasher.unsquashIdentity(identity) : void 0;
+        const identityWithSchema = schema4 ? `"${schema4}"."${unsquashedIdentity?.name}"` : `"${unsquashedIdentity?.name}"`;
+        const identityStatement = unsquashedIdentity ? ` GENERATED ${unsquashedIdentity.type === "always" ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY (sequence name ${identityWithSchema}${unsquashedIdentity.increment ? ` INCREMENT BY ${unsquashedIdentity.increment}` : ""}${unsquashedIdentity.minValue ? ` MINVALUE ${unsquashedIdentity.minValue}` : ""}${unsquashedIdentity.maxValue ? ` MAXVALUE ${unsquashedIdentity.maxValue}` : ""}${unsquashedIdentity.startWith ? ` START WITH ${unsquashedIdentity.startWith}` : ""}${unsquashedIdentity.cache ? ` CACHE ${unsquashedIdentity.cache}` : ""}${unsquashedIdentity.cycle ? ` CYCLE` : ""})` : "";
         const generatedStatement = ` GENERATED ALWAYS AS (${generated?.as}) STORED`;
-        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""};`;
+        return `ALTER TABLE ${tableNameWithSchema} ADD COLUMN "${name2}" ${fixedType}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generated ? generatedStatement : ""}${identityStatement};`;
       }
     };
     MySqlAlterTableAddColumnConvertor = class extends Convertor {
@@ -24592,7 +24601,7 @@ var init_sqlgenerator = __esm({
         const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
         const referenceAsObject = referenceData ? SQLiteSquasher.unsquashFK(referenceData) : void 0;
         const referenceStatement = `${referenceAsObject ? ` REFERENCES ${referenceAsObject.tableTo}(${referenceAsObject.columnsTo})` : ""}`;
-        const generatedStatement = generated ? ` GENERATED ALWAYS AS (${generated.as}) ${generated.type.toUpperCase()}` : "";
+        const generatedStatement = generated ? ` GENERATED ALWAYS AS ${generated.as} ${generated.type.toUpperCase()}` : "";
         return `ALTER TABLE \`${tableName}\` ADD \`${name2}\` ${type}${primaryKeyStatement}${defaultStatement}${notNullStatement}${generatedStatement}${referenceStatement};`;
       }
     };
@@ -24881,8 +24890,8 @@ var init_sqlgenerator = __esm({
           columnPk,
           columnGenerated
         } = statement;
-        const tableNameWithSchema = schema4 ? `"${schema4}"."${tableName}"` : `"${tableName}"`;
-        const addColumnStatement = new PgAlterTableAddColumnConvertor().convert({
+        const tableNameWithSchema = schema4 ? `\`${schema4}\`.\`${tableName}\`` : `\`${tableName}\``;
+        const addColumnStatement = new MySqlAlterTableAddColumnConvertor().convert({
           schema: schema4,
           tableName,
           column: {
@@ -24898,7 +24907,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -29075,13 +29084,19 @@ function mapSqlToSqliteType(sqlType) {
 }
 function extractGeneratedColumns(input) {
   const columns = {};
-  const lines = input.split("\n");
+  const lines = input.split(/,\s*(?![^()]*\))/);
   for (const line of lines) {
     if (line.includes("GENERATED ALWAYS AS")) {
       const parts = line.trim().split(/\s+/);
-      const columnName = parts[0].slice(1, parts[0].length - 1);
+      const columnName = parts[0].replace(/[`'"]/g, "");
       const expression = line.substring(line.indexOf("("), line.indexOf(")") + 1).trim();
-      const type = parts[parts.length - 1].replace(/(^,)|(,$)/g, "").toLowerCase();
+      const typeIndex = parts.findIndex(
+        (part) => part.match(/(stored|virtual)/i)
+      );
+      let type = "virtual";
+      if (typeIndex !== -1) {
+        type = parts[typeIndex].replace(/[^a-z]/gi, "").toLowerCase();
+      }
       columns[columnName] = {
         columnName,
         expression,
@@ -29129,7 +29144,7 @@ var init_sqliteSerializer = __esm({
             notNull,
             autoincrement: is(column4, SQLiteBaseInteger) ? column4.autoIncrement : false,
             generated: generated ? {
-              as: is(generated.as, SQL) ? dialect5.sqlToQuery(generated.as, "indexes").sql : typeof generated.as === "function" ? dialect5.sqlToQuery(generated.as(), "indexes").sql : generated.as,
+              as: is(generated.as, SQL) ? `(${dialect5.sqlToQuery(generated.as, "indexes").sql})` : typeof generated.as === "function" ? `(${dialect5.sqlToQuery(generated.as(), "indexes").sql})` : `(${generated.as})`,
               type: generated.mode ?? "virtual"
             } : void 0
           };
@@ -35039,14 +35054,14 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
           }
           tablesContext[newTableName] = _moveDataStatements(
             statement.tableName,
-            json2,
+            json1,
             true
           );
         } else {
           if (typeof tablesContext[newTableName] === "undefined") {
             tablesContext[newTableName] = _moveDataStatements(
               statement.tableName,
-              json2
+              json1
             );
           }
         }
@@ -35065,7 +35080,7 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         const uniqueTableRefs = [...new Set(tablesReferncingCurrent)];
         for (const table4 of uniqueTableRefs) {
           if (typeof tablesContext[table4] === "undefined") {
-            tablesContext[table4] = [..._moveDataStatements(table4, json2)];
+            tablesContext[table4] = [..._moveDataStatements(table4, json1)];
           }
         }
       }
@@ -35086,9 +35101,9 @@ var logSuggestionsAndReturn = async (connection, statements, json1, json2, meta)
         );
       }
     } else {
-      const stmnt = fromJson([statement], "sqlite")[0];
+      const stmnt = fromJson([statement], "sqlite");
       if (typeof stmnt !== "undefined") {
-        statementsToExecute.push(stmnt);
+        statementsToExecute.push(...stmnt);
       }
     }
   }