drizzle-kit 0.17.0-6323eb6 → 0.17.0-c637bb8

package/index.js

@@ -6345,7 +6345,7 @@ var init_global = __esm({
 });
 
 // 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";
@@ -6388,6 +6388,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 +6416,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 +6433,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 +6454,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 +6511,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,7 +6592,7 @@ 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";
@@ -6639,6 +6687,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 +6715,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 +6739,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 +6816,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) => {
@@ -16712,7 +16810,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",
@@ -16972,7 +17070,7 @@ var init_mysqlUp = __esm({
             autoincrement: newAutoIncrement
           };
         }
-        mappedTables[key] = { ...table4, columns: mappedColumns };
+        mappedTables[key] = { ...table4, columns: mappedColumns, compositePrimaryKeys: {} };
       }
       return {
         version: "5",
@@ -17229,8 +17327,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 +17399,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) {
@@ -49199,8 +49297,8 @@ 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: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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.0-6323eb6",
+  "version": "0.17.0-c637bb8",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -10,8 +10,8 @@
   "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: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/utils.js

@@ -10358,6 +10358,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 +10386,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 +10403,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 +10424,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 +10586,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 +10614,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 +10638,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"]),