drizzle-kit 0.20.14-a183d8b → 0.20.14-c82ab68

package/utils.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;
 var init_views = __esm({
   "src/cli/views.ts"() {
+    "use strict";
     init_source();
     import_hanji = __toESM(require_hanji());
     info = (msg, greyMsg = "") => {
@@ -1087,11 +1089,15 @@ var init_views = __esm({
 });
 
 // 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]);
@@ -4242,9 +4248,10 @@ var init_lib = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, kitInternals, schemaInternal, schemaV3, schemaV4, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, mysqlSchema, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, kitInternals, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternalV5, schemaInternalV6, schemaInternal, schemaV3, schemaV4, schemaV5, schema, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, mysqlSchema, mysqlSchemaV5, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
+    "use strict";
     init_global();
     init_lib();
     index = objectType({
@@ -4303,6 +4310,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();
     dialect = literalType("mysql");
     schemaHash = objectType({
       id: stringType(),
@@ -4319,18 +4337,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,
       tables: recordType(stringType(), table),
@@ -4342,8 +4349,33 @@ var init_mysqlSchema = __esm({
       }),
       internal: kitInternals
     }).strict();
+    schemaInternalV6 = objectType({
+      version: literalType("6"),
+      dialect,
+      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,
+      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);
     schema = schemaInternal.merge(schemaHash);
     tableSquashedV4 = objectType({
       name: stringType(),
@@ -4430,11 +4462,8 @@ var init_mysqlSchema = __esm({
       }
     };
     mysqlSchema = schema;
-    backwardCompatibleMysqlSchema = unionType([
-      schemaV3,
-      schemaV4,
-      schema
-    ]);
+    mysqlSchemaV5 = schemaV5;
+    backwardCompatibleMysqlSchema = unionType([mysqlSchemaV5, schema]);
     dryMySql = mysqlSchema.parse({
       version: snapshotVersion,
       dialect: "mysql",
@@ -4452,9 +4481,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({
@@ -4574,6 +4604,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"),
@@ -4587,6 +4632,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"),
@@ -4599,23 +4657,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),
@@ -4651,7 +4694,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),
@@ -4659,14 +4702,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);
@@ -4682,7 +4720,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}`;
@@ -4759,7 +4797,7 @@ var init_pgSchema = __esm({
         })
       );
       return {
-        version: "5",
+        version: "6",
         dialect: json.dialect,
         tables: mappedTables,
         enums: json.enums,
@@ -4787,6 +4825,7 @@ var init_pgSchema = __esm({
 var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema2, tableSquashed3, schemaSquashed2, SQLiteSquasher, drySQLite, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
+    "use strict";
     init_global();
     init_lib();
     index3 = objectType({
@@ -4933,7 +4972,7 @@ var init_sqliteSchema = __esm({
       }
     };
     drySQLite = schema2.parse({
-      version: snapshotVersion,
+      version: "5",
       dialect: "sqlite",
       id: originUUID,
       prevId: "",
@@ -4944,11 +4983,7 @@ var init_sqliteSchema = __esm({
         columns: {}
       }
     });
-    backwardCompatibleSqliteSchema = unionType([
-      schemaV32,
-      schemaV42,
-      schema2
-    ]);
+    backwardCompatibleSqliteSchema = schema2;
   }
 });
 
@@ -4956,6 +4991,7 @@ var init_sqliteSchema = __esm({
 var glob;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
+    "use strict";
     glob = __toESM(require("glob"));
     init_source();
     init_views();
@@ -4965,6 +5001,7 @@ var init_serializer = __esm({
 // src/cli/validations/outputs.ts
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
+    "use strict";
     init_source();
   }
 });
@@ -4978,7 +5015,7 @@ __export(utils_exports, {
   kloudMeta: () => kloudMeta,
   prepareMigrationFolder: () => prepareMigrationFolder,
   prepareMigrationMeta: () => prepareMigrationMeta,
-  prepareOutFolder: () => prepareOutFolder2,
+  prepareOutFolder: () => prepareOutFolder,
   schemaRenameKey: () => schemaRenameKey,
   snapshotsPriorV4: () => snapshotsPriorV4,
   statementsForDiffs: () => statementsForDiffs,
@@ -6575,15 +6612,15 @@ init_pgSchema();
 init_sqliteSchema();
 var 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)
   };
 };
@@ -6685,7 +6722,8 @@ var prepareRenameColumns = (tableName, schema4, pairs) => {
 var prepareAlterTableColumnsJson = (tableName, schema4, deleted, added, altered, addedFk, json2, dialect3) => {
   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 (dialect3 === "sqlite") {
     let jsonCreateFKStatements = Object.values(addedFk);
     const sqliteAddColumns = _prepareSQLiteAddColumns(
@@ -6735,19 +6773,22 @@ var _prepareSQLiteAddColumns = (tableName, columns, referenceData) => {
     };
   });
 };
-var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
+var _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",
@@ -6794,13 +6835,14 @@ var _prepareAlterColumns = (tableName, schema4, columns, json2) => {
   }
   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",
@@ -7148,6 +7190,7 @@ var prepareAlterCompositePrimaryKeyMySql = (tableName, pks, json1, json2) => {
 // src/snapshotsDiffer.ts
 init_sqliteSchema();
 init_mysqlSchema();
+init_global();
 var makeChanged = (schema4) => {
   return objectType({
     type: enumType(["changed"]),
@@ -7186,7 +7229,7 @@ var makeSelfOrPatched = (schema4) => {
   return unionType([
     objectType({
       type: literalType("none"),
-      value: schema4.optional()
+      value: schema4
     }),
     objectType({
       type: literalType("added"),
@@ -7310,7 +7353,6 @@ var diffResultScheme = objectType({
 }).strict();
 var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesResolver, columnsResolver, prevFull, curFull) => {
   var _a, _b;
-  let diffResult;
   if (dialect3 === "mysql") {
     for (const tableName in json1.tables) {
       const table4 = json1.tables[tableName];
@@ -7338,13 +7380,26 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         }
       }
     }
-    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,
@@ -7496,7 +7551,7 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         prevFull,
         curFull
       );
-    } else {
+    } else if (dialect3 === "mysql") {
       addedCompositePKs = prepareAddCompositePrimaryKeyMySql(
         it.name,
         it.addedCompositePKs,
@@ -7514,6 +7569,8 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
         prevFull,
         curFull
       );
+    } else {
+      assertUnreachable(dialect3);
     }
     let addedUniqueConstraints = [];
     let deletedUniqueConstraints = [];
@@ -7704,11 +7761,13 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
       return preparePgCreateTableJson(it, curFull);
     });
     jsonStatements.push(...jsonPgCreateTables);
-  } else {
+  } else if (dialect3 === "mysql") {
     const jsonMySqlCreateTables = created.map((it) => {
       return prepareMySqlCreateTableJson(it, curFull);
     });
     jsonStatements.push(...jsonMySqlCreateTables);
+  } else {
+    assertUnreachable(dialect3);
   }
   jsonStatements.push(...jsonDropTables);
   jsonStatements.push(...jsonRenameTables);
@@ -7867,7 +7926,7 @@ var resolveColumns = (missingColumns, newColumns, predicate) => {
 };
 
 // src/utils.ts
-var assertV1OutFolder = (out, dialect3) => {
+var assertV1OutFolder = (out) => {
   if (!(0, import_fs.existsSync)(out))
     return;
   const oldMigrationFolders = (0, import_fs.readdirSync)(out).filter(
@@ -7876,7 +7935,7 @@ var assertV1OutFolder = (out, dialect3) => {
   if (oldMigrationFolders.length > 0) {
     console.log(
       `Your migrations folder format is outdated, please run ${source_default.green.bold(
-        `drizzle-kit up:${dialect3}`
+        `drizzle-kit up`
       )}`
     );
     process.exit(1);
@@ -7900,7 +7959,7 @@ var snapshotsPriorV4 = (out) => {
     return pathJson;
   });
 };
-var prepareOutFolder2 = (out, dialect3) => {
+var prepareOutFolder = (out, dialect3) => {
   const meta = (0, import_path.join)(out, "meta");
   const journalPath = (0, import_path.join)(meta, "_journal.json");
   if (!(0, import_fs.existsSync)((0, import_path.join)(out, "meta"))) {
@@ -7915,9 +7974,9 @@ var prepareOutFolder2 = (out, dialect3) => {
 var validatorForDialect = (dialect3) => {
   switch (dialect3) {
     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 };
   }
@@ -7965,13 +8024,13 @@ var validateWithReport = (snapshots, dialect3) => {
   return result;
 };
 var prepareMigrationFolder = (outFolder = "drizzle", dialect3) => {
-  const { snapshots, journal } = prepareOutFolder2(outFolder, dialect3);
+  const { snapshots, journal } = prepareOutFolder(outFolder, dialect3);
   const report = validateWithReport(snapshots, dialect3);
   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:${dialect3}`)}`).join("\n")
+      }).concat(`Run ${source_default.green.bold(`drizzle-kit up`)}`).join("\n")
     );
     process.exit(0);
   }
@@ -8104,7 +8163,9 @@ var statementsForDiffs = async (in1, in2) => {
     "pg",
     schemasResolver,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    left,
+    right
   );
   return { ...result, left, right };
 };