drizzle-kit 0.22.7-d059930 → 0.22.7-fbc7b5c

package/payload.mjs

@@ -8708,40 +8708,40 @@ var require_sync = __commonJS({
       while (typeof pattern[n] === "string") {
         n++;
       }
-      var prefix;
+      var prefix2;
       switch (n) {
         case pattern.length:
           this._processSimple(pattern.join("/"), index4);
           return;
         case 0:
-          prefix = null;
+          prefix2 = null;
           break;
         default:
-          prefix = pattern.slice(0, n).join("/");
+          prefix2 = pattern.slice(0, n).join("/");
           break;
       }
       var remain = pattern.slice(n);
       var read;
-      if (prefix === null)
+      if (prefix2 === null)
         read = ".";
-      else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+      else if (isAbsolute(prefix2) || isAbsolute(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute(prefix))
-          prefix = "/" + prefix;
-        read = prefix;
+        if (!prefix2 || !isAbsolute(prefix2))
+          prefix2 = "/" + prefix2;
+        read = prefix2;
       } else
-        read = prefix;
+        read = prefix2;
       var abs = this._makeAbs(read);
       if (childrenIgnored(this, read))
         return;
       var isGlobStar = remain[0] === minimatch2.GLOBSTAR;
       if (isGlobStar)
-        this._processGlobStar(prefix, read, abs, remain, index4, inGlobStar);
+        this._processGlobStar(prefix2, read, abs, remain, index4, inGlobStar);
       else
-        this._processReaddir(prefix, read, abs, remain, index4, inGlobStar);
+        this._processReaddir(prefix2, read, abs, remain, index4, inGlobStar);
     };
-    GlobSync.prototype._processReaddir = function(prefix, read, abs, remain, index4, inGlobStar) {
+    GlobSync.prototype._processReaddir = function(prefix2, read, abs, remain, index4, inGlobStar) {
       var entries = this._readdir(abs, inGlobStar);
       if (!entries)
         return;
@@ -8754,7 +8754,7 @@ var require_sync = __commonJS({
         var e = entries[i];
         if (e.charAt(0) !== "." || dotOk) {
           var m;
-          if (negate && !prefix) {
+          if (negate && !prefix2) {
             m = !e.match(pn);
           } else {
             m = e.match(pn);
@@ -8771,11 +8771,11 @@ var require_sync = __commonJS({
           this.matches[index4] = /* @__PURE__ */ Object.create(null);
         for (var i = 0; i < len; i++) {
           var e = matchedEntries[i];
-          if (prefix) {
-            if (prefix.slice(-1) !== "/")
-              e = prefix + "/" + e;
+          if (prefix2) {
+            if (prefix2.slice(-1) !== "/")
+              e = prefix2 + "/" + e;
             else
-              e = prefix + e;
+              e = prefix2 + e;
           }
           if (e.charAt(0) === "/" && !this.nomount) {
             e = path2.join(this.root, e);
@@ -8788,8 +8788,8 @@ var require_sync = __commonJS({
       for (var i = 0; i < len; i++) {
         var e = matchedEntries[i];
         var newPattern;
-        if (prefix)
-          newPattern = [prefix, e];
+        if (prefix2)
+          newPattern = [prefix2, e];
         else
           newPattern = [e];
         this._process(newPattern.concat(remain), index4, inGlobStar);
@@ -8896,12 +8896,12 @@ var require_sync = __commonJS({
           break;
       }
     };
-    GlobSync.prototype._processGlobStar = function(prefix, read, abs, remain, index4, inGlobStar) {
+    GlobSync.prototype._processGlobStar = function(prefix2, read, abs, remain, index4, inGlobStar) {
       var entries = this._readdir(abs, inGlobStar);
       if (!entries)
         return;
       var remainWithoutGlobStar = remain.slice(1);
-      var gspref = prefix ? [prefix] : [];
+      var gspref = prefix2 ? [prefix2] : [];
       var noGlobStar = gspref.concat(remainWithoutGlobStar);
       this._process(noGlobStar, index4, false);
       var len = entries.length;
@@ -8918,25 +8918,25 @@ var require_sync = __commonJS({
         this._process(below, index4, true);
       }
     };
-    GlobSync.prototype._processSimple = function(prefix, index4) {
-      var exists2 = this._stat(prefix);
+    GlobSync.prototype._processSimple = function(prefix2, index4) {
+      var exists2 = this._stat(prefix2);
       if (!this.matches[index4])
         this.matches[index4] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return;
-      if (prefix && isAbsolute(prefix) && !this.nomount) {
-        var trail = /[\/\\]$/.test(prefix);
-        if (prefix.charAt(0) === "/") {
-          prefix = path2.join(this.root, prefix);
+      if (prefix2 && isAbsolute(prefix2) && !this.nomount) {
+        var trail = /[\/\\]$/.test(prefix2);
+        if (prefix2.charAt(0) === "/") {
+          prefix2 = path2.join(this.root, prefix2);
         } else {
-          prefix = path2.resolve(this.root, prefix);
+          prefix2 = path2.resolve(this.root, prefix2);
           if (trail)
-            prefix += "/";
+            prefix2 += "/";
         }
       }
       if (process.platform === "win32")
-        prefix = prefix.replace(/\\/g, "/");
-      this._emitMatch(index4, prefix);
+        prefix2 = prefix2.replace(/\\/g, "/");
+      this._emitMatch(index4, prefix2);
     };
     GlobSync.prototype._stat = function(f) {
       var abs = this._makeAbs(f);
@@ -9331,46 +9331,46 @@ var require_glob = __commonJS({
       while (typeof pattern[n] === "string") {
         n++;
       }
-      var prefix;
+      var prefix2;
       switch (n) {
         case pattern.length:
           this._processSimple(pattern.join("/"), index4, cb);
           return;
         case 0:
-          prefix = null;
+          prefix2 = null;
           break;
         default:
-          prefix = pattern.slice(0, n).join("/");
+          prefix2 = pattern.slice(0, n).join("/");
           break;
       }
       var remain = pattern.slice(n);
       var read;
-      if (prefix === null)
+      if (prefix2 === null)
         read = ".";
-      else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+      else if (isAbsolute(prefix2) || isAbsolute(pattern.map(function(p) {
         return typeof p === "string" ? p : "[*]";
       }).join("/"))) {
-        if (!prefix || !isAbsolute(prefix))
-          prefix = "/" + prefix;
-        read = prefix;
+        if (!prefix2 || !isAbsolute(prefix2))
+          prefix2 = "/" + prefix2;
+        read = prefix2;
       } else
-        read = prefix;
+        read = prefix2;
       var abs = this._makeAbs(read);
       if (childrenIgnored(this, read))
         return cb();
       var isGlobStar = remain[0] === minimatch2.GLOBSTAR;
       if (isGlobStar)
-        this._processGlobStar(prefix, read, abs, remain, index4, inGlobStar, cb);
+        this._processGlobStar(prefix2, read, abs, remain, index4, inGlobStar, cb);
       else
-        this._processReaddir(prefix, read, abs, remain, index4, inGlobStar, cb);
+        this._processReaddir(prefix2, read, abs, remain, index4, inGlobStar, cb);
     };
-    Glob.prototype._processReaddir = function(prefix, read, abs, remain, index4, inGlobStar, cb) {
+    Glob.prototype._processReaddir = function(prefix2, read, abs, remain, index4, inGlobStar, cb) {
       var self2 = this;
       this._readdir(abs, inGlobStar, function(er, entries) {
-        return self2._processReaddir2(prefix, read, abs, remain, index4, inGlobStar, entries, cb);
+        return self2._processReaddir2(prefix2, read, abs, remain, index4, inGlobStar, entries, cb);
       });
     };
-    Glob.prototype._processReaddir2 = function(prefix, read, abs, remain, index4, inGlobStar, entries, cb) {
+    Glob.prototype._processReaddir2 = function(prefix2, read, abs, remain, index4, inGlobStar, entries, cb) {
       if (!entries)
         return cb();
       var pn = remain[0];
@@ -9382,7 +9382,7 @@ var require_glob = __commonJS({
         var e = entries[i];
         if (e.charAt(0) !== "." || dotOk) {
           var m;
-          if (negate && !prefix) {
+          if (negate && !prefix2) {
             m = !e.match(pn);
           } else {
             m = e.match(pn);
@@ -9399,11 +9399,11 @@ var require_glob = __commonJS({
           this.matches[index4] = /* @__PURE__ */ Object.create(null);
         for (var i = 0; i < len; i++) {
           var e = matchedEntries[i];
-          if (prefix) {
-            if (prefix !== "/")
-              e = prefix + "/" + e;
+          if (prefix2) {
+            if (prefix2 !== "/")
+              e = prefix2 + "/" + e;
             else
-              e = prefix + e;
+              e = prefix2 + e;
           }
           if (e.charAt(0) === "/" && !this.nomount) {
             e = path2.join(this.root, e);
@@ -9416,11 +9416,11 @@ var require_glob = __commonJS({
       for (var i = 0; i < len; i++) {
         var e = matchedEntries[i];
         var newPattern;
-        if (prefix) {
-          if (prefix !== "/")
-            e = prefix + "/" + e;
+        if (prefix2) {
+          if (prefix2 !== "/")
+            e = prefix2 + "/" + e;
           else
-            e = prefix + e;
+            e = prefix2 + e;
         }
         this._process([e].concat(remain), index4, inGlobStar, cb);
       }
@@ -9551,17 +9551,17 @@ var require_glob = __commonJS({
       }
       return cb();
     };
-    Glob.prototype._processGlobStar = function(prefix, read, abs, remain, index4, inGlobStar, cb) {
+    Glob.prototype._processGlobStar = function(prefix2, read, abs, remain, index4, inGlobStar, cb) {
       var self2 = this;
       this._readdir(abs, inGlobStar, function(er, entries) {
-        self2._processGlobStar2(prefix, read, abs, remain, index4, inGlobStar, entries, cb);
+        self2._processGlobStar2(prefix2, read, abs, remain, index4, inGlobStar, entries, cb);
       });
     };
-    Glob.prototype._processGlobStar2 = function(prefix, read, abs, remain, index4, inGlobStar, entries, cb) {
+    Glob.prototype._processGlobStar2 = function(prefix2, read, abs, remain, index4, inGlobStar, entries, cb) {
       if (!entries)
         return cb();
       var remainWithoutGlobStar = remain.slice(1);
-      var gspref = prefix ? [prefix] : [];
+      var gspref = prefix2 ? [prefix2] : [];
       var noGlobStar = gspref.concat(remainWithoutGlobStar);
       this._process(noGlobStar, index4, false, cb);
       var isSym = this.symlinks[abs];
@@ -9579,30 +9579,30 @@ var require_glob = __commonJS({
       }
       cb();
     };
-    Glob.prototype._processSimple = function(prefix, index4, cb) {
+    Glob.prototype._processSimple = function(prefix2, index4, cb) {
       var self2 = this;
-      this._stat(prefix, function(er, exists2) {
-        self2._processSimple2(prefix, index4, er, exists2, cb);
+      this._stat(prefix2, function(er, exists2) {
+        self2._processSimple2(prefix2, index4, er, exists2, cb);
       });
     };
-    Glob.prototype._processSimple2 = function(prefix, index4, er, exists2, cb) {
+    Glob.prototype._processSimple2 = function(prefix2, index4, er, exists2, cb) {
       if (!this.matches[index4])
         this.matches[index4] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return cb();
-      if (prefix && isAbsolute(prefix) && !this.nomount) {
-        var trail = /[\/\\]$/.test(prefix);
-        if (prefix.charAt(0) === "/") {
-          prefix = path2.join(this.root, prefix);
+      if (prefix2 && isAbsolute(prefix2) && !this.nomount) {
+        var trail = /[\/\\]$/.test(prefix2);
+        if (prefix2.charAt(0) === "/") {
+          prefix2 = path2.join(this.root, prefix2);
         } else {
-          prefix = path2.resolve(this.root, prefix);
+          prefix2 = path2.resolve(this.root, prefix2);
           if (trail)
-            prefix += "/";
+            prefix2 += "/";
         }
       }
       if (process.platform === "win32")
-        prefix = prefix.replace(/\\/g, "/");
-      this._emitMatch(index4, prefix);
+        prefix2 = prefix2.replace(/\\/g, "/");
+      this._emitMatch(index4, prefix2);
       cb();
     };
     Glob.prototype._stat = function(f, cb) {
@@ -9866,8 +9866,8 @@ import process2 from "process";
 import os from "os";
 import tty from "tty";
 function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process2.argv) {
-  const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
-  const position = argv.indexOf(prefix + flag);
+  const prefix2 = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
+  const position = argv.indexOf(prefix2 + flag);
   const terminatorPosition = argv.indexOf("--");
   return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
 }
@@ -10009,12 +10009,12 @@ function stringReplaceAll(string, substring, replacer) {
   returnValue += string.slice(endIndex);
   return returnValue;
 }
-function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index4) {
+function stringEncaseCRLFWithFirstIndex(string, prefix2, postfix, index4) {
   let endIndex = 0;
   let returnValue = "";
   do {
     const gotCR = string[index4 - 1] === "\r";
-    returnValue += string.slice(endIndex, gotCR ? index4 - 1 : index4) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
+    returnValue += string.slice(endIndex, gotCR ? index4 - 1 : index4) + prefix2 + (gotCR ? "\r\n" : "\n") + postfix;
     endIndex = index4 + 1;
     index4 = string.indexOf("\n", endIndex);
   } while (index4 !== -1);
@@ -15910,16 +15910,12 @@ var init_schemaValidator = __esm({
       mysqlSchemaSquashed,
       SQLiteSchemaSquashed
     ]);
-    commonSchema = unionType([
-      pgSchema,
-      mysqlSchema,
-      sqliteSchema
-    ]);
+    commonSchema = unionType([pgSchema, mysqlSchema, sqliteSchema]);
   }
 });
 
 // src/cli/validations/common.ts
-var sqliteDriversLiterals, sqliteDriver, postgresDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
+var sqliteDriversLiterals, migrationFilesPrefixes, prefix, sqliteDriver, postgresDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
 var init_common2 = __esm({
   "src/cli/validations/common.ts"() {
     "use strict";
@@ -15931,6 +15927,17 @@ var init_common2 = __esm({
       literalType("d1-http"),
       literalType("expo")
     ];
+    migrationFilesPrefixes = [
+      literalType("index"),
+      literalType("timestamp"),
+      literalType("supabase"),
+      literalType("unix"),
+      literalType("none")
+    ];
+    prefix = unionType(migrationFilesPrefixes);
+    {
+      const _2 = "";
+    }
     sqliteDriver = unionType(sqliteDriversLiterals);
     postgresDriver = literalType("aws-data-api");
     driver = unionType([sqliteDriver, postgresDriver]);
@@ -15939,9 +15946,13 @@ var init_common2 = __esm({
       schema: unionType([stringType(), stringType().array()]).optional(),
       out: stringType().optional(),
       breakpoints: booleanType().optional().default(true),
+      verbose: booleanType().optional().default(false),
       driver: driver.optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      migrations: objectType({
+        prefix: prefix.optional().default("index")
+      }).optional()
     });
     casing = unionType([literalType("camel"), literalType("preserve")]).default(
       "preserve"
@@ -16129,6 +16140,7 @@ var init_cli = __esm({
       out: stringType().optional().default("./drizzle"),
       config: stringType().optional(),
       name: stringType().optional(),
+      prefix: prefix.optional(),
       breakpoints: booleanType().optional().default(true),
       custom: booleanType().optional().default(false)
     }).strict();
@@ -16149,7 +16161,10 @@ var init_cli = __esm({
       schemaFilter: unionType([stringType(), stringType().array()]).optional().default(["public"]),
       extensionsFilters: literalType("postgis").array().optional(),
       introspectCasing: casing,
-      breakpoints: booleanType().optional().default(true)
+      breakpoints: booleanType().optional().default(true),
+      database: objectType({
+        prefix: prefix.optional().default("index")
+      }).optional()
     }).passthrough();
     configCheck = objectType({
       dialect: dialect3.optional(),
@@ -16269,7 +16284,8 @@ var init_utils6 = __esm({
       out: stringType().optional().default("drizzle"),
       migrations: objectType({
         table: stringType().optional(),
-        schema: stringType().optional()
+        schema: stringType().optional(),
+        prefix: unionType([literalType("index"), literalType("timestamp"), literalType("none")]).optional().default("index")
       }).optional()
     });
   }
@@ -19401,7 +19417,7 @@ var require_difflib = __commonJS({
         return `${beginning},${beginning + length - 1}`;
       };
       contextDiff = function(a, b, { fromfile, tofile, fromfiledate, tofiledate, n, lineterm } = {}) {
-        var _2, file1Range, file2Range, first, fromdate, group, i1, i2, j1, j2, l, last, len, len1, len2, len3, len4, line, lines, m, o, p, prefix, q, ref, ref1, ref2, started, tag, todate;
+        var _2, file1Range, file2Range, first, fromdate, group, i1, i2, j1, j2, l, last, len, len1, len2, len3, len4, line, lines, m, o, p, prefix2, q, ref, ref1, ref2, started, tag, todate;
         if (fromfile == null) {
           fromfile = "";
         }
@@ -19420,7 +19436,7 @@ var require_difflib = __commonJS({
         if (lineterm == null) {
           lineterm = "\n";
         }
-        prefix = {
+        prefix2 = {
           insert: "+ ",
           delete: "- ",
           replace: "! ",
@@ -19456,7 +19472,7 @@ var require_difflib = __commonJS({
                   ref1 = a.slice(i1, i2);
                   for (o = 0, len2 = ref1.length; o < len2; o++) {
                     line = ref1[o];
-                    lines.push(prefix[tag] + line);
+                    lines.push(prefix2[tag] + line);
                   }
                 }
               }
@@ -19478,7 +19494,7 @@ var require_difflib = __commonJS({
                   ref2 = b.slice(j1, j2);
                   for (q = 0, len4 = ref2.length; q < len4; q++) {
                     line = ref2[q];
-                    lines.push(prefix[tag] + line);
+                    lines.push(prefix2[tag] + line);
                   }
                 }
               }
@@ -19644,8 +19660,8 @@ var require_has_flag = __commonJS({
     module.exports = function(flag, argv) {
       argv = argv || process.argv;
       var terminatorPos = argv.indexOf("--");
-      var prefix = /^-{1,2}/.test(flag) ? "" : "--";
-      var pos = argv.indexOf(prefix + flag);
+      var prefix2 = /^-{1,2}/.test(flag) ? "" : "--";
+      var pos = argv.indexOf(prefix2 + flag);
       return pos !== -1 && (terminatorPos === -1 ? true : pos < terminatorPos);
     };
   }
@@ -20254,7 +20270,7 @@ var require_colorize = __commonJS({
     };
     var subcolorizeToCallback = function(options, key, diff2, output, color2, indent) {
       let subvalue;
-      const prefix = key ? `${key}: ` : "";
+      const prefix2 = key ? `${key}: ` : "";
       const subindent = indent + "  ";
       const outputElisions = (n) => {
         const maxElisions = options.maxElisions === void 0 ? Infinity : options.maxElisions;
@@ -20272,7 +20288,7 @@ var require_colorize = __commonJS({
             subcolorizeToCallback(options, key, diff2.__old, output, "-", indent);
             return subcolorizeToCallback(options, key, diff2.__new, output, "+", indent);
           } else {
-            output(color2, `${indent}${prefix}{`);
+            output(color2, `${indent}${prefix2}{`);
             for (const subkey of Object.keys(diff2)) {
               let m;
               subvalue = diff2[subkey];
@@ -20287,7 +20303,7 @@ var require_colorize = __commonJS({
             return output(color2, `${indent}}`);
           }
         case "array": {
-          output(color2, `${indent}${prefix}[`);
+          output(color2, `${indent}${prefix2}[`);
           let looksLikeDiff = true;
           for (const item of diff2) {
             if (extendedTypeOf(item) !== "array" || !(item.length === 2 || item.length === 1 && item[0] === " ") || !(typeof item[0] === "string") || item[0].length !== 1 || ![" ", "-", "+", "~"].includes(item[0])) {
@@ -20326,7 +20342,7 @@ var require_colorize = __commonJS({
         }
         default:
           if (diff2 === 0 || diff2 === null || diff2 === false || diff2 === "" || diff2) {
-            return output(color2, indent + prefix + JSON.stringify(diff2));
+            return output(color2, indent + prefix2 + JSON.stringify(diff2));
           }
       }
     };
@@ -23107,6 +23123,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");
@@ -23661,7 +23684,12 @@ var init_snapshotsDiffer = __esm({
           {}
         );
         jsonCreateIndexesForAllAlteredTables.push(
-          ...prepareCreateIndexesJson(it.name, it.schema, createdIndexes || {})
+          ...prepareCreateIndexesJson(
+            it.name,
+            it.schema,
+            createdIndexes || {},
+            curFull.internal
+          )
         );
         jsonDropIndexesForAllAlteredTables.push(
           ...prepareDropIndexesJson(it.name, it.schema, droppedIndexes || {})
@@ -24156,7 +24184,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 +24259,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 +24567,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 +24617,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 +24906,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 +24923,7 @@ var init_sqlgenerator = __esm({
           type: "alter_table_add_column"
         });
         return [
-          `ALTER TABLE ${tableNameWithSchema} drop column "${columnName}";`,
+          `ALTER TABLE ${tableNameWithSchema} drop column \`${columnName}\`;`,
           addColumnStatement
         ];
       }
@@ -27307,7 +27337,7 @@ function createSetOperator2(type, isAll) {
     return leftSelect.addSetOperators(setOperators);
   };
 }
-var _a199, SQLiteSelectBuilder, _a200, _b145, SQLiteSelectQueryBuilderBase, _a201, _b146, SQLiteSelectBase, getSQLiteSetOperators, union3, unionAll2, intersect2, except2;
+var _a199, SQLiteSelectBuilder, _a200, _b145, SQLiteSelectQueryBuilderBase, _a201, _b146, SQLiteSelectBase, getSQLiteSetOperators, union2, unionAll2, intersect2, except2;
 var init_select3 = __esm({
   "node_modules/.pnpm/drizzle-orm@0.32.0-85c8008_@aws-sdk+client-rds-data@3.600.0_@cloudflare+workers-types@4.20240_7kwr7fdj2penywro4vdziyruiq/node_modules/drizzle-orm/sqlite-core/query-builders/select.js"() {
     "use strict";
@@ -27910,12 +27940,12 @@ var init_select3 = __esm({
     __publicField(SQLiteSelectBase, _a201, "SQLiteSelect");
     applyMixins(SQLiteSelectBase, [QueryPromise]);
     getSQLiteSetOperators = () => ({
-      union: union3,
+      union: union2,
       unionAll: unionAll2,
       intersect: intersect2,
       except: except2
     });
-    union3 = createSetOperator2("union", false);
+    union2 = createSetOperator2("union", false);
     unionAll2 = createSetOperator2("union", true);
     intersect2 = createSetOperator2("intersect", false);
     except2 = createSetOperator2("except", false);
@@ -29070,13 +29100,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 +29160,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
           };
@@ -29479,12 +29515,12 @@ WHERE
         if (progressCallback) {
           progressCallback("indexes", indexesCount, "fetching");
         }
-        if (typeof tableInResult.indexes[constraintName] !== "undefined") {
+        if (typeof tableInResult.indexes[constraintName] !== "undefined" && columnName) {
           tableInResult.indexes[constraintName].columns.push(columnName);
         } else {
           tableInResult.indexes[constraintName] = {
             name: constraintName,
-            columns: [columnName],
+            columns: columnName ? [columnName] : [],
             isUnique
           };
         }
@@ -31817,7 +31853,7 @@ function createSetOperator3(type, isAll) {
     return leftSelect.addSetOperators(setOperators);
   };
 }
-var _a298, MySqlSelectBuilder, _a299, _b222, MySqlSelectQueryBuilderBase, _a300, _b223, MySqlSelectBase, getMySqlSetOperators, union4, unionAll3, intersect3, intersectAll2, except3, exceptAll2;
+var _a298, MySqlSelectBuilder, _a299, _b222, MySqlSelectQueryBuilderBase, _a300, _b223, MySqlSelectBase, getMySqlSetOperators, union3, unionAll3, intersect3, intersectAll2, except3, exceptAll2;
 var init_select4 = __esm({
   "node_modules/.pnpm/drizzle-orm@0.32.0-85c8008_@aws-sdk+client-rds-data@3.600.0_@cloudflare+workers-types@4.20240_7kwr7fdj2penywro4vdziyruiq/node_modules/drizzle-orm/mysql-core/query-builders/select.js"() {
     "use strict";
@@ -32507,14 +32543,14 @@ var init_select4 = __esm({
     __publicField(MySqlSelectBase, _a300, "MySqlSelect");
     applyMixins(MySqlSelectBase, [QueryPromise]);
     getMySqlSetOperators = () => ({
-      union: union4,
+      union: union3,
       unionAll: unionAll3,
       intersect: intersect3,
       intersectAll: intersectAll2,
       except: except3,
       exceptAll: exceptAll2
     });
-    union4 = createSetOperator3("union", false);
+    union3 = createSetOperator3("union", false);
     unionAll3 = createSetOperator3("union", true);
     intersect3 = createSetOperator3("intersect", false);
     intersectAll2 = createSetOperator3("intersect", true);
@@ -34650,7 +34686,7 @@ var pgSuggestions = async (db, statements) => {
         }
       }
     }
-    const stmnt = fromJson([statement], "postgresql")[0];
+    const stmnt = fromJson([statement], "postgresql");
     if (typeof stmnt !== "undefined") {
       if (statement.type === "drop_table") {
         statementsToExecute.push(
@@ -34660,7 +34696,7 @@ var pgSuggestions = async (db, statements) => {
           )} CASCADE;`
         );
       } else {
-        statementsToExecute.push(stmnt);
+        statementsToExecute.push(...stmnt);
       }
     }
   }
@@ -35034,14 +35070,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
             );
           }
         }
@@ -35060,7 +35096,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)];
           }
         }
       }
@@ -35081,9 +35117,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);
       }
     }
   }