drizzle-kit 0.20.14-a183d8b → 0.20.14-c82ab68

package/payload.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -1078,6 +1079,7 @@ var require_hanji = __commonJS({
 var import_hanji, info, error, schema, isRenamePromptItem, ResolveColumnSelect, ResolveTableSelect, ResolveSchemasSelect;
 var init_views = __esm({
   "src/cli/views.ts"() {
+    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
     info = (msg, greyMsg = "") => {
@@ -1099,7 +1101,7 @@ var init_views = __esm({
         )}`;
       }).join("\n");
       msg += "\n";
-      const enums = Object.values(schema4["enums"] || {});
+      const enums = Object.values("enums" in schema4 ? schema4["enums"] || {} : {});
       if (enums.length > 0) {
         msg += "\n";
         msg += source_default.bold(`${enums.length} enums
@@ -1114,7 +1116,7 @@ var init_views = __esm({
       return msg;
     };
     isRenamePromptItem = (item) => {
-      return item["from"] && item["to"];
+      return "from" in item && "to" in item;
     };
     ResolveColumnSelect = class extends import_hanji.Prompt {
       constructor(tableName, base, data) {
@@ -1262,6 +1264,7 @@ __export(mysqlImports_exports, {
 var import_mysql_core, import_drizzle_orm, prepareFromExports, prepareFromMySqlImports;
 var init_mysqlImports = __esm({
   "src/serializer/mysqlImports.ts"() {
+    "use strict";
     import_mysql_core = require("drizzle-orm/mysql-core");
     import_drizzle_orm = require("drizzle-orm");
     init_utils();
@@ -1303,6 +1306,7 @@ var init_mysqlImports = __esm({
 var withStyle;
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
+    "use strict";
     init_source();
     withStyle = {
       error: (str) => `${source_default.red(`${source_default.white.bgRed(" Invalid input ")} ${str}`)}`,
@@ -1341,6 +1345,7 @@ function clearDefaults(defaultValue, collate) {
 var import_mysql_core2, import_drizzle_orm2, import_mysql_core3, import_drizzle_orm3, dialect, indexName, generateMySqlSnapshot, fromDatabase;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
+    "use strict";
     import_mysql_core2 = require("drizzle-orm/mysql-core");
     import_drizzle_orm2 = require("drizzle-orm");
     import_mysql_core3 = require("drizzle-orm/mysql-core");
@@ -1556,7 +1561,8 @@ We have encountered a collision between the index name on columns ${source_defau
             lock: value.config.lock
           };
         });
-        result[tableName] = {
+        const tableKey = `${schema4 || "public"}.${tableName}`;
+        result[tableKey] = {
           name: tableName,
           schema: schema4,
           columns: columnsObject,
@@ -1570,7 +1576,7 @@ We have encountered a collision between the index name on columns ${source_defau
         mysqlSchemas.map((it) => [it.schemaName, it.schemaName])
       );
       return {
-        version: "5",
+        version: "6",
         dialect: "mysql",
         tables: result,
         schemas,
@@ -1825,7 +1831,7 @@ We have encountered a collision between the index name on columns ${source_defau
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "5",
+        version: "6",
         dialect: "mysql",
         tables: result,
         schemas: schemasObject,
@@ -1850,6 +1856,7 @@ __export(pgSerializer_exports, {
 var import_pg_core, import_pg_core2, import_drizzle_orm4, dialect2, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
+    "use strict";
     import_pg_core = require("drizzle-orm/pg-core");
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_drizzle_orm4 = require("drizzle-orm");
@@ -1985,7 +1992,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const onUpdate = fk4.onUpdate;
           const reference = fk4.reference();
           const tableTo = (0, import_drizzle_orm4.getTableName)(reference.foreignTable);
-          const schemaTo = (0, import_pg_core2.getTableConfig)(reference.foreignTable).schema || "public";
+          const schemaTo = (0, import_pg_core2.getTableConfig)(reference.foreignTable).schema;
           const columnsFrom = reference.columns.map((it) => it.name);
           const columnsTo = reference.foreignColumns.map((it) => it.name);
           return {
@@ -2040,7 +2047,8 @@ ${withStyle.errorWarning(
             isUnique: value.config.unique ?? false
           };
         });
-        result[tableName] = {
+        const tableKey = `${schema4 ?? "public"}.${tableName}`;
+        result[tableKey] = {
           name: tableName,
           schema: schema4 ?? "",
           columns: columnsObject,
@@ -2069,7 +2077,7 @@ ${withStyle.errorWarning(
         }).map((it) => [it.schemaName, it.schemaName])
       );
       return {
-        version: "5",
+        version: "6",
         dialect: "pg",
         tables: result,
         enums: enumsToReturn,
@@ -2417,7 +2425,7 @@ ${withStyle.errorWarning(
       }
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "5",
+        version: "6",
         dialect: "pg",
         tables: result,
         enums: enumsToReturn,
@@ -2498,6 +2506,7 @@ __export(sqliteImports_exports, {
 var import_sqlite_core, import_drizzle_orm5, prepareFromExports2, prepareFromSqliteImports;
 var init_sqliteImports = __esm({
   "src/serializer/sqliteImports.ts"() {
+    "use strict";
     import_sqlite_core = require("drizzle-orm/sqlite-core");
     import_drizzle_orm5 = require("drizzle-orm");
     init_utils();
@@ -2536,6 +2545,7 @@ __export(sqliteSerializer_exports, {
   generateSqliteSnapshot: () => generateSqliteSnapshot
 });
 function mapSqlToSqliteType(sqlType) {
+  const lowered = sqlType.toLowerCase();
   if ([
     "int",
     "integer",
@@ -2547,24 +2557,27 @@ function mapSqlToSqliteType(sqlType) {
     "unsigned big int",
     "int2",
     "int8"
-  ].includes(sqlType.toLowerCase())) {
+  ].some((it) => lowered.startsWith(it))) {
     return "integer";
   } else if ([
     "character",
     "varchar",
-    "vatying character",
+    "varying character",
+    "national varying character",
     "nchar",
     "native character",
     "nvarchar",
     "text",
     "clob"
-  ].some((it) => it.startsWith(sqlType.toLowerCase()))) {
+  ].some((it) => lowered.startsWith(it))) {
+    const match2 = lowered.match(/\d+/);
+    if (match2) {
+      return `text(${match2[0]})`;
+    }
     return "text";
-  } else if (sqlType.toLowerCase() === "blob") {
+  } else if (lowered.startsWith("blob")) {
     return "blob";
-  } else if (["real", "double", "double precision", "float"].includes(
-    sqlType.toLowerCase()
-  )) {
+  } else if (["real", "double", "double precision", "float"].some((it) => lowered.startsWith(it))) {
     return "real";
   } else {
     return "numeric";
@@ -2573,6 +2586,7 @@ function mapSqlToSqliteType(sqlType) {
 var import_drizzle_orm6, import_sqlite_core2, dialect3, generateSqliteSnapshot, fromDatabase3;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
+    "use strict";
     import_drizzle_orm6 = require("drizzle-orm");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_serializer();
@@ -2945,6 +2959,7 @@ WHERE
 var import_fs, import_path, glob, sqlToStr, serializeMySql, serializePg, serializeSQLite, prepareFilenames;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
+    "use strict";
     import_fs = __toESM(require("fs"));
     import_path = __toESM(require("path"));
     glob = __toESM(require("glob"));
@@ -3015,11 +3030,15 @@ ${filenames.join("\n")}
 });
 
 // src/global.ts
+function assertUnreachable(x) {
+  throw new Error("Didn't expect to get here");
+}
 var originUUID, snapshotVersion, mapValues;
 var init_global = __esm({
   "src/global.ts"() {
+    "use strict";
     originUUID = "00000000-0000-0000-0000-000000000000";
-    snapshotVersion = "5";
+    snapshotVersion = "6";
     mapValues = (obj, map) => {
       const result = Object.keys(obj).reduce(function(result2, key) {
         result2[key] = map(obj[key]);
@@ -6177,9 +6196,10 @@ var init_lib = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, dialect4, schemaHash, schemaInternalV3, schemaInternalV4, kitInternals, schemaInternal, schemaV3, schemaV4, schema2, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaSquashed, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect4, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternalV6, schemaInternal, schemaV3, schemaV4, schemaV5, schema2, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV5, mysqlSchemaSquashed, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
+    "use strict";
     init_global();
     init_lib();
     index = objectType({
@@ -6238,6 +6258,17 @@ var init_mysqlSchema = __esm({
       compositePrimaryKeys: recordType(stringType(), compositePK),
       uniqueConstraints: recordType(stringType(), uniqueConstraint).default({})
     }).strict();
+    kitInternals = objectType({
+      tables: recordType(
+        stringType(),
+        objectType({
+          columns: recordType(
+            stringType(),
+            objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
+          )
+        }).optional()
+      )
+    }).optional();
     dialect4 = literalType("mysql");
     schemaHash = objectType({
       id: stringType(),
@@ -6254,18 +6285,7 @@ var init_mysqlSchema = __esm({
       tables: recordType(stringType(), tableV4),
       schemas: recordType(stringType(), stringType())
     }).strict();
-    kitInternals = objectType({
-      tables: recordType(
-        stringType(),
-        objectType({
-          columns: recordType(
-            stringType(),
-            objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
-          )
-        }).optional()
-      )
-    }).optional();
-    schemaInternal = objectType({
+    schemaInternalV5 = objectType({
       version: literalType("5"),
       dialect: dialect4,
       tables: recordType(stringType(), table),
@@ -6277,8 +6297,33 @@ var init_mysqlSchema = __esm({
       }),
       internal: kitInternals
     }).strict();
+    schemaInternalV6 = objectType({
+      version: literalType("6"),
+      dialect: dialect4,
+      tables: recordType(stringType(), table),
+      schemas: recordType(stringType(), stringType()),
+      _meta: objectType({
+        schemas: recordType(stringType(), stringType()),
+        tables: recordType(stringType(), stringType()),
+        columns: recordType(stringType(), stringType())
+      }),
+      internal: kitInternals
+    }).strict();
+    schemaInternal = objectType({
+      version: literalType("6"),
+      dialect: dialect4,
+      tables: recordType(stringType(), table),
+      schemas: recordType(stringType(), stringType()),
+      _meta: objectType({
+        schemas: recordType(stringType(), stringType()),
+        tables: recordType(stringType(), stringType()),
+        columns: recordType(stringType(), stringType())
+      }),
+      internal: kitInternals
+    }).strict();
     schemaV3 = schemaInternalV3.merge(schemaHash);
     schemaV4 = schemaInternalV4.merge(schemaHash);
+    schemaV5 = schemaInternalV5.merge(schemaHash);
     schema2 = schemaInternal.merge(schemaHash);
     tableSquashedV4 = objectType({
       name: stringType(),
@@ -6404,12 +6449,9 @@ var init_mysqlSchema = __esm({
       };
     };
     mysqlSchema = schema2;
+    mysqlSchemaV5 = schemaV5;
     mysqlSchemaSquashed = schemaSquashed;
-    backwardCompatibleMysqlSchema = unionType([
-      schemaV3,
-      schemaV4,
-      schema2
-    ]);
+    backwardCompatibleMysqlSchema = unionType([mysqlSchemaV5, schema2]);
     dryMySql = mysqlSchema.parse({
       version: snapshotVersion,
       dialect: "mysql",
@@ -6427,9 +6469,10 @@ var init_mysqlSchema = __esm({
 });
 
 // src/serializer/pgSchema.ts
-var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, table2, schemaHash2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaExternal, kitInternals2, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
+var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, uniqueConstraint2, tableV42, table2, schemaHash2, kitInternals2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternalV5, pgSchemaExternal, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchemaV5, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
+    "use strict";
     init_global();
     init_lib();
     indexV2 = objectType({
@@ -6549,6 +6592,21 @@ var init_pgSchema = __esm({
       id: stringType(),
       prevId: stringType()
     });
+    kitInternals2 = objectType({
+      tables: recordType(
+        stringType(),
+        objectType({
+          columns: recordType(
+            stringType(),
+            objectType({
+              isArray: booleanType().optional(),
+              dimensions: numberType().optional(),
+              rawType: stringType().optional()
+            }).optional()
+          )
+        }).optional()
+      )
+    }).optional();
     pgSchemaInternalV3 = objectType({
       version: literalType("3"),
       dialect: literalType("pg"),
@@ -6562,6 +6620,19 @@ var init_pgSchema = __esm({
       enums: recordType(stringType(), enumSchema),
       schemas: recordType(stringType(), stringType())
     }).strict();
+    pgSchemaInternalV5 = objectType({
+      version: literalType("5"),
+      dialect: literalType("pg"),
+      tables: recordType(stringType(), table2),
+      enums: recordType(stringType(), enumSchema),
+      schemas: recordType(stringType(), stringType()),
+      _meta: objectType({
+        schemas: recordType(stringType(), stringType()),
+        tables: recordType(stringType(), stringType()),
+        columns: recordType(stringType(), stringType())
+      }),
+      internal: kitInternals2
+    }).strict();
     pgSchemaExternal = objectType({
       version: literalType("5"),
       dialect: literalType("pg"),
@@ -6574,23 +6645,8 @@ var init_pgSchema = __esm({
         columns: recordType(stringType(), stringType())
       })
     }).strict();
-    kitInternals2 = objectType({
-      tables: recordType(
-        stringType(),
-        objectType({
-          columns: recordType(
-            stringType(),
-            objectType({
-              isArray: booleanType().optional(),
-              dimensions: numberType().optional(),
-              rawType: stringType().optional()
-            }).optional()
-          )
-        }).optional()
-      )
-    }).optional();
     pgSchemaInternal = objectType({
-      version: literalType("5"),
+      version: literalType("6"),
       dialect: literalType("pg"),
       tables: recordType(stringType(), table2),
       enums: recordType(stringType(), enumSchema),
@@ -6626,7 +6682,7 @@ var init_pgSchema = __esm({
       schemas: recordType(stringType(), stringType())
     }).strict();
     pgSchemaSquashed = objectType({
-      version: literalType("5"),
+      version: literalType("6"),
       dialect: enumType(["pg"]),
       tables: recordType(stringType(), tableSquashed2),
       enums: recordType(stringType(), enumSchema),
@@ -6634,14 +6690,9 @@ var init_pgSchema = __esm({
     }).strict();
     pgSchemaV3 = pgSchemaInternalV3.merge(schemaHash2);
     pgSchemaV4 = pgSchemaInternalV4.merge(schemaHash2);
+    pgSchemaV5 = pgSchemaInternalV5.merge(schemaHash2);
     pgSchema = pgSchemaInternal.merge(schemaHash2);
-    backwardCompatiblePgSchema = unionType([
-      pgSchemaV1,
-      pgSchemaV2,
-      pgSchemaV3,
-      pgSchemaV4,
-      pgSchema
-    ]);
+    backwardCompatiblePgSchema = unionType([pgSchemaV5, pgSchema]);
     PgSquasher = {
       squashIdx: (idx) => {
         index2.parse(idx);
@@ -6657,7 +6708,7 @@ var init_pgSchema = __esm({
         return result;
       },
       squashFK: (fk4) => {
-        return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""};${fk4.schemaTo ?? ""}`;
+        return `${fk4.name};${fk4.tableFrom};${fk4.columnsFrom.join(",")};${fk4.tableTo};${fk4.columnsTo.join(",")};${fk4.onUpdate ?? ""};${fk4.onDelete ?? ""};${fk4.schemaTo || "public"}`;
       },
       squashPK: (pk) => {
         return `${pk.columns.join(",")};${pk.name}`;
@@ -6734,7 +6785,7 @@ var init_pgSchema = __esm({
         })
       );
       return {
-        version: "5",
+        version: "6",
         dialect: json.dialect,
         tables: mappedTables,
         enums: json.enums,
@@ -6762,6 +6813,7 @@ var init_pgSchema = __esm({
 var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect5, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
+    "use strict";
     init_global();
     init_lib();
     index3 = objectType({
@@ -6946,7 +6998,7 @@ var init_sqliteSchema = __esm({
       };
     };
     drySQLite = schema3.parse({
-      version: snapshotVersion,
+      version: "5",
       dialect: "sqlite",
       id: originUUID,
       prevId: "",
@@ -6959,11 +7011,7 @@ var init_sqliteSchema = __esm({
     });
     sqliteSchema = schema3;
     SQLiteSchemaSquashed = schemaSquashed2;
-    backwardCompatibleSqliteSchema = unionType([
-      schemaV32,
-      schemaV42,
-      schema3
-    ]);
+    backwardCompatibleSqliteSchema = schema3;
   }
 });
 
@@ -6971,6 +7019,7 @@ var init_sqliteSchema = __esm({
 var dialect6, commonSquashedSchema, commonSchema;
 var init_schemaValidator = __esm({
   "src/schemaValidator.ts"() {
+    "use strict";
     init_lib();
     init_mysqlSchema();
     init_pgSchema();
@@ -6993,6 +7042,7 @@ var init_schemaValidator = __esm({
 var driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema;
 var init_common = __esm({
   "src/cli/validations/common.ts"() {
+    "use strict";
     init_outputs();
     init_lib();
     init_schemaValidator();
@@ -7073,6 +7123,7 @@ var init_common = __esm({
 var mysqlConnectionCli, mysql2credentials, mysqlConnectionConfig, mysqlConfigIntrospectSchema, mysqlCliIntrospectParams, mysqlCliPushParams, mysqlConfigPushParams;
 var init_mysql = __esm({
   "src/cli/validations/mysql.ts"() {
+    "use strict";
     init_lib();
     init_utils();
     init_common();
@@ -7133,6 +7184,7 @@ var init_mysql = __esm({
 var pgConnectionCli, pgConnectionConfig, pgConfigIntrospectSchema, pgCliIntrospectParams, pgCliPushParams, pgConfigPushParams;
 var init_pg = __esm({
   "src/cli/validations/pg.ts"() {
+    "use strict";
     init_lib();
     init_utils();
     init_common();
@@ -7199,6 +7251,7 @@ var init_pg = __esm({
 var sqliteConnectionCli, sqliteConnectionSchema, sqliteCliConfigSchema, sqliteCliIntrospectParams, sqliteCliPushParams, sqliteConfigPushParams;
 var init_sqlite = __esm({
   "src/cli/validations/sqlite.ts"() {
+    "use strict";
     init_lib();
     init_utils();
     init_common();
@@ -7267,6 +7320,7 @@ __export(es5_exports, {
 var _, es5_default;
 var init_es5 = __esm({
   "src/cli/commands/_es5.ts"() {
+    "use strict";
     _ = "";
     es5_default = _;
   }
@@ -7368,20 +7422,20 @@ var require_ms = __commonJS({
     function fmtLong(ms) {
       var msAbs = Math.abs(ms);
       if (msAbs >= d) {
-        return plural(ms, msAbs, d, "day");
+        return plural2(ms, msAbs, d, "day");
       }
       if (msAbs >= h) {
-        return plural(ms, msAbs, h, "hour");
+        return plural2(ms, msAbs, h, "hour");
       }
       if (msAbs >= m) {
-        return plural(ms, msAbs, m, "minute");
+        return plural2(ms, msAbs, m, "minute");
       }
       if (msAbs >= s) {
-        return plural(ms, msAbs, s, "second");
+        return plural2(ms, msAbs, s, "second");
       }
       return ms + " ms";
     }
-    function plural(ms, msAbs, n, name) {
+    function plural2(ms, msAbs, n, name) {
       var isPlural = msAbs >= n * 1.5;
       return Math.round(ms / n) + " " + name + (isPlural ? "s" : "");
     }
@@ -12820,7 +12874,7 @@ var require_node2 = __commonJS({
         ...overrides
       } = esbuildOptions;
       const compile = function compile2(code, filename, format) {
-        const define = {
+        const define2 = {
           "import.meta.url": IMPORT_META_URL_VARIABLE_NAME,
           ...overrides.define
         };
@@ -12839,7 +12893,7 @@ var require_node2 = __commonJS({
           jsxFactory: options.jsxFactory,
           jsxFragment: options.jsxFragment,
           format,
-          define,
+          define: define2,
           banner,
           ...overrides
         });
@@ -12881,6 +12935,7 @@ var require_node2 = __commonJS({
 var import_hanji2, assertES5, safeRegister;
 var init_utils = __esm({
   "src/cli/commands/utils.ts"() {
+    "use strict";
     init_serializer();
     init_source();
     init_views();
@@ -12944,6 +12999,7 @@ __export(pgImports_exports, {
 var import_pg_core3, import_drizzle_orm7, prepareFromExports3, prepareFromPgImports;
 var init_pgImports = __esm({
   "src/serializer/pgImports.ts"() {
+    "use strict";
     import_pg_core3 = require("drizzle-orm/pg-core");
     import_drizzle_orm7 = require("drizzle-orm");
     init_utils();
@@ -12989,6 +13045,7 @@ var init_pgImports = __esm({
 var import_fs2, import_crypto, prepareMySqlDbPushSnapshot, prepareSQLiteDbPushSnapshot, preparePgDbPushSnapshot, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, fillPgSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
 var init_migrationPreparator = __esm({
   "src/migrationPreparator.ts"() {
+    "use strict";
     import_fs2 = __toESM(require("fs"));
     import_crypto = require("crypto");
     init_serializer();
@@ -13077,7 +13134,7 @@ var init_migrationPreparator = __esm({
       const serialized = await serializePg(schemaPath);
       const id = (0, import_crypto.randomUUID)();
       const idPrev = prevSnapshot.id;
-      const result = fillPgSnapshot({ serialized, id, idPrev });
+      const result = { id, prevId: idPrev, ...serialized };
       const { id: _ignoredId, prevId: _ignoredPrevId, ...prevRest } = prevSnapshot;
       const custom = fillPgSnapshot({ serialized: prevRest, id, idPrev });
       return { prev: prevSnapshot, cur: result, custom };
@@ -13095,6 +13152,363 @@ var init_migrationPreparator = __esm({
   }
 });
 
+// node_modules/.pnpm/pluralize@8.0.0/node_modules/pluralize/pluralize.js
+var require_pluralize = __commonJS({
+  "node_modules/.pnpm/pluralize@8.0.0/node_modules/pluralize/pluralize.js"(exports, module2) {
+    (function(root, pluralize) {
+      if (typeof require === "function" && typeof exports === "object" && typeof module2 === "object") {
+        module2.exports = pluralize();
+      } else if (typeof define === "function" && define.amd) {
+        define(function() {
+          return pluralize();
+        });
+      } else {
+        root.pluralize = pluralize();
+      }
+    })(exports, function() {
+      var pluralRules = [];
+      var singularRules = [];
+      var uncountables = {};
+      var irregularPlurals = {};
+      var irregularSingles = {};
+      function sanitizeRule(rule) {
+        if (typeof rule === "string") {
+          return new RegExp("^" + rule + "$", "i");
+        }
+        return rule;
+      }
+      function restoreCase(word, token) {
+        if (word === token)
+          return token;
+        if (word === word.toLowerCase())
+          return token.toLowerCase();
+        if (word === word.toUpperCase())
+          return token.toUpperCase();
+        if (word[0] === word[0].toUpperCase()) {
+          return token.charAt(0).toUpperCase() + token.substr(1).toLowerCase();
+        }
+        return token.toLowerCase();
+      }
+      function interpolate(str, args) {
+        return str.replace(/\$(\d{1,2})/g, function(match2, index4) {
+          return args[index4] || "";
+        });
+      }
+      function replace(word, rule) {
+        return word.replace(rule[0], function(match2, index4) {
+          var result = interpolate(rule[1], arguments);
+          if (match2 === "") {
+            return restoreCase(word[index4 - 1], result);
+          }
+          return restoreCase(match2, result);
+        });
+      }
+      function sanitizeWord(token, word, rules) {
+        if (!token.length || uncountables.hasOwnProperty(token)) {
+          return word;
+        }
+        var len = rules.length;
+        while (len--) {
+          var rule = rules[len];
+          if (rule[0].test(word))
+            return replace(word, rule);
+        }
+        return word;
+      }
+      function replaceWord(replaceMap, keepMap, rules) {
+        return function(word) {
+          var token = word.toLowerCase();
+          if (keepMap.hasOwnProperty(token)) {
+            return restoreCase(word, token);
+          }
+          if (replaceMap.hasOwnProperty(token)) {
+            return restoreCase(word, replaceMap[token]);
+          }
+          return sanitizeWord(token, word, rules);
+        };
+      }
+      function checkWord(replaceMap, keepMap, rules, bool) {
+        return function(word) {
+          var token = word.toLowerCase();
+          if (keepMap.hasOwnProperty(token))
+            return true;
+          if (replaceMap.hasOwnProperty(token))
+            return false;
+          return sanitizeWord(token, token, rules) === token;
+        };
+      }
+      function pluralize(word, count, inclusive) {
+        var pluralized = count === 1 ? pluralize.singular(word) : pluralize.plural(word);
+        return (inclusive ? count + " " : "") + pluralized;
+      }
+      pluralize.plural = replaceWord(
+        irregularSingles,
+        irregularPlurals,
+        pluralRules
+      );
+      pluralize.isPlural = checkWord(
+        irregularSingles,
+        irregularPlurals,
+        pluralRules
+      );
+      pluralize.singular = replaceWord(
+        irregularPlurals,
+        irregularSingles,
+        singularRules
+      );
+      pluralize.isSingular = checkWord(
+        irregularPlurals,
+        irregularSingles,
+        singularRules
+      );
+      pluralize.addPluralRule = function(rule, replacement) {
+        pluralRules.push([sanitizeRule(rule), replacement]);
+      };
+      pluralize.addSingularRule = function(rule, replacement) {
+        singularRules.push([sanitizeRule(rule), replacement]);
+      };
+      pluralize.addUncountableRule = function(word) {
+        if (typeof word === "string") {
+          uncountables[word.toLowerCase()] = true;
+          return;
+        }
+        pluralize.addPluralRule(word, "$0");
+        pluralize.addSingularRule(word, "$0");
+      };
+      pluralize.addIrregularRule = function(single, plural2) {
+        plural2 = plural2.toLowerCase();
+        single = single.toLowerCase();
+        irregularSingles[single] = plural2;
+        irregularPlurals[plural2] = single;
+      };
+      [
+        // Pronouns.
+        ["I", "we"],
+        ["me", "us"],
+        ["he", "they"],
+        ["she", "they"],
+        ["them", "them"],
+        ["myself", "ourselves"],
+        ["yourself", "yourselves"],
+        ["itself", "themselves"],
+        ["herself", "themselves"],
+        ["himself", "themselves"],
+        ["themself", "themselves"],
+        ["is", "are"],
+        ["was", "were"],
+        ["has", "have"],
+        ["this", "these"],
+        ["that", "those"],
+        // Words ending in with a consonant and `o`.
+        ["echo", "echoes"],
+        ["dingo", "dingoes"],
+        ["volcano", "volcanoes"],
+        ["tornado", "tornadoes"],
+        ["torpedo", "torpedoes"],
+        // Ends with `us`.
+        ["genus", "genera"],
+        ["viscus", "viscera"],
+        // Ends with `ma`.
+        ["stigma", "stigmata"],
+        ["stoma", "stomata"],
+        ["dogma", "dogmata"],
+        ["lemma", "lemmata"],
+        ["schema", "schemata"],
+        ["anathema", "anathemata"],
+        // Other irregular rules.
+        ["ox", "oxen"],
+        ["axe", "axes"],
+        ["die", "dice"],
+        ["yes", "yeses"],
+        ["foot", "feet"],
+        ["eave", "eaves"],
+        ["goose", "geese"],
+        ["tooth", "teeth"],
+        ["quiz", "quizzes"],
+        ["human", "humans"],
+        ["proof", "proofs"],
+        ["carve", "carves"],
+        ["valve", "valves"],
+        ["looey", "looies"],
+        ["thief", "thieves"],
+        ["groove", "grooves"],
+        ["pickaxe", "pickaxes"],
+        ["passerby", "passersby"]
+      ].forEach(function(rule) {
+        return pluralize.addIrregularRule(rule[0], rule[1]);
+      });
+      [
+        [/s?$/i, "s"],
+        [/[^\u0000-\u007F]$/i, "$0"],
+        [/([^aeiou]ese)$/i, "$1"],
+        [/(ax|test)is$/i, "$1es"],
+        [/(alias|[^aou]us|t[lm]as|gas|ris)$/i, "$1es"],
+        [/(e[mn]u)s?$/i, "$1s"],
+        [/([^l]ias|[aeiou]las|[ejzr]as|[iu]am)$/i, "$1"],
+        [/(alumn|syllab|vir|radi|nucle|fung|cact|stimul|termin|bacill|foc|uter|loc|strat)(?:us|i)$/i, "$1i"],
+        [/(alumn|alg|vertebr)(?:a|ae)$/i, "$1ae"],
+        [/(seraph|cherub)(?:im)?$/i, "$1im"],
+        [/(her|at|gr)o$/i, "$1oes"],
+        [/(agend|addend|millenni|dat|extrem|bacteri|desiderat|strat|candelabr|errat|ov|symposi|curricul|automat|quor)(?:a|um)$/i, "$1a"],
+        [/(apheli|hyperbat|periheli|asyndet|noumen|phenomen|criteri|organ|prolegomen|hedr|automat)(?:a|on)$/i, "$1a"],
+        [/sis$/i, "ses"],
+        [/(?:(kni|wi|li)fe|(ar|l|ea|eo|oa|hoo)f)$/i, "$1$2ves"],
+        [/([^aeiouy]|qu)y$/i, "$1ies"],
+        [/([^ch][ieo][ln])ey$/i, "$1ies"],
+        [/(x|ch|ss|sh|zz)$/i, "$1es"],
+        [/(matr|cod|mur|sil|vert|ind|append)(?:ix|ex)$/i, "$1ices"],
+        [/\b((?:tit)?m|l)(?:ice|ouse)$/i, "$1ice"],
+        [/(pe)(?:rson|ople)$/i, "$1ople"],
+        [/(child)(?:ren)?$/i, "$1ren"],
+        [/eaux$/i, "$0"],
+        [/m[ae]n$/i, "men"],
+        ["thou", "you"]
+      ].forEach(function(rule) {
+        return pluralize.addPluralRule(rule[0], rule[1]);
+      });
+      [
+        [/s$/i, ""],
+        [/(ss)$/i, "$1"],
+        [/(wi|kni|(?:after|half|high|low|mid|non|night|[^\w]|^)li)ves$/i, "$1fe"],
+        [/(ar|(?:wo|[ae])l|[eo][ao])ves$/i, "$1f"],
+        [/ies$/i, "y"],
+        [/\b([pl]|zomb|(?:neck|cross)?t|coll|faer|food|gen|goon|group|lass|talk|goal|cut)ies$/i, "$1ie"],
+        [/\b(mon|smil)ies$/i, "$1ey"],
+        [/\b((?:tit)?m|l)ice$/i, "$1ouse"],
+        [/(seraph|cherub)im$/i, "$1"],
+        [/(x|ch|ss|sh|zz|tto|go|cho|alias|[^aou]us|t[lm]as|gas|(?:her|at|gr)o|[aeiou]ris)(?:es)?$/i, "$1"],
+        [/(analy|diagno|parenthe|progno|synop|the|empha|cri|ne)(?:sis|ses)$/i, "$1sis"],
+        [/(movie|twelve|abuse|e[mn]u)s$/i, "$1"],
+        [/(test)(?:is|es)$/i, "$1is"],
+        [/(alumn|syllab|vir|radi|nucle|fung|cact|stimul|termin|bacill|foc|uter|loc|strat)(?:us|i)$/i, "$1us"],
+        [/(agend|addend|millenni|dat|extrem|bacteri|desiderat|strat|candelabr|errat|ov|symposi|curricul|quor)a$/i, "$1um"],
+        [/(apheli|hyperbat|periheli|asyndet|noumen|phenomen|criteri|organ|prolegomen|hedr|automat)a$/i, "$1on"],
+        [/(alumn|alg|vertebr)ae$/i, "$1a"],
+        [/(cod|mur|sil|vert|ind)ices$/i, "$1ex"],
+        [/(matr|append)ices$/i, "$1ix"],
+        [/(pe)(rson|ople)$/i, "$1rson"],
+        [/(child)ren$/i, "$1"],
+        [/(eau)x?$/i, "$1"],
+        [/men$/i, "man"]
+      ].forEach(function(rule) {
+        return pluralize.addSingularRule(rule[0], rule[1]);
+      });
+      [
+        // Singular words with no plurals.
+        "adulthood",
+        "advice",
+        "agenda",
+        "aid",
+        "aircraft",
+        "alcohol",
+        "ammo",
+        "analytics",
+        "anime",
+        "athletics",
+        "audio",
+        "bison",
+        "blood",
+        "bream",
+        "buffalo",
+        "butter",
+        "carp",
+        "cash",
+        "chassis",
+        "chess",
+        "clothing",
+        "cod",
+        "commerce",
+        "cooperation",
+        "corps",
+        "debris",
+        "diabetes",
+        "digestion",
+        "elk",
+        "energy",
+        "equipment",
+        "excretion",
+        "expertise",
+        "firmware",
+        "flounder",
+        "fun",
+        "gallows",
+        "garbage",
+        "graffiti",
+        "hardware",
+        "headquarters",
+        "health",
+        "herpes",
+        "highjinks",
+        "homework",
+        "housework",
+        "information",
+        "jeans",
+        "justice",
+        "kudos",
+        "labour",
+        "literature",
+        "machinery",
+        "mackerel",
+        "mail",
+        "media",
+        "mews",
+        "moose",
+        "music",
+        "mud",
+        "manga",
+        "news",
+        "only",
+        "personnel",
+        "pike",
+        "plankton",
+        "pliers",
+        "police",
+        "pollution",
+        "premises",
+        "rain",
+        "research",
+        "rice",
+        "salmon",
+        "scissors",
+        "series",
+        "sewage",
+        "shambles",
+        "shrimp",
+        "software",
+        "species",
+        "staff",
+        "swine",
+        "tennis",
+        "traffic",
+        "transportation",
+        "trout",
+        "tuna",
+        "wealth",
+        "welfare",
+        "whiting",
+        "wildebeest",
+        "wildlife",
+        "you",
+        /pok[eé]mon$/i,
+        // Regexes.
+        /[^aeiou]ese$/i,
+        // "chinese", "japanese"
+        /deer$/i,
+        // "deer", "reindeer"
+        /fish$/i,
+        // "fish", "blowfish", "angelfish"
+        /measles$/i,
+        /o[iu]s$/i,
+        // "carnivorous"
+        /pox$/i,
+        // "chickpox", "smallpox"
+        /sheep$/i
+      ].forEach(pluralize.addUncountableRule);
+      return pluralize;
+    });
+  }
+});
+
 // node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js
 var require_balanced_match = __commonJS({
   "node_modules/.pnpm/balanced-match@1.0.2/node_modules/balanced-match/index.js"(exports, module2) {
@@ -13384,6 +13798,7 @@ function applyJsonDiff(json1, json2) {
 var import_json_diff, findAlternationsInTable, alternationsInColumn;
 var init_jsonDiffer = __esm({
   "src/jsonDiffer.js"() {
+    "use strict";
     "use-strict";
     import_json_diff = require("json-diff");
     findAlternationsInTable = (table4, tableSchema) => {
@@ -13556,20 +13971,21 @@ var init_jsonDiffer = __esm({
 var preparePgCreateTableJson, prepareMySqlCreateTableJson, prepareSQLiteCreateTable, prepareDropTableJson, prepareRenameTableJson, prepareCreateEnumJson, prepareAddValuesToEnumJson, prepareCreateSchemasJson, prepareRenameSchemasJson, prepareDeleteSchemasJson, prepareRenameColumns, prepareAlterTableColumnsJson, _prepareDropColumns, _prepareAddColumns, _prepareSQLiteAddColumns, _prepareAlterColumns, prepareCreateIndexesJson, prepareCreateReferencesJson, prepareDropReferencesJson, prepareAlterReferencesJson, prepareDropIndexesJson, prepareAddCompositePrimaryKeySqlite, prepareDeleteCompositePrimaryKeySqlite, prepareAlterCompositePrimaryKeySqlite, prepareAddCompositePrimaryKeyPg, prepareDeleteCompositePrimaryKeyPg, prepareAlterCompositePrimaryKeyPg, prepareAddUniqueConstraintPg, prepareDeleteUniqueConstraintPg, prepareAddCompositePrimaryKeyMySql, prepareDeleteCompositePrimaryKeyMySql, prepareAlterCompositePrimaryKeyMySql;
 var init_jsonStatements = __esm({
   "src/jsonStatements.ts"() {
+    "use strict";
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
     preparePgCreateTableJson = (table4, json2) => {
       const { name, schema: schema4, columns, compositePrimaryKeys, uniqueConstraints } = table4;
+      const tableKey = `${schema4 || "public"}.${name}`;
+      const compositePkName = Object.values(compositePrimaryKeys).length > 0 ? json2.tables[tableKey].compositePrimaryKeys[`${PgSquasher.unsquashPK(Object.values(compositePrimaryKeys)[0]).name}`].name : "";
       return {
         type: "create_table",
         tableName: name,
         schema: schema4,
         columns: Object.values(columns),
         compositePKs: Object.values(compositePrimaryKeys),
-        compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[`${PgSquasher.unsquashPK(
-          Object.values(compositePrimaryKeys)[0]
-        ).name}`].name : "",
+        compositePkName,
         uniqueConstraints: Object.values(uniqueConstraints)
       };
     };
@@ -13671,7 +14087,8 @@ var init_jsonStatements = __esm({
     prepareAlterTableColumnsJson = (tableName, schema4, deleted, added, altered, addedFk, json2, dialect7) => {
       const addColumns = [];
       const dropColumns = _prepareDropColumns(tableName, schema4, deleted);
-      const alterColumns = _prepareAlterColumns(tableName, schema4, altered, json2);
+      const tableKey = `${schema4 || "public"}.${tableName}`;
+      const alterColumns = _prepareAlterColumns(tableKey, schema4, altered, json2);
       if (dialect7 === "sqlite") {
         let jsonCreateFKStatements = Object.values(addedFk);
         const sqliteAddColumns = _prepareSQLiteAddColumns(
@@ -13721,19 +14138,22 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    _prepareAlterColumns = (tableName, schema4, columns, json2) => {
+    _prepareAlterColumns = (tableKey, schema4, columns, json2) => {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
       let statements = [];
       let dropPkStatements = [];
       let setPkStatements = [];
       for (const column4 of columns) {
         const columnName = typeof column4.name !== "string" ? column4.name.new : column4.name;
-        const columnType = json2.tables[tableName].columns[columnName].type;
-        const columnDefault = json2.tables[tableName].columns[columnName].default;
-        const columnOnUpdate = json2.tables[tableName].columns[columnName].onUpdate;
-        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 table4 = json2.tables[tableKey];
+        const tableName = table4.name;
+        const snapshotColumn = table4.columns[columnName];
+        const columnType = snapshotColumn.type;
+        const columnDefault = snapshotColumn.default;
+        const columnOnUpdate = "onUpdate" in snapshotColumn ? snapshotColumn.onUpdate : void 0;
+        const columnNotNull = table4.columns[columnName].notNull;
+        const columnAutoIncrement = "autoincrement" in snapshotColumn ? snapshotColumn.autoincrement ?? false : false;
+        const columnPk = table4.columns[columnName].primaryKey;
         if (((_a = column4.autoincrement) == null ? void 0 : _a.type) === "added") {
           statements.push({
             type: "alter_table_alter_column_set_autoincrement",
@@ -13780,13 +14200,14 @@ var init_jsonStatements = __esm({
       }
       for (const column4 of columns) {
         const columnName = typeof column4.name !== "string" ? column4.name.new : column4.name;
-        const columnType = json2.tables[tableName].columns[columnName].type;
-        const columnDefault = json2.tables[tableName].columns[columnName].default;
-        const columnOnUpdate = json2.tables[tableName].columns[columnName].onUpdate;
-        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}`];
+        const tableName = json2.tables[tableKey].name;
+        const columnType = json2.tables[tableKey].columns[columnName].type;
+        const columnDefault = json2.tables[tableKey].columns[columnName].default;
+        const columnOnUpdate = json2.tables[tableKey].columns[columnName].onUpdate;
+        const columnNotNull = json2.tables[tableKey].columns[columnName].notNull;
+        const columnAutoIncrement = json2.tables[tableKey].columns[columnName].autoincrement;
+        const columnPk = json2.tables[tableKey].columns[columnName].primaryKey;
+        const compositePk = json2.tables[tableKey].compositePrimaryKeys[`${tableName}_${columnName}`];
         if (typeof column4.name !== "string") {
           statements.push({
             type: "alter_table_rename_column",
@@ -14137,6 +14558,7 @@ var init_jsonStatements = __esm({
 var prepareMigrationMetadata, adjectives, heroes;
 var init_words = __esm({
   "src/utils/words.ts"() {
+    "use strict";
     prepareMigrationMetadata = (idx) => {
       const prefix = idx.toFixed(0).padStart(4, "0");
       const suffix = `${adjectives.random()}_${heroes.random()}`;
@@ -15457,6 +15879,7 @@ var init_words = __esm({
 // src/cli/commands/pgUp.ts
 var init_pgUp = __esm({
   "src/cli/commands/pgUp.ts"() {
+    "use strict";
     init_source();
     init_global();
     init_pgSchema();
@@ -15467,6 +15890,7 @@ var init_pgUp = __esm({
 // src/cli/commands/mysqlUp.ts
 var init_mysqlUp = __esm({
   "src/cli/commands/mysqlUp.ts"() {
+    "use strict";
     init_source();
     init_mysqlSchema();
     init_utils2();
@@ -15476,6 +15900,7 @@ var init_mysqlUp = __esm({
 // src/cli/commands/upFolders.ts
 var init_upFolders = __esm({
   "src/cli/commands/upFolders.ts"() {
+    "use strict";
     init_jsonDiffer();
     init_mysqlSchema();
     init_sqliteSchema();
@@ -15489,9 +15914,10 @@ var init_upFolders = __esm({
 });
 
 // src/utils.ts
-var import_fs3, import_path2, assertV1OutFolder, dryJournal, prepareOutFolder2, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
+var import_fs3, import_path2, assertV1OutFolder, dryJournal, prepareOutFolder, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
 var init_utils2 = __esm({
   "src/utils.ts"() {
+    "use strict";
     import_fs3 = require("fs");
     init_views();
     init_mysqlSchema();
@@ -15502,7 +15928,7 @@ var init_utils2 = __esm({
     init_global();
     init_upFolders();
     init_snapshotsDiffer();
-    assertV1OutFolder = (out, dialect7) => {
+    assertV1OutFolder = (out) => {
       if (!(0, import_fs3.existsSync)(out))
         return;
       const oldMigrationFolders = (0, import_fs3.readdirSync)(out).filter(
@@ -15511,7 +15937,7 @@ var init_utils2 = __esm({
       if (oldMigrationFolders.length > 0) {
         console.log(
           `Your migrations folder format is outdated, please run ${source_default.green.bold(
-            `drizzle-kit up:${dialect7}`
+            `drizzle-kit up`
           )}`
         );
         process.exit(1);
@@ -15524,7 +15950,7 @@ var init_utils2 = __esm({
         entries: []
       };
     };
-    prepareOutFolder2 = (out, dialect7) => {
+    prepareOutFolder = (out, dialect7) => {
       const meta = (0, import_path2.join)(out, "meta");
       const journalPath = (0, import_path2.join)(meta, "_journal.json");
       if (!(0, import_fs3.existsSync)((0, import_path2.join)(out, "meta"))) {
@@ -15539,9 +15965,9 @@ var init_utils2 = __esm({
     validatorForDialect = (dialect7) => {
       switch (dialect7) {
         case "pg":
-          return { validator: backwardCompatiblePgSchema, version: 5 };
+          return { validator: backwardCompatiblePgSchema, version: 6 };
         case "sqlite":
-          return { validator: backwardCompatibleSqliteSchema, version: 5 };
+          return { validator: backwardCompatibleSqliteSchema, version: 6 };
         case "mysql":
           return { validator: backwardCompatibleMysqlSchema, version: 5 };
       }
@@ -15589,13 +16015,13 @@ var init_utils2 = __esm({
       return result;
     };
     prepareMigrationFolder = (outFolder = "drizzle", dialect7) => {
-      const { snapshots, journal } = prepareOutFolder2(outFolder, dialect7);
+      const { snapshots, journal } = prepareOutFolder(outFolder, dialect7);
       const report = validateWithReport(snapshots, dialect7);
       if (report.nonLatest.length > 0) {
         console.log(
           report.nonLatest.map((it) => {
             return `${it}/snapshot.json is not of the latest version`;
-          }).concat(`Run ${source_default.green.bold(`drizzle-kit up:${dialect7}`)}`).join("\n")
+          }).concat(`Run ${source_default.green.bold(`drizzle-kit up`)}`).join("\n")
         );
         process.exit(0);
       }
@@ -15664,6 +16090,7 @@ var init_utils2 = __esm({
 var makeChanged, makeSelfOrChanged, makePatched, makeSelfOrPatched, valueFromSelfOrPatchedNew, columnSchema, alteredColumnSchema, enumSchema2, changedEnumSchema, tableScheme, alteredTableScheme, diffResultScheme, applySnapshotsDiff;
 var init_snapshotsDiffer = __esm({
   "src/snapshotsDiffer.ts"() {
+    "use strict";
     init_sqlgenerator();
     init_lib();
     init_jsonDiffer();
@@ -15671,6 +16098,7 @@ var init_snapshotsDiffer = __esm({
     init_utils2();
     init_sqliteSchema();
     init_mysqlSchema();
+    init_global();
     makeChanged = (schema4) => {
       return objectType({
         type: enumType(["changed"]),
@@ -15709,7 +16137,7 @@ var init_snapshotsDiffer = __esm({
       return unionType([
         objectType({
           type: literalType("none"),
-          value: schema4.optional()
+          value: schema4
         }),
         objectType({
           type: literalType("added"),
@@ -15833,7 +16261,6 @@ var init_snapshotsDiffer = __esm({
     }).strict();
     applySnapshotsDiff = async (json1, json2, dialect7, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
       var _a, _b;
-      let diffResult;
       if (dialect7 === "mysql") {
         for (const tableName in json1.tables) {
           const table4 = json1.tables[tableName];
@@ -15861,13 +16288,26 @@ var init_snapshotsDiffer = __esm({
             }
           }
         }
-        diffResult = applyJsonDiff(json1, json2);
       }
-      diffResult = applyJsonDiff(json1, json2);
+      const diffResult = applyJsonDiff(json1, json2);
       if (Object.keys(diffResult).length === 0) {
         return { statements: [], sqlStatements: [], _meta: void 0 };
       }
       const typedResult = diffResultScheme.parse(diffResult);
+      typedResult.alteredTablesWithColumns = typedResult.alteredTablesWithColumns.map((it) => {
+        let schemaToTrim;
+        if (it.schema.type === "none") {
+          schemaToTrim = it.schema.value || "public";
+        } else if (it.schema.type === "deleted") {
+          schemaToTrim = it.schema.value;
+        } else if (it.schema.type === "added") {
+          schemaToTrim = "public";
+        } else {
+          schemaToTrim = it.schema.old;
+        }
+        it.name = it.name.substring(schemaToTrim.length + 1);
+        return it;
+      });
       const {
         created: createdSchemas,
         deleted: deletedSchemas,
@@ -16019,7 +16459,7 @@ var init_snapshotsDiffer = __esm({
             prevFull,
             curFull
           );
-        } else {
+        } else if (dialect7 === "mysql") {
           addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
             it.name,
             it.addedCompositePKs,
@@ -16037,6 +16477,8 @@ var init_snapshotsDiffer = __esm({
             prevFull,
             curFull
           );
+        } else {
+          assertUnreachable(dialect7);
         }
         let addedUniqueConstraints = [];
         let deletedUniqueConstraints = [];
@@ -16227,11 +16669,13 @@ var init_snapshotsDiffer = __esm({
           return preparePgCreateTableJson(it, curFull);
         });
         jsonStatements.push(...jsonPgCreateTables);
-      } else {
+      } else if (dialect7 === "mysql") {
         const jsonMySqlCreateTables = created.map((it) => {
           return prepareMySqlCreateTableJson(it, curFull);
         });
         jsonStatements.push(...jsonMySqlCreateTables);
+      } else {
+        assertUnreachable(dialect7);
       }
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
@@ -16299,6 +16743,7 @@ __export(migrate_exports, {
 var import_fs4, import_path3, import_hanji4, prepareAndMigratePg, prepareMySQLPush, prepareSQLitePush, preparePgPush, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, BREAKPOINT, writeResult, embeddedMigrations, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
+    "use strict";
     import_fs4 = __toESM(require("fs"));
     init_migrationPreparator();
     init_snapshotsDiffer();
@@ -16316,7 +16761,7 @@ var init_migrate = __esm({
       const outFolder = config.out;
       const schemaPath = config.schema;
       try {
-        assertV1OutFolder(outFolder, "pg");
+        assertV1OutFolder(outFolder);
         const { snapshots, journal } = prepareMigrationFolder(outFolder, "pg");
         const { prev, cur, custom } = await preparePgMigrationSnapshot(
           snapshots,
@@ -16425,7 +16870,7 @@ var init_migrate = __esm({
       const outFolder = config.out;
       const schemaPath = config.schema;
       try {
-        assertV1OutFolder(outFolder, "mysql");
+        assertV1OutFolder(outFolder);
         const { snapshots, journal } = prepareMigrationFolder(outFolder, "mysql");
         const { prev, cur, custom } = await prepareMySqlMigrationSnapshot(
           snapshots,
@@ -16469,7 +16914,7 @@ var init_migrate = __esm({
       const outFolder = config.out;
       const schemaPath = config.schema;
       try {
-        assertV1OutFolder(outFolder, "sqlite");
+        assertV1OutFolder(outFolder);
         const { snapshots, journal } = prepareMigrationFolder(outFolder, "sqlite");
         const { prev, cur, custom } = await prepareSqliteMigrationSnapshot(
           snapshots,
@@ -16494,7 +16939,9 @@ var init_migrate = __esm({
         const { sqlStatements, _meta } = await prepareSQL(
           squashedPrev,
           squashedCur,
-          "sqlite"
+          "sqlite",
+          validatedPrev,
+          validatedCur
         );
         writeResult({
           cur,
@@ -16793,6 +17240,7 @@ ${sql2}
 var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, PgAlterTableAddUniqueConstraintConvertor, PgAlterTableDropUniqueConstraintConvertor, MySQLAlterTableAddUniqueConstraintConvertor, MySQLAlterTableDropUniqueConstraintConvertor, SQLiteAlterTableAddUniqueConstraintConvertor, SQLiteAlterTableDropUniqueConstraintConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, PgDropTableConvertor, MySQLDropTableConvertor, SQLiteDropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAddPk, MySqlAlterTableDropPk, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetPrimaryKeyConvertor, PgAlterTableAlterColumnDropPrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetAutoincrementConvertor, SqliteAlterTableAlterColumnDropAutoincrementConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, MySqlDropIndexConvertor, convertors, fromJson;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
+    "use strict";
     init_migrate();
     init_mysqlSchema();
     init_pgSchema();
@@ -18110,6 +18558,7 @@ drop type __venum;
 var import_hanji5, Select;
 var init_selector_ui = __esm({
   "src/cli/selector-ui.ts"() {
+    "use strict";
     init_source();
     import_hanji5 = __toESM(require_hanji());
     Select = class extends import_hanji5.Prompt {
@@ -34711,6 +35160,7 @@ __export(drivers_exports, {
 var import_drizzle_orm9, DrizzleDbClient, DrizzleORMPgClient, DrizzleORMMySQLClient, DrizzleORMSQLiteClient, BetterSqlite, MySQL2Client, TursoSqlite, PgPostgres;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
+    "use strict";
     import_drizzle_orm9 = require("drizzle-orm");
     DrizzleDbClient = class {
       constructor(db) {
@@ -34792,6 +35242,7 @@ __export(mysqlPushUtils_exports, {
 var import_hanji9, filterStatements, logSuggestionsAndReturn2;
 var init_mysqlPushUtils = __esm({
   "src/cli/commands/mysqlPushUtils.ts"() {
+    "use strict";
     init_source();
     import_hanji9 = __toESM(require_hanji());
     init_mysqlSchema();
@@ -35067,6 +35518,7 @@ init_pgSerializer();
 
 // src/introspect-pg.ts
 var import_drizzle_orm8 = require("drizzle-orm");
+var import_pluralize = __toESM(require_pluralize());
 var import_relations = require("drizzle-orm/relations");
 
 // node_modules/.pnpm/camelcase@7.0.1/node_modules/camelcase/index.js
@@ -35168,7 +35620,7 @@ String.prototype.camelCase = function() {
   return camelCase(String(this));
 };
 String.prototype.concatIf = function(it, condition) {
-  return condition ? `${this}${it}` : this;
+  return condition ? `${this}${it}` : String(this);
 };
 Array.prototype.random = function() {
   return this[~~(Math.random() * this.length)];