drizzle-kit 0.16.9-96a79eb → 0.16.9-a7718d6

package/index.js

@@ -6255,7 +6255,7 @@ var init_global = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashed, schemaSquashed, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashed, schemaSquashed, MySqlSquasher, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
     init_global();
@@ -6408,13 +6408,14 @@ var init_mysqlSchema = __esm({
         })
       );
       return {
-        version: json.version,
+        version: "5",
         dialect: json.dialect,
         tables: mappedTables,
         schemas: json.schemas
       };
     };
     mysqlSchema = schema2;
+    mysqlSchemaV4 = schemaV4;
     mysqlSchemaV3 = schemaV3;
     backwardCompatibleMysqlSchema = unionType([schemaV3, schemaV4, schema2]);
     dryMySql = mysqlSchema.parse({
@@ -6671,7 +6672,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK, column3, tableV33, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, latestVersion, schemaInternal2, schemaV32, schemaV42, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV3, sqliteSchema, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK, 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"() {
     init_global();
@@ -6852,6 +6853,7 @@ var init_sqliteSchema = __esm({
       }
     });
     sqliteSchemaV3 = schemaV32;
+    sqliteSchemaV4 = schemaV42;
     sqliteSchema = schema3;
     backwardCompatibleSqliteSchema = unionType([schemaV32, schemaV42, schema3]);
   }
@@ -6930,7 +6932,7 @@ var init_utils = __esm({
         case "sqlite":
           return { validator: backwardCompatibleSqliteSchema, version: 4 };
         case "mysql":
-          return { validator: backwardCompatibleMysqlSchema, version: 4 };
+          return { validator: backwardCompatibleMysqlSchema, version: 5 };
       }
     };
     validateWithReport = (snapshots, dialect6) => {
@@ -12659,7 +12661,6 @@ function clearDefaults(defaultValue, collate) {
   if (typeof collate === "undefined" || collate === null) {
     collate = `utf8mb4`;
   }
-  ;
   let resultDefault = defaultValue;
   collate = `_${collate}`;
   if (defaultValue.startsWith(collate)) {
@@ -12779,7 +12780,17 @@ var init_mysqlSerializer = __esm({
       const schemas = Object.fromEntries(
         mysqlSchemas.map((it) => [it.schemaName, it.schemaName])
       );
-      return { version: "4", dialect: "mysql", tables: result, schemas };
+      return {
+        version: "5",
+        dialect: "mysql",
+        tables: result,
+        schemas,
+        _meta: {
+          schemas: {},
+          tables: {},
+          columns: {}
+        }
+      };
     };
     fromDatabase = async (db, schema4, progressCallback) => {
       const result = {};
@@ -12913,10 +12924,15 @@ var init_mysqlSerializer = __esm({
       progressCallback("enums", 0, "done");
       const schemasObject = Object.fromEntries([...schemas].map((it) => [it, it]));
       return {
-        version: "4",
+        version: "5",
         dialect: "mysql",
         tables: result,
-        schemas: schemasObject
+        schemas: schemasObject,
+        _meta: {
+          schemas: {},
+          tables: {},
+          columns: {}
+        }
       };
     };
   }
@@ -13459,7 +13475,9 @@ var init_sqliteSerializer = __esm({
           };
         });
         (0, import_utils7.getTableCompositePrimaryKeys)(table4).forEach((it) => {
-          primaryKeysObject[it.getName()] = { columns: it.columns.map((it2) => it2.name) };
+          primaryKeysObject[it.getName()] = {
+            columns: it.columns.map((it2) => it2.name)
+          };
         });
         result[tableName] = {
           name: tableName,
@@ -13469,7 +13487,16 @@ var init_sqliteSerializer = __esm({
           compositePrimaryKeys: primaryKeysObject
         };
       }
-      return { version: "4", dialect: "sqlite", tables: result, enums: {} };
+      return {
+        version: "5",
+        dialect: "sqlite",
+        tables: result,
+        enums: {},
+        _meta: {
+          tables: {},
+          columns: {}
+        }
+      };
     };
   }
 });
@@ -21156,7 +21183,7 @@ var init_snapshotsDiffer = __esm({
       return unionType([
         objectType({
           type: literalType("none"),
-          value: schema4
+          value: schema4.optional()
         }),
         objectType({
           type: literalType("added"),
@@ -22832,10 +22859,10 @@ __export(migrate_exports, {
   prepareAndMigratePg: () => prepareAndMigratePg,
   prepareAndMigrateSqlite: () => prepareAndMigrateSqlite,
   prepareSQL: () => prepareSQL,
-  prepareSnapshotFolderName: () => prepareSnapshotFolderName2,
+  prepareSnapshotFolderName: () => prepareSnapshotFolderName,
   writeResult: () => writeResult
 });
-var import_fs4, import_path3, import_hanji2, prepareAndMigratePg, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, writeResult, prepareSnapshotFolderName2, two;
+var import_fs4, import_path3, import_hanji2, prepareAndMigratePg, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, writeResult, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
     import_fs4 = __toESM(require("fs"));
@@ -22885,7 +22912,7 @@ var init_migrate = __esm({
         const { sql, _meta } = await prepareSQL(
           squashedPrev,
           squashedCur,
-          "sqlite"
+          "mysql"
         );
         writeResult(cur, sql, snapshots.length, journal, _meta, outFolder);
       } catch (e) {
@@ -23118,7 +23145,7 @@ var init_migrate = __esm({
         )} \u{1F680}`
       );
     };
-    prepareSnapshotFolderName2 = () => {
+    prepareSnapshotFolderName = () => {
       const now = new Date();
       return `${now.getFullYear()}${two(now.getUTCMonth() + 1)}${two(
         now.getUTCDate()
@@ -44790,7 +44817,7 @@ var assertPackages = (...pkgs) => {
   }
 };
 var requiredApiVersion = 2;
-var assertPgVersion = () => {
+var assertOrmCoreVersion = () => {
   const { compatibilityVersion } = require("drizzle-orm/version");
   if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
     return;
@@ -44805,7 +44832,7 @@ var assertPgVersion = () => {
   }
   process.exit(1);
 };
-var pgVersions = () => {
+var ormCoreVersions = () => {
   try {
     const { compatibilityVersion, npmVersion } = require("drizzle-orm/version");
     return { compatibilityVersion, npmVersion };
@@ -44876,6 +44903,7 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^5.1.0",
     dockerode: "^3.3.4",
+    "drizzle-kit": "^0.16.8",
     "drizzle-orm": "0.17.6",
     esbuild: "^0.15.7",
     "esbuild-register": "^3.3.3",
@@ -45116,7 +45144,7 @@ var updateToLatest = (json) => {
     const v4 = updateV3toV4(v3);
     return v4;
   }
-  return sqliteSchema.parse(json);
+  return sqliteSchemaV4.parse(json);
 };
 var updateV3toV4 = (old) => {
   const mappedTables = Object.fromEntries(
@@ -45139,6 +45167,8 @@ var import_path5 = __toESM(require("path"));
 init_mysqlSchema();
 init_utils();
 var upMysqlHandler = (out) => {
+};
+var upMysqlHandlerV4 = (out) => {
   const { snapshots } = prepareOutFolder(out, "mysql");
   const report = validateWithReport(snapshots, "mysql");
   report.nonLatest.map((it) => ({
@@ -45146,7 +45176,7 @@ var upMysqlHandler = (out) => {
     raw: report.rawMap[it]
   })).forEach((it) => {
     const folder = it.folder;
-    const result = updateToLatest2(it.raw);
+    const result = updateToLatestV4(it.raw);
     console.log(
       `[${source_default.green("\u2713")}] ${import_path5.default.join(out, folder, "snapshot.json")}`
     );
@@ -45157,14 +45187,14 @@ var upMysqlHandler = (out) => {
   });
   console.log("Everything's fine \u{1F436}\u{1F525}");
 };
-var updateToLatest2 = (json) => {
+var updateToLatestV4 = (json) => {
   const version = Number(json["version"]);
   if (version === 3) {
     const v3 = mysqlSchemaV3.parse(json);
     const v4 = updateV3toV42(v3);
     return v4;
   }
-  return mysqlSchema.parse(json);
+  return mysqlSchemaV4.parse(json);
 };
 var updateV3toV42 = (old) => {
   return {
@@ -45178,6 +45208,7 @@ var updateV3toV42 = (old) => {
 var import_fs8 = require("fs");
 var import_path6 = require("path");
 init_jsonDiffer();
+init_mysqlSchema();
 init_snapshotsDiffer();
 init_utils();
 init_words();
@@ -45232,12 +45263,16 @@ var tablesResolver = (missingTables, newTables, sql) => {
       const created = newTables[index4];
       index4 += 1;
       const possibleRenames = leftMissing.map((it) => {
-        const schemaPrefix = created.schema ? `"${created.schema}".` : "";
-        return {
+        const pgSchemaPrefix = created.schema ? `"${created.schema}".` : "";
+        const mysqlSchemaPrefix = created.schema ? `\`${created.schema}\`.` : "";
+        return [{
           value: it,
-          sql: `ALTER TABLE ${schemaPrefix}"${it.name}" RENAME TO ${schemaPrefix}"${created.name}"`
-        };
-      });
+          sql: `ALTER TABLE ${pgSchemaPrefix}"${it.name}" RENAME TO ${pgSchemaPrefix}"${created.name}"`
+        }, {
+          value: it,
+          sql: `RENAME TABLE ${mysqlSchemaPrefix}\`${it.name}\` TO ${mysqlSchemaPrefix}\`${created.name}\`;`
+        }];
+      }).flat();
       const renames = possibleRenames.filter((it) => {
         return sql.includes(it.sql);
       });
@@ -45271,11 +45306,14 @@ var columnsResolver = (tableName, missingColumns, newColumns, sql) => {
       const created = newColumns[index4];
       index4 += 1;
       const possibleRenames = leftMissing.map((it) => {
-        return {
+        return [{
           value: it,
           sql: `ALTER TABLE ${tableName} RENAME COLUMN "${it.name}" TO "${created.name}"`
-        };
-      });
+        }, {
+          value: it,
+          sql: `ALTER TABLE ${tableName} RENAME COLUMN \`${it.name}\` TO \`${created.name}\``
+        }];
+      }).flat();
       const renames = possibleRenames.filter((it) => {
         return sql.includes(it.sql);
       });
@@ -45297,7 +45335,16 @@ var columnsResolver = (tableName, missingColumns, newColumns, sql) => {
     throw e;
   }
 };
-var fullfill = (prev, cur, sql) => {
+var fullfill = (prev, cur, sql, dialect6) => {
+  if (dialect6 === "pg") {
+    return fullfillpg(prev, cur, sql);
+  }
+  if (dialect6 === "mysql") {
+    return fullfillmysql(prev, cur, sql);
+  }
+  throw new Error("");
+};
+var fullfillpg = (prev, cur, sql) => {
   const b = pgSchemaV4.parse(cur);
   if (!prev) {
     return {
@@ -45343,7 +45390,10 @@ var fullfill = (prev, cur, sql) => {
   const allAltered = typedResult.alteredTablesWithColumns.concat(
     renamedWithAlternations
   );
-  const rSchemas = renamedSchemas.map((it) => ({ from: it.from.name, to: it.to.name }));
+  const rSchemas = renamedSchemas.map((it) => ({
+    from: it.from.name,
+    to: it.to.name
+  }));
   const rTables = renamed.map((it) => {
     return { from: it.from, to: it.to };
   });
@@ -45382,6 +45432,91 @@ var fullfill = (prev, cur, sql) => {
     _meta
   };
 };
+var fullfillmysql = (prev, cur, sql) => {
+  const b = mysqlSchemaV4.parse(cur);
+  if (!prev) {
+    return {
+      version: "5",
+      dialect: b.dialect,
+      id: b.id,
+      prevId: b.prevId,
+      tables: b.tables,
+      schemas: b.schemas,
+      _meta: {
+        schemas: {},
+        tables: {},
+        columns: {}
+      }
+    };
+  }
+  const a = mysqlSchemaV4.parse(prev);
+  const json1 = squashMysqlScheme(a);
+  const json2 = squashMysqlScheme(b);
+  const diffResult = applyJsonDiff(json1, json2);
+  const parseResult = diffResultScheme.safeParse(diffResult);
+  if (!parseResult.success) {
+    parseResult.error.errors.forEach((it) => {
+      console.error(it);
+    });
+    throw new Error();
+  }
+  const typedResult = parseResult.data;
+  const { renamed: renamedSchemas } = schemasResolver(
+    typedResult.deletedSchemas.map((it) => ({ name: it })),
+    typedResult.addedSchemas.map((it) => ({ name: it })),
+    sql
+  );
+  const { renamed } = tablesResolver(
+    typedResult.deletedTables,
+    typedResult.addedTables,
+    sql
+  );
+  const renamedWithAlternations = Object.values(
+    alteredTableScheme.array().parse(diffForRenamedTables(renamed))
+  );
+  const allAltered = typedResult.alteredTablesWithColumns.concat(
+    renamedWithAlternations
+  );
+  const rSchemas = renamedSchemas.map((it) => ({
+    from: it.from.name,
+    to: it.to.name
+  }));
+  const rTables = renamed.map((it) => {
+    return { from: it.from, to: it.to };
+  });
+  const rColumns = allAltered.map((table4) => {
+    const name = table4.name;
+    const result = columnsResolver(name, table4.deleted, table4.added, sql);
+    const tableName = table4.name;
+    const schema4 = typeof table4.schema === "string" ? table4.schema : "";
+    return result.renamed.map((it) => {
+      return {
+        from: { schema: schema4, table: tableName, column: it.from.name },
+        to: { schema: schema4, table: tableName, column: it.to.name }
+      };
+    });
+  }).flat();
+  const _meta = prepareMigrationMeta(rSchemas, rTables, rColumns);
+  const bpatched = {
+    version: "5",
+    dialect: b.dialect,
+    id: b.id,
+    prevId: b.prevId,
+    tables: b.tables,
+    schemas: b.schemas,
+    _meta
+  };
+  mysqlSchema.parse(bpatched);
+  return {
+    version: "5",
+    dialect: b.dialect,
+    id: b.id,
+    prevId: b.prevId,
+    tables: b.tables,
+    schemas: b.schemas,
+    _meta
+  };
+};
 var upgradeFolders = (dialect6, out) => {
   const oldMigrationFolders = (0, import_fs8.readdirSync)(out).filter(
     (it) => it.length === 14 && /^\d+$/.test(it)
@@ -45391,7 +45526,7 @@ var upgradeFolders = (dialect6, out) => {
     (res2, it) => {
       const date = new Date();
       date.setUTCFullYear(Number(it.substring(0, 4)));
-      date.setUTCMonth(Number(it.substring(4, 6)));
+      date.setUTCMonth(Number(it.substring(4, 6)) - 1);
       date.setUTCDate(Number(it.substring(6, 8)));
       date.setUTCHours(Number(it.substring(8, 10)));
       date.setUTCMinutes(Number(it.substring(10, 12)));
@@ -45429,7 +45564,7 @@ var upgradeFolders = (dialect6, out) => {
       when: +it.date,
       tag
     });
-    const patchedJSON = fullfill(prev, it.json, it.sql);
+    const patchedJSON = fullfill(prev, it.json, it.sql, dialect6);
     (0, import_fs8.writeFileSync)(
       (0, import_path6.join)(`${out}`, "meta", `${prefix}_snapshot.json`),
       JSON.stringify(patchedJSON)
@@ -45461,7 +45596,7 @@ var assertEitherConfigOrOut = (config, out) => {
   return drizzleConfig.out;
 };
 var versions = () => {
-  const { npmVersion } = pgVersions();
+  const { npmVersion } = ormCoreVersions();
   const ormVersion = npmVersion ? `
 drizzle-orm: v${npmVersion}` : "";
   const versions2 = `drizzle-kit: v${package_default.version}${ormVersion}`;
@@ -45594,6 +45729,9 @@ var upMysqlCommand = new Command("up:mysql").option("--out <out>", `Output folde
     console.log(error(`'out' folder param must be set`));
     process.exit(0);
   }
+  assertPackages("drizzle-orm");
+  upMysqlHandlerV4(out);
+  upgradeFolders("mysql", out);
   upMysqlHandler(out);
 });
 var upSqliteCommand = new Command("up:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
@@ -45612,7 +45750,7 @@ var pt1 = objectType({
 var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Migrations folder`).option("--connectionString <connectionString>", "Postgres connection string").option("--host <host>", "Postgres host").option("--port <port>", "Postgres port").option("--user <user>", "Postgres user").option("--password <password>", "Postgres password").option("--database <database>", "Postgres database name").option("--ssl <ssl>", "Postgres ssl").action(async (options) => {
   printVersions();
   assertPackages("drizzle-orm");
-  assertPgVersion();
+  assertOrmCoreVersion();
   const { pgIntrospect: pgIntrospect2, PgConfig2: PgConfig22, PgConfig1: PgConfig12 } = (init_pgIntrospect(), __toCommonJS(pgIntrospect_exports));
   const pgIntrospectConfig = unionType([
     pt1.extend(PgConfig22.shape),
@@ -45654,7 +45792,7 @@ var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Mi
 var introspectMySqlCommand = new Command("introspect:mysql").option("--out <out>", `Migrations folder`).option("--connectionString <connectionString>", "MySQL connection string").option("--host <host>", "MySQL host").option("--port <port>", "MySQL port").option("--user <user>", "MySQL user").option("--password <password>", "MySQL password").option("--database <database>", "MySQL database name").action(async (options) => {
   printVersions();
   assertPackages("drizzle-orm");
-  assertPgVersion();
+  assertOrmCoreVersion();
   const { mysqlIntrospect: mysqlIntrospect2, MySQLConfig1: MySQLConfig12, MySQLConfig2: MySQLConfig22 } = (init_mysqlIntrospect(), __toCommonJS(mysqlIntrospect_exports));
   const mysqlIntrospectConfig = unionType([
     pt1.extend(MySQLConfig22.shape),
@@ -45665,29 +45803,18 @@ var introspectMySqlCommand = new Command("introspect:mysql").option("--out <out>
     console.log("Missing required params");
     return;
   }
-  const migrationFolders = prepareOutFolders(res.data.out);
-  const folderName = prepareSnapshotFolderName();
-  const migrationFolderPath = `./${res.data.out}/${folderName}`;
+  const { snapshots, journal } = prepareOutFolder(res.data.out, "mysql");
   const { schema: schema4, ts } = await mysqlIntrospect2(res.data);
   const schemaFile = import_path7.default.join(res.data.out, "schema.ts");
   (0, import_fs9.writeFileSync)(schemaFile, ts);
   console.log();
-  if (migrationFolders.length === 0) {
-    import_fs9.default.mkdirSync(migrationFolderPath);
-    const snapshotFile = import_path7.default.join(migrationFolderPath, "snapshot.json");
-    (0, import_fs9.writeFileSync)(snapshotFile, JSON.stringify(schema4));
-    const sql = await prepareSQL(
+  if (snapshots.length === 0) {
+    const { sql, _meta } = await prepareSQL(
       squashMysqlScheme(dryMySql),
       squashMysqlScheme(schema4),
       "mysql"
     );
-    const sqlFile = import_path7.default.join(migrationFolderPath, "migration.sql");
-    (0, import_fs9.writeFileSync)(sqlFile, sql.sql);
-    (0, import_hanji5.render)(
-      `[${source_default.green(
-        "\u2713"
-      )}] Your SQL migration file \u279C ${source_default.bold.underline.blue(sqlFile)} \u{1F680}`
-    );
+    writeResult(schema4, sql, 0, journal, _meta, res.data.out);
   } else {
     (0, import_hanji5.render)(
       `[${source_default.blue(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.16.9-96a79eb",
+  "version": "0.16.9-a7718d6",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
@@ -56,6 +56,7 @@
     "@typescript-eslint/parser": "^5.46.1",
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
+    "drizzle-kit": "^0.16.8",
     "drizzle-orm": "0.17.6",
     "esbuild": "^0.15.7",
     "esbuild-register": "^3.3.3",