drizzle-kit 0.17.0-6323eb6 → 0.17.0-7c10593

package/index.js

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -6016,7 +6015,6 @@ var require_hanji = __commonJS({
 var import_hanji, err, info, error, schema, isRenamePromptItem, ResolveColumnSelect, ResolveTableSelect, ResolveSchemasSelect, Spinner, IntrospectProgress, DropMigrationView, trimmedRange;
 var init_views = __esm({
   "src/cli/views.ts"() {
-    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
     err = (msg) => {
@@ -6338,17 +6336,15 @@ Is ${source_default.bold.blue(
 var originUUID, snapshotVersion;
 var init_global = __esm({
   "src/global.ts"() {
-    "use strict";
     originUUID = "00000000-0000-0000-0000-000000000000";
     snapshotVersion = "5";
   }
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashed, schemaSquashed, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, tableV4, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, squashMysqlSchemeV4, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
-    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -6388,6 +6384,13 @@ var init_mysqlSchema = __esm({
       name: stringType(),
       columns: stringType().array()
     }).strict();
+    tableV4 = objectType({
+      name: stringType(),
+      schema: stringType().optional(),
+      columns: recordType(stringType(), column),
+      indexes: recordType(stringType(), index),
+      foreignKeys: recordType(stringType(), fk)
+    }).strict();
     table = objectType({
       name: stringType(),
       schema: stringType().optional(),
@@ -6409,7 +6412,7 @@ var init_mysqlSchema = __esm({
     schemaInternalV4 = objectType({
       version: literalType("4"),
       dialect,
-      tables: recordType(stringType(), table),
+      tables: recordType(stringType(), tableV4),
       schemas: recordType(stringType(), stringType())
     }).strict();
     schemaInternal = objectType({
@@ -6426,6 +6429,13 @@ var init_mysqlSchema = __esm({
     schemaV3 = schemaInternalV3.merge(schemaHash);
     schemaV4 = schemaInternalV4.merge(schemaHash);
     schema2 = schemaInternal.merge(schemaHash);
+    tableSquashedV4 = objectType({
+      name: stringType(),
+      schema: stringType().optional(),
+      columns: recordType(stringType(), column),
+      indexes: recordType(stringType(), stringType()),
+      foreignKeys: recordType(stringType(), stringType())
+    }).strict();
     tableSquashed = objectType({
       name: stringType(),
       schema: stringType().optional(),
@@ -6440,6 +6450,12 @@ var init_mysqlSchema = __esm({
       tables: recordType(stringType(), tableSquashed),
       schemas: recordType(stringType(), stringType())
     }).strict();
+    schemaSquashedV4 = objectType({
+      version: literalType("4"),
+      dialect,
+      tables: recordType(stringType(), tableSquashedV4),
+      schemas: recordType(stringType(), stringType())
+    }).strict();
     MySqlSquasher = {
       squashIdx: (idx) => {
         var _a, _b, _c;
@@ -6491,6 +6507,34 @@ var init_mysqlSchema = __esm({
         return result;
       }
     };
+    squashMysqlSchemeV4 = (json) => {
+      const mappedTables = Object.fromEntries(
+        Object.entries(json.tables).map((it) => {
+          const squashedIndexes = mapValues(it[1].indexes, (index4) => {
+            return MySqlSquasher.squashIdx(index4);
+          });
+          const squashedFKs = mapValues(it[1].foreignKeys, (fk4) => {
+            return MySqlSquasher.squashFK(fk4);
+          });
+          return [
+            it[0],
+            {
+              name: it[1].name,
+              schema: it[1].schema,
+              columns: it[1].columns,
+              indexes: squashedIndexes,
+              foreignKeys: squashedFKs
+            }
+          ];
+        })
+      );
+      return {
+        version: "4",
+        dialect: json.dialect,
+        tables: mappedTables,
+        schemas: json.schemas
+      };
+    };
     squashMysqlScheme = (json) => {
       const mappedTables = Object.fromEntries(
         Object.entries(json.tables).map((it) => {
@@ -6544,10 +6588,9 @@ var init_mysqlSchema = __esm({
 });
 
 // src/serializer/pgSchema.ts
-var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, table2, schemaHash2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternal, tableSquashed2, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgScheme, dryPg;
+var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, tableV1, pgSchemaV1, index2, fk2, column2, tableV32, compositePK2, tableV42, table2, schemaHash2, pgSchemaInternalV3, pgSchemaInternalV4, pgSchemaInternal, tableSquashed2, tableSquashedV42, pgSchemaSquashedV4, pgSchemaSquashed, pgSchemaV3, pgSchemaV4, pgSchema, backwardCompatiblePgSchema, PgSquasher, squashPgSchemeV4, squashPgScheme, dryPg;
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
-    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -6639,6 +6682,13 @@ var init_pgSchema = __esm({
       name: stringType(),
       columns: stringType().array()
     }).strict();
+    tableV42 = objectType({
+      name: stringType(),
+      schema: stringType(),
+      columns: recordType(stringType(), column2),
+      indexes: recordType(stringType(), index2),
+      foreignKeys: recordType(stringType(), fk2)
+    }).strict();
     table2 = objectType({
       name: stringType(),
       schema: stringType(),
@@ -6660,7 +6710,7 @@ var init_pgSchema = __esm({
     pgSchemaInternalV4 = objectType({
       version: literalType("4"),
       dialect: literalType("pg"),
-      tables: recordType(stringType(), table2),
+      tables: recordType(stringType(), tableV42),
       enums: recordType(stringType(), enumSchema),
       schemas: recordType(stringType(), stringType())
     }).strict();
@@ -6684,6 +6734,20 @@ var init_pgSchema = __esm({
       foreignKeys: recordType(stringType(), stringType()),
       compositePrimaryKeys: recordType(stringType(), stringType())
     }).strict();
+    tableSquashedV42 = objectType({
+      name: stringType(),
+      schema: stringType(),
+      columns: recordType(stringType(), column2),
+      indexes: recordType(stringType(), stringType()),
+      foreignKeys: recordType(stringType(), stringType())
+    }).strict();
+    pgSchemaSquashedV4 = objectType({
+      version: literalType("4"),
+      dialect: enumType(["pg"]),
+      tables: recordType(stringType(), tableSquashedV42),
+      enums: recordType(stringType(), enumSchema),
+      schemas: recordType(stringType(), stringType())
+    }).strict();
     pgSchemaSquashed = objectType({
       version: literalType("5"),
       dialect: enumType(["pg"]),
@@ -6747,6 +6811,35 @@ var init_pgSchema = __esm({
         return result;
       }
     };
+    squashPgSchemeV4 = (json) => {
+      const mappedTables = Object.fromEntries(
+        Object.entries(json.tables).map((it) => {
+          const squashedIndexes = mapValues(it[1].indexes, (index4) => {
+            return PgSquasher.squashIdx(index4);
+          });
+          const squashedFKs = mapValues(it[1].foreignKeys, (fk4) => {
+            return PgSquasher.squashFK(fk4);
+          });
+          return [
+            it[0],
+            {
+              name: it[1].name,
+              schema: it[1].schema,
+              columns: it[1].columns,
+              indexes: squashedIndexes,
+              foreignKeys: squashedFKs
+            }
+          ];
+        })
+      );
+      return {
+        version: "4",
+        dialect: json.dialect,
+        tables: mappedTables,
+        enums: json.enums,
+        schemas: json.schemas
+      };
+    };
     squashPgScheme = (json) => {
       const mappedTables = Object.fromEntries(
         Object.entries(json.tables).map((it) => {
@@ -6801,7 +6894,6 @@ var init_pgSchema = __esm({
 var index3, fk3, compositePK3, column3, tableV33, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV3, sqliteSchemaV4, sqliteSchema, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
-    "use strict";
     init_global();
     init_utils();
     init_lib();
@@ -13169,7 +13261,6 @@ function applyJsonDiff(json1, json2) {
 var import_json_diff, findAlternationsInTable, alternationsInColumn;
 var init_jsonDiffer = __esm({
   "src/jsonDiffer.js"() {
-    "use strict";
     import_json_diff = __toESM(require_lib());
     "use-strict";
     findAlternationsInTable = (table4, tableSchema) => {
@@ -13314,7 +13405,6 @@ var init_jsonDiffer = __esm({
 var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, MySqlAlterTableAlterColumnSetDefaultConvertor, MySqlAlterTableAlterColumnDropDefaultConvertor, MySqlModifyColumn, SqliteAlterTableAlterColumnDropDefaultConvertor, PgAlterTableCreateCompositePrimaryKeyConvertor, PgAlterTableDeleteCompositePrimaryKeyConvertor, PgAlterTableAlterCompositePrimaryKeyConvertor, MySqlAlterTableCreateCompositePrimaryKeyConvertor, MySqlAlterTableDeleteCompositePrimaryKeyConvertor, MySqlAlterTableAlterCompositePrimaryKeyConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, 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_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
@@ -14414,7 +14504,6 @@ drop type __venum;
 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, prepareAddCompositePrimaryKeyMySql, prepareDeleteCompositePrimaryKeyMySql, prepareAlterCompositePrimaryKeyMySql;
 var init_jsonStatements = __esm({
   "src/jsonStatements.ts"() {
-    "use strict";
     init_mysqlSchema();
     init_pgSchema();
     init_sqliteSchema();
@@ -14896,7 +14985,6 @@ var init_jsonStatements = __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();
@@ -15352,7 +15440,6 @@ var init_snapshotsDiffer = __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()}`;
@@ -16674,7 +16761,6 @@ var init_words = __esm({
 var import_crypto, import_fs, upPgHandlerV4toV5, upPgHandler, upPgHandlerV4, updateUpToV4, update1to2, update2to3, update3to4;
 var init_pgUp = __esm({
   "src/cli/commands/pgUp.ts"() {
-    "use strict";
     init_source();
     import_crypto = require("crypto");
     import_fs = require("fs");
@@ -16712,7 +16798,7 @@ var init_pgUp = __esm({
           }
           mappedColumns[ckey] = { ...column6, default: newDefault, type: newType };
         }
-        mappedTables[key] = { ...table4, columns: mappedColumns };
+        mappedTables[key] = { ...table4, columns: mappedColumns, compositePrimaryKeys: {} };
       }
       return {
         version: "5",
@@ -16914,7 +17000,6 @@ var init_pgUp = __esm({
 var import_fs2, upMysqlHandler, upMySqlHandlerV4toV5, upMysqlHandlerV4, updateToLatestV4, updateV3toV4;
 var init_mysqlUp = __esm({
   "src/cli/commands/mysqlUp.ts"() {
-    "use strict";
     init_source();
     import_fs2 = __toESM(require("fs"));
     init_mysqlSchema();
@@ -16972,7 +17057,7 @@ var init_mysqlUp = __esm({
             autoincrement: newAutoIncrement
           };
         }
-        mappedTables[key] = { ...table4, columns: mappedColumns };
+        mappedTables[key] = { ...table4, columns: mappedColumns, compositePrimaryKeys: {} };
       }
       return {
         version: "5",
@@ -17025,7 +17110,6 @@ var init_mysqlUp = __esm({
 var import_fs3, import_path, schemasResolverWithSQL, resolveSchemas, resolveTablesWithSQL, resolveTables, resolveColumnsWithSQL, resolveColumns, fullfill, fullfillpg, fullfillmysql, fullfillsqlite, upgradeFolders;
 var init_upFolders = __esm({
   "src/cli/commands/upFolders.ts"() {
-    "use strict";
     import_fs3 = require("fs");
     import_path = require("path");
     init_jsonDiffer();
@@ -17229,8 +17313,8 @@ var init_upFolders = __esm({
         return upPgHandlerV4toV5(b);
       }
       const a = pgSchemaV4.parse(prev);
-      const json1 = squashPgScheme(a);
-      const json2 = squashPgScheme(b);
+      const json1 = squashPgSchemeV4(a);
+      const json2 = squashPgSchemeV4(b);
       const diffResult = applyJsonDiff(json1, json2);
       const parseResult = diffResultScheme.safeParse(diffResult);
       if (!parseResult.success) {
@@ -17301,8 +17385,8 @@ var init_upFolders = __esm({
         return upMySqlHandlerV4toV5(b);
       }
       const a = mysqlSchemaV4.parse(prev);
-      const json1 = squashMysqlScheme(a);
-      const json2 = squashMysqlScheme(b);
+      const json1 = squashMysqlSchemeV4(a);
+      const json2 = squashMysqlSchemeV4(b);
       const diffResult = applyJsonDiff(json1, json2);
       const parseResult = diffResultScheme.safeParse(diffResult);
       if (!parseResult.success) {
@@ -17469,6 +17553,7 @@ var init_upFolders = __esm({
           date.setUTCHours(Number(it.substring(8, 10)));
           date.setUTCMinutes(Number(it.substring(10, 12)));
           date.setUTCSeconds(Number(it.substring(12, 14)));
+          date.setUTCMilliseconds(0);
           const path2 = (0, import_path.join)(out, it);
           const pathJson = (0, import_path.join)(out, it, "snapshot.json");
           const pathSQL = (0, import_path.join)(out, it, "migration.sql");
@@ -17523,7 +17608,6 @@ var init_upFolders = __esm({
 var import_fs4, import_path2, assertV1OutFolder, dryJournal, snapshotsPriorV4, prepareOutFolder2, mapValues, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
 var init_utils = __esm({
   "src/utils.ts"() {
-    "use strict";
     import_fs4 = require("fs");
     init_views();
     init_mysqlSchema();
@@ -25618,7 +25702,6 @@ __export(mysqlImports_exports, {
 var import_mysql_core, prepareFromMySqlImports;
 var init_mysqlImports = __esm({
   "src/serializer/mysqlImports.ts"() {
-    "use strict";
     import_mysql_core = require("drizzle-orm/mysql-core");
     prepareFromMySqlImports = (imports) => {
       const tables = [];
@@ -25670,7 +25753,6 @@ function clearDefaults(defaultValue, collate) {
 var import_mysql_core2, import_table, import_utils9, import_sql, import_common, import_date, dialect3, indexName, generateMySqlSnapshot, fromDatabase;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
-    "use strict";
     import_mysql_core2 = require("drizzle-orm/mysql-core");
     import_table = require("drizzle-orm/table");
     import_utils9 = require("drizzle-orm/mysql-core/utils");
@@ -25841,7 +25923,7 @@ var init_mysqlSerializer = __esm({
         const dataType = column6["DATA_TYPE"];
         const columnType = column6["COLUMN_TYPE"];
         const isPrimary = column6["COLUMN_KEY"] === "PRI";
-        const isAutoincrement = column6["EXTRA"] === "auto_increment" && isPrimary;
+        const isAutoincrement = column6["EXTRA"] === "auto_increment";
         const isDefaultAnExpression = column6["EXTRA"] === "DEFAULT_GENERATED";
         const columnDefault = column6["COLUMN_DEFAULT"];
         const collation = column6["CHARACTER_SET_NAME"];
@@ -26015,7 +26097,6 @@ __export(pgImports_exports, {
 var import_pg_core, prepareFromPgImports;
 var init_pgImports = __esm({
   "src/serializer/pgImports.ts"() {
-    "use strict";
     import_pg_core = require("drizzle-orm/pg-core");
     prepareFromPgImports = (imports) => {
       const tables = [];
@@ -26054,7 +26135,6 @@ __export(pgSerializer_exports, {
 var import_pg_core2, import_utils10, import_sql2, import_table2, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
-    "use strict";
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_utils10 = require("drizzle-orm/pg-core/utils");
     import_sql2 = require("drizzle-orm/sql");
@@ -26534,7 +26614,6 @@ __export(sqliteImports_exports, {
 var import_sqlite_core, prepareFromSqliteImports;
 var init_sqliteImports = __esm({
   "src/serializer/sqliteImports.ts"() {
-    "use strict";
     import_sqlite_core = require("drizzle-orm/sqlite-core");
     prepareFromSqliteImports = (imports) => {
       const tables = [];
@@ -26561,7 +26640,6 @@ __export(sqliteSerializer_exports, {
 var import_table3, import_sql3, import_sqlite_core2, import_utils11, dialect5, generateSqliteSnapshot;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
-    "use strict";
     import_table3 = require("drizzle-orm/table");
     import_sql3 = require("drizzle-orm/sql");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
@@ -26570,12 +26648,19 @@ var init_sqliteSerializer = __esm({
     generateSqliteSnapshot = (tables, enums) => {
       const result = {};
       for (const table4 of tables) {
-        const tableName = (0, import_table3.getTableName)(table4);
         const columnsObject = {};
         const indexesObject = {};
         const foreignKeysObject = {};
         const primaryKeysObject = {};
-        (0, import_utils11.getTableColumns)(table4).forEach((column6) => {
+        const {
+          name: tableName,
+          columns,
+          indexes,
+          foreignKeys: tableForeignKeys,
+          schema: schema4,
+          primaryKeys
+        } = (0, import_utils11.getTableConfig)(table4);
+        columns.forEach((column6) => {
           const notNull = column6.notNull;
           const primaryKey = column6.primary;
           const columnToSet = {
@@ -26583,7 +26668,7 @@ var init_sqliteSerializer = __esm({
             type: column6.getSQLType(),
             primaryKey,
             notNull,
-            autoincrement: column6.autoIncrement
+            autoincrement: column6 instanceof import_sqlite_core2.SQLiteBaseInteger ? column6.autoIncrement : void 0
           };
           if (column6.default !== void 0) {
             if (column6.default instanceof import_sql3.SQL) {
@@ -26602,7 +26687,7 @@ var init_sqliteSerializer = __esm({
           }
           columnsObject[column6.name] = columnToSet;
         });
-        const foreignKeys = (0, import_utils11.getTableForeignKeys)(table4).map((fk4) => {
+        const foreignKeys = tableForeignKeys.map((fk4) => {
           const name = fk4.getName();
           const tableFrom = tableName;
           const onDelete = fk4.onDelete;
@@ -26625,11 +26710,11 @@ var init_sqliteSerializer = __esm({
         foreignKeys.forEach((it) => {
           foreignKeysObject[it.name] = it;
         });
-        (0, import_utils11.getTableIndexes)(table4).forEach((value) => {
+        indexes.forEach((value) => {
           var _a;
-          const columns = value.config.columns;
+          const columns2 = value.config.columns;
           const name = value.config.name;
-          let indexColumns = columns.map((it) => {
+          let indexColumns = columns2.map((it) => {
             if (it instanceof import_sql3.SQL) {
               return dialect5.sqlToQuery(it).sql;
             } else {
@@ -26649,7 +26734,7 @@ var init_sqliteSerializer = __esm({
             where
           };
         });
-        (0, import_utils11.getTableCompositePrimaryKeys)(table4).forEach((it) => {
+        primaryKeys.forEach((it) => {
           primaryKeysObject[it.getName()] = {
             columns: it.columns.map((it2) => it2.name)
           };
@@ -26680,7 +26765,6 @@ var init_sqliteSerializer = __esm({
 var import_fs5, import_node, import_path3, import_glob, safeRegister, serializeMySql, serializePg, serializeSQLite, prepareFilenames;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
-    "use strict";
     import_fs5 = __toESM(require("fs"));
     import_node = __toESM(require_node2());
     import_path3 = __toESM(require("path"));
@@ -26746,7 +26830,6 @@ var init_serializer = __esm({
 var import_fs6, import_crypto2, prepareMySqlMigrationSnapshot, prepareSqliteMigrationSnapshot, preparePgMigrationSnapshot, preparePrevSnapshot;
 var init_migrationPreparator = __esm({
   "src/migrationPreparator.ts"() {
-    "use strict";
     import_fs6 = __toESM(require("fs"));
     import_crypto2 = require("crypto");
     init_serializer();
@@ -26816,7 +26899,6 @@ __export(migrate_exports, {
 var import_fs7, import_path4, import_hanji2, prepareAndMigratePg, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, writeResult, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
-    "use strict";
     import_fs7 = __toESM(require("fs"));
     init_migrationPreparator();
     init_snapshotsDiffer();
@@ -27099,7 +27181,7 @@ var init_migrate = __esm({
       result.deleted.push(...leftMissing);
       return result;
     };
-    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints) => {
+    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints, isIntrospect = false) => {
       console.log(schema(cur));
       if (sqlStatements.length === 0) {
         console.log("No schema changes, nothing to migrate \u{1F634}");
@@ -27117,7 +27199,14 @@ var init_migrate = __esm({
         JSON.stringify(toSave, null, 2)
       );
       const sqlDelimiter = breakpoints ? "--> statement-breakpoint\n" : "\n";
-      const sql = sqlStatements.join(sqlDelimiter);
+      let sql = sqlStatements.join(sqlDelimiter);
+      if (isIntrospect) {
+        sql = `-- Current sql file was generated after introspecting the database
+-- If you want to run this migration please uncomment this code before executing migraitons
+/*
+${sql}
+*/`;
+      }
       journal.entries.push({
         idx,
         version: cur.version,
@@ -27239,7 +27328,6 @@ var init_camelcase = __esm({
 // src/@types/utils.ts
 var init_utils2 = __esm({
   "src/@types/utils.ts"() {
-    "use strict";
     init_camelcase();
     String.prototype.trimChar = function(char) {
       let start = 0;
@@ -31643,7 +31731,6 @@ var require_lib3 = __commonJS({
 var pgImportsList, objToStatement2, timeConfig, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch, relations, schemaToTypeScript, isCyclic, isSelf, column4, dimensionsInArray, createTableColumns, createTableIndexes, createTablePKs, createTableFKs;
 var init_introspect = __esm({
   "src/introspect.ts"() {
-    "use strict";
     init_utils2();
     init_pgSerializer();
     pgImportsList = /* @__PURE__ */ new Set([
@@ -32083,7 +32170,7 @@ var init_introspect = __esm({
     createTableIndexes = (tableName, idxs) => {
       let statement = "";
       idxs.forEach((it) => {
-        let idxKey = it.name.startsWith(tableName) ? it.name.slice(tableName.length + 1) : it.name;
+        let idxKey = it.name.startsWith(tableName) && it.name !== tableName ? it.name.slice(tableName.length + 1) : it.name;
         idxKey = idxKey.endsWith("_index") ? idxKey.slice(0, -"_index".length) + "_idx" : idxKey;
         idxKey = idxKey.camelCase();
         const indexGeneratedName = indexName2(tableName, it.columns);
@@ -32144,7 +32231,6 @@ __export(pgIntrospect_exports, {
 var import_hanji4, import_pg, PgConfig1, PgConfig2, Conf, pgIntrospect;
 var init_pgIntrospect = __esm({
   "src/cli/commands/pgIntrospect.ts"() {
-    "use strict";
     import_hanji4 = __toESM(require_hanji());
     init_lib();
     init_views();
@@ -48560,7 +48646,6 @@ var require_promise2 = __commonJS({
 var mysqlImportsList, objToStatement22, timeConfig2, binaryConfig, importsPatch2, relations2, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTablePKs2, createTableFKs2;
 var init_mysql_introspect = __esm({
   "src/mysql-introspect.ts"() {
-    "use strict";
     init_utils2();
     init_mysqlSerializer();
     mysqlImportsList = /* @__PURE__ */ new Set([
@@ -48646,7 +48731,9 @@ var init_mysql_introspect = __esm({
             (idx) => idx.isUnique ? "uniqueIndex" : "index"
           );
           const fkImpots = Object.values(it.foreignKeys).map((it2) => "foreignKey");
-          const pkImports = Object.values(it.compositePrimaryKeys).map((it2) => "primaryKey");
+          const pkImports = Object.values(it.compositePrimaryKeys).map(
+            (it2) => "primaryKey"
+          );
           res.mysql.push(...idxImports);
           res.mysql.push(...fkImpots);
           res.mysql.push(...pkImports);
@@ -48750,13 +48837,13 @@ import { sql } from "drizzle-orm/sql"
       if (lowered.startsWith("int")) {
         let out = `${name.camelCase()}: int("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("tinyint")) {
         let out = `${name.camelCase()}: tinyint("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
@@ -48894,7 +48981,7 @@ import { sql } from "drizzle-orm/sql"
           params = { precision, scale };
         }
         let out = params ? `${name.camelCase()}: decimal("${name}", ${timeConfig2(params)})` : `${name.camelCase()}: decimal("${name}")`;
-        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
         out += defaultValue;
         return out;
       }
@@ -48966,7 +49053,7 @@ import { sql } from "drizzle-orm/sql"
     createTableIndexes2 = (tableName, idxs) => {
       let statement = "";
       idxs.forEach((it) => {
-        let idxKey = it.name.startsWith(tableName) ? it.name.slice(tableName.length + 1) : it.name;
+        let idxKey = it.name.startsWith(tableName) && it.name !== tableName ? it.name.slice(tableName.length + 1) : it.name;
         idxKey = idxKey.endsWith("_index") ? idxKey.slice(0, -"_index".length) + "_idx" : idxKey;
         idxKey = idxKey.camelCase();
         const indexGeneratedName = indexName(tableName, it.columns);
@@ -49027,7 +49114,6 @@ __export(mysqlIntrospect_exports, {
 var import_hanji5, import_promise, MySQLConfig1, MySQLConfig2, Conf2, mysqlIntrospect;
 var init_mysqlIntrospect = __esm({
   "src/cli/commands/mysqlIntrospect.ts"() {
-    "use strict";
     import_hanji5 = __toESM(require_hanji());
     init_lib();
     init_views();
@@ -49199,8 +49285,9 @@ var package_default = {
   scripts: {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/introspect-pg --schema ./dev/introspect-pg/schema.ts",
-    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/introspect-mysql --schema ./dev/introspect-mysql/schema.ts",
+    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
     "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --out ./dev/introspect-mysql --connectionString",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
@@ -49571,7 +49658,8 @@ var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Mi
       journal,
       _meta,
       res.data.out,
-      res.data.breakpoints
+      res.data.breakpoints,
+      true
     );
   } else {
     (0, import_hanji6.render)(
@@ -49622,7 +49710,8 @@ var introspectMySqlCommand = new Command("introspect:mysql").option("--out <out>
       journal,
       _meta,
       res.data.out,
-      res.data.breakpoints
+      res.data.breakpoints,
+      true
     );
   } else {
     (0, import_hanji6.render)(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.0-6323eb6",
+  "version": "0.17.0-7c10593",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -10,8 +10,9 @@
   "scripts": {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
     "migrate:old:mysql": "drizzle-kit generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/introspect-pg --schema ./dev/introspect-pg/schema.ts",
-    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/introspect-mysql --schema ./dev/introspect-mysql/schema.ts",
+    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "start:sqlite": "node -r esbuild-register ./src/cli/index.ts generate:sqlite --out ./dev/migrations-sqlite --schema ./dev/migrations-sqlite/schema.ts",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/migrations-mysql --schema ./dev/migrations-mysql/schema.ts",
     "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
     "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --out ./dev/introspect-mysql --connectionString",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",

package/readme.md

@@ -1,12 +1,15 @@
 ## Drizzle Kit
+
 DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like delitions and renames by prompting user input.\
-https://github.com/drizzle-team/drizzle-kit-mirror - is a mirror repository for issues.
+<https://github.com/drizzle-team/drizzle-kit-mirror> - is a mirror repository for issues.
 
 ### How it works
+
 `drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version(if there's one).\
  Based on the difference it will generate all needed SQL migrations and if there're any `automatically unresolvable` cases like `renames` it will prompt user for input.
 
 For schema file:
+
 ```typescript
 // ./src/db/schema.ts
 
@@ -26,17 +29,19 @@ export const authOtp = pgTable("auth_otp", {
   userId: integer("user_id").references(() => users.id),
 });
 ```
+
 It will generate:
+
 ```SQL
 CREATE TABLE IF NOT EXISTS auth_otp (
-	"id" SERIAL PRIMARY KEY,
-	"phone" character varying(256),
-	"user_id" INT
+ "id" SERIAL PRIMARY KEY,
+ "phone" character varying(256),
+ "user_id" INT
 );
 
 CREATE TABLE IF NOT EXISTS users (
-	"id" SERIAL PRIMARY KEY,
-	"full_name" character varying(256)
+ "id" SERIAL PRIMARY KEY,
+ "full_name" character varying(256)
 );
 
 DO $$ BEGIN
@@ -49,26 +54,69 @@ CREATE INDEX IF NOT EXISTS users_full_name_index ON users (full_name);
 ```
 
 ### Installation & configuration
+
 ```shell
-$ npm install -D drizzle-kit
+npm install -D drizzle-kit
 ```
 
 Running with CLI options
+
 ```shell
-$ npm exec drizzle-kit generate --out migrations-folder --dialect pg --schema src/db/schema.ts
+npm exec drizzle-kit generate --out migrations-folder --dialect pg --schema src/db/schema.ts
 ```
 
 Or put your file to `drizzle.config.json` configuration file:
+
 ```json
 {
   "out": "./migrations-folder",
   "schema": "./src/db"
 }
 ```
+
 ---
+
+## Upgrading to 0.17.0
+
+Before running any new migrations `drizzle-kit` will ask you to upgrade in a first place
+
+Migration file structure < 0.17.0
+
+```plaintext
+📦 <project root>
+ └ 📂 migrations
+    └ 📂 20221207174503
+       ├ 📜 migration.sql
+       ├ 📜 snapshot.json
+    └ 📂 20230101104503
+       ├ 📜 migration.sql
+       ├ 📜 snapshot.json
+```
+
+Migration file structure >= 0.17.0
+
+```plaintext
+📦 <project root>
+ └ 📂 migrations
+    └ 📂 meta
+      ├ 📜 _journal.json
+      ├ 📜 0000_snapshot.json
+      ├ 📜 0001_snapshot.json
+    └ 📜 0000_icy_stranger.sql
+    └ 📜 0001_strange_avengers.sql
+```
+
+To easily migrate from previous folder structure to new you need to run `up` command in drizzle kit. It's a great helper to upgrade your migrations to new format on each drizzle kit major update
+
+![](media/up_mysql.gif)
+---
+
 ## List of commands
 
 ### Generate SQL migrations based on current .ts schema\
+
+---
+
 **`$ drizzle-kit generate:pg`** \
 **`$ drizzle-kit generate:mysql`** \
 **`$ drizzle-kit generate:sqlite`** \
@@ -76,6 +124,7 @@ Or put your file to `drizzle.config.json` configuration file:
 `--config` [optional defalut=drizzle.config.json] config file path\
 `--schema` path to typescript schema file or folder with multiple schema files\
 `--out` [optional default=drizzle/] migrations folder
+
 ```shell
 $ drizzle-kit generate:pg 
 ## runs generate command with drizzle.config.json 
@@ -91,40 +140,65 @@ $ drizzle-kit generate:pg --schema=./src/schema.ts --out=./migrations/
 ```  
 
 ### Introspect existing database and generate typescript schema
-**`$ drizzle-kit introspect:pg`**
+
+---
+
+**`$ drizzle-kit introspect:pg`** \
+**`$ drizzle-kit introspect:mysql`**
+
 ```shell
 drizzle-kit introspect:pg --out=migrations/ --connectionString=postgresql://user:pass@host:port/db_name
 
 drizzle-kit introspect:pg --out=migrations/ --host=0.0.0.0 --port=5432 --user=postgres --password=pass --database=db_name --ssl
 ```
 
+![](media/introspect_mysql.gif)
+
 ### Update stale snapshots
+
+---
+
 **`$ drizzle-kit up:pg`** \
 **`$ drizzle-kit up:mysql`**\
 **`$ drizzle-kit up:sqlite`**
 
 `--out` [optional] migrations folder\
 `--config` [optional defalut=drizzle.config.json] config file path
+
 ```shell
 ## migrations folder is taken from drizzle.config.json
-drizzle-kit up:pg
+drizzle-kit up:mysql
 
-drizzle-kit up:pg --out=migrations/ 
+drizzle-kit up:mysql --out=migrations/ 
 ```
 
+![](media/up_mysql.gif)
+
+### Drop migration
+
+---
+
+**`$ drizzle-kit drop`** \
+
+`--out` [optional] migrations folder\
+`--config` [optional defalut=drizzle.config.json] config file path
+
+![](media/drop.gif)
+
 ### Migrations collisions check
+
+---
+
 **`$ drizzle-kit check:pg`**\
 **`$ drizzle-kit check:mysql`**\
 **`$ drizzle-kit check:sqlite`**
 
 `--out` [optional] migration folder\
 `--config` [optional defalut=drizzle.config.json] config file path
+
 ```shell
 ## migrations folder is taken from drizzle.config.json
 drizzle-kit check:pg
 
 drizzle-kit check:pg --out=migrations/ 
 ```
-
-
-

package/utils.js

@@ -1,4 +1,3 @@
-"use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -10358,6 +10357,13 @@ var compositePK = objectType({
   name: stringType(),
   columns: stringType().array()
 }).strict();
+var tableV4 = objectType({
+  name: stringType(),
+  schema: stringType().optional(),
+  columns: recordType(stringType(), column),
+  indexes: recordType(stringType(), index),
+  foreignKeys: recordType(stringType(), fk)
+}).strict();
 var table = objectType({
   name: stringType(),
   schema: stringType().optional(),
@@ -10379,7 +10385,7 @@ var schemaInternalV3 = objectType({
 var schemaInternalV4 = objectType({
   version: literalType("4"),
   dialect,
-  tables: recordType(stringType(), table),
+  tables: recordType(stringType(), tableV4),
   schemas: recordType(stringType(), stringType())
 }).strict();
 var schemaInternal = objectType({
@@ -10396,6 +10402,13 @@ var schemaInternal = objectType({
 var schemaV3 = schemaInternalV3.merge(schemaHash);
 var schemaV4 = schemaInternalV4.merge(schemaHash);
 var schema = schemaInternal.merge(schemaHash);
+var tableSquashedV4 = objectType({
+  name: stringType(),
+  schema: stringType().optional(),
+  columns: recordType(stringType(), column),
+  indexes: recordType(stringType(), stringType()),
+  foreignKeys: recordType(stringType(), stringType())
+}).strict();
 var tableSquashed = objectType({
   name: stringType(),
   schema: stringType().optional(),
@@ -10410,6 +10423,12 @@ var schemaSquashed = objectType({
   tables: recordType(stringType(), tableSquashed),
   schemas: recordType(stringType(), stringType())
 }).strict();
+var schemaSquashedV4 = objectType({
+  version: literalType("4"),
+  dialect,
+  tables: recordType(stringType(), tableSquashedV4),
+  schemas: recordType(stringType(), stringType())
+}).strict();
 var MySqlSquasher = {
   squashIdx: (idx) => {
     var _a, _b, _c;
@@ -10566,6 +10585,13 @@ var compositePK2 = objectType({
   name: stringType(),
   columns: stringType().array()
 }).strict();
+var tableV42 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), index2),
+  foreignKeys: recordType(stringType(), fk2)
+}).strict();
 var table2 = objectType({
   name: stringType(),
   schema: stringType(),
@@ -10587,7 +10613,7 @@ var pgSchemaInternalV3 = objectType({
 var pgSchemaInternalV4 = objectType({
   version: literalType("4"),
   dialect: literalType("pg"),
-  tables: recordType(stringType(), table2),
+  tables: recordType(stringType(), tableV42),
   enums: recordType(stringType(), enumSchema),
   schemas: recordType(stringType(), stringType())
 }).strict();
@@ -10611,6 +10637,20 @@ var tableSquashed2 = objectType({
   foreignKeys: recordType(stringType(), stringType()),
   compositePrimaryKeys: recordType(stringType(), stringType())
 }).strict();
+var tableSquashedV42 = objectType({
+  name: stringType(),
+  schema: stringType(),
+  columns: recordType(stringType(), column2),
+  indexes: recordType(stringType(), stringType()),
+  foreignKeys: recordType(stringType(), stringType())
+}).strict();
+var pgSchemaSquashedV4 = objectType({
+  version: literalType("4"),
+  dialect: enumType(["pg"]),
+  tables: recordType(stringType(), tableSquashedV42),
+  enums: recordType(stringType(), enumSchema),
+  schemas: recordType(stringType(), stringType())
+}).strict();
 var pgSchemaSquashed = objectType({
   version: literalType("5"),
   dialect: enumType(["pg"]),