drizzle-kit 0.16.9-19c6550 → 0.16.9-1f064f4

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "drizzle-kit",
-  "version": "0.16.9-19c6550",
+  "version": "0.16.9-1f064f4",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
-  "author": "Alex Blokh <aleksandrblokh@gmail.com>",
+  "author": "Drizzle Team",
   "license": "MIT",
   "bin": {
     "drizzle-kit": "./index.js"
   },
   "scripts": {
     "start:pg": "node -r esbuild-register ./src/cli/index.ts generate --out ./dev/migrations --dialect pg --schema ./dev/data",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/migrations --schema ./dev/migrations/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/migrations --connectionString mysql://root:password123@127.0.0.1:3306/mySchema",
+    "introspect:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql --out ./dev/migrations --connectionString ",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up --out ./dev/equedi --dialect pg",
     "check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
     "run": "node -r esbuild-register index.ts",
@@ -46,12 +47,14 @@
     "commander": "^9.4.1",
     "esbuild": "^0.15.18",
     "esbuild-register": "^3.4.2",
+    "glob": "^8.1.0",
     "hanji": "^0.0.5",
     "json-diff": "0.9.0",
     "zod": "^3.20.2"
   },
   "devDependencies": {
     "@types/dockerode": "^3.3.14",
+    "@types/glob": "^8.1.0",
     "@types/node": "^18.11.15",
     "@types/pg": "^8.6.5",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
@@ -59,7 +62,7 @@
     "ava": "^5.1.0",
     "dockerode": "^3.3.4",
     "drizzle-kit": "^0.16.8",
-    "drizzle-orm": "0.19.0-03308d4",
+    "drizzle-orm": "0.21.0-2e66963",
     "esbuild": "^0.15.7",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.29.0",

package/utils.js

@@ -10314,7 +10314,8 @@ var column = objectType({
   primaryKey: booleanType(),
   notNull: booleanType(),
   autoincrement: booleanType().optional(),
-  default: anyType().optional()
+  default: anyType().optional(),
+  onUpdate: anyType().optional()
 }).strict();
 var tableV3 = objectType({
   name: stringType(),
@@ -10994,6 +10995,32 @@ var alternationsInColumn = (column4) => {
       return { ...others, notNull: { type: "deleted", value: it.notNull__deleted } };
     }
     return it;
+  }).map((it) => {
+    if ("onUpdate" in it) {
+      return { ...it, onUpdate: { type: "changed", old: it.onUpdate.__old, new: it.onUpdate.__new } };
+    }
+    if ("onUpdate__added" in it) {
+      const { onUpdate__added, ...others } = it;
+      return { ...others, onUpdate: { type: "added", value: it.onUpdate__added } };
+    }
+    if ("onUpdate__deleted" in it) {
+      const { onUpdate__deleted, ...others } = it;
+      return { ...others, onUpdate: { type: "deleted", value: it.onUpdate__deleted } };
+    }
+    return it;
+  }).map((it) => {
+    if ("autoincrement" in it) {
+      return { ...it, autoincrement: { type: "changed", old: it.autoincrement.__old, new: it.autoincrement.__new } };
+    }
+    if ("autoincrement__added" in it) {
+      const { autoincrement__added, ...others } = it;
+      return { ...others, autoincrement: { type: "added", value: it.autoincrement__added } };
+    }
+    if ("autoincrement__deleted" in it) {
+      const { autoincrement__deleted, ...others } = it;
+      return { ...others, autoincrement: { type: "deleted", value: it.autoincrement__deleted } };
+    }
+    return it;
   });
   return result[0];
 };
@@ -11075,8 +11102,9 @@ var MySqlCreateTableConvertor = class extends Convertor {
       const primaryKeyStatement = column4.primaryKey ? "PRIMARY KEY" : "";
       const notNullStatement = column4.notNull ? "NOT NULL" : "";
       const defaultStatement = column4.default !== void 0 ? `DEFAULT ${column4.default}` : "";
+      const onUpdateStatement = column4.onUpdate ? `ON UPDATE CURRENT_TIMESTAMP` : "";
       const autoincrementStatement = column4.autoincrement ? "AUTO_INCREMENT" : "";
-      statement += "	" + `\`${column4.name}\` ${column4.type} ${autoincrementStatement} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
+      statement += "	" + `\`${column4.name}\` ${column4.type} ${autoincrementStatement} ${primaryKeyStatement} ${notNullStatement} ${defaultStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
       statement += (i === columns.length - 1 ? "" : ",") + "\n";
     }
     statement += `);`;
@@ -11360,6 +11388,82 @@ var PgAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
     return `ALTER TABLE ${tableName} ALTER COLUMN "${columnName}" DROP DEFAULT;`;
   }
 };
+var MySqlAlterTableAlterColumnSetDefaultConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "alter_table_alter_column_set_default" && dialect3 === "mysql";
+  }
+  convert(statement) {
+    const { tableName, columnName } = statement;
+    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` SET DEFAULT ${statement.newDefaultValue};`;
+  }
+};
+var MySqlAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "alter_table_alter_column_drop_default" && dialect3 === "mysql";
+  }
+  convert(statement) {
+    const { tableName, columnName } = statement;
+    return `ALTER TABLE ${tableName} ALTER COLUMN \`${columnName}\` DROP DEFAULT;`;
+  }
+};
+var MySqlModifyColumn = class extends Convertor {
+  can(statement, dialect3) {
+    return (statement.type === "alter_table_alter_column_set_type" || statement.type === "alter_table_alter_column_set_notnull" || statement.type === "alter_table_alter_column_drop_notnull" || statement.type === "alter_table_alter_column_drop_on_update" || statement.type === "alter_table_alter_column_set_on_update" || statement.type === "alter_table_alter_column_set_autoincrement" || statement.type === "alter_table_alter_column_drop_autoincrement") && dialect3 === "mysql";
+  }
+  convert(statement) {
+    const { tableName, columnName } = statement;
+    let columnType = ``;
+    let columnDefault = "";
+    let columnNotNull = "";
+    let columnOnUpdate = "";
+    let columnAutoincrement = "";
+    if (statement.type === "alter_table_alter_column_drop_notnull") {
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_set_notnull") {
+      columnNotNull = ` NOT NULL`;
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_drop_on_update") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnOnUpdate = "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_set_on_update") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = ` ON UPDATE CURRENT_TIMESTAMP`;
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_set_autoincrement") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnAutoincrement = "AUTO_INCREMENT";
+    } else if (statement.type === "alter_table_alter_column_drop_autoincrement") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnAutoincrement = "";
+    } else {
+      columnType = ` ${statement.newDataType}`;
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
+      columnAutoincrement = statement.columnAutoIncrement ? "AUTO_INCREMENT" : "";
+    }
+    columnDefault = columnDefault instanceof Date ? columnDefault.toISOString() : columnDefault;
+    return `ALTER TABLE ${tableName} MODIFY COLUMN \`${columnName}\`${columnType}${columnAutoincrement}${columnNotNull}${columnDefault}${columnOnUpdate};`;
+  }
+};
 var SqliteAlterTableAlterColumnDropDefaultConvertor = class extends Convertor {
   can(statement, dialect3) {
     return statement.type === "alter_table_alter_column_drop_default" && dialect3 === "sqlite";
@@ -11811,6 +11915,16 @@ var MysqlAlterTableRemoveFromSchemaConvertor = class extends Convertor {
 `;
   }
 };
+var MySqlDropIndexConvertor = class extends Convertor {
+  can(statement, dialect3) {
+    return statement.type === "drop_index" && dialect3 === "mysql";
+  }
+  convert(statement) {
+    const tableName = typeof statement.schema === "undefined" ? `\`${statement.tableName}\`` : `\`${statement.schema}\`.\`${statement.tableName}\``;
+    const { name } = MySqlSquasher.unsquashIdx(statement.data);
+    return `DROP INDEX ${name} ON ${tableName};`;
+  }
+};
 var convertors = [];
 convertors.push(new PgCreateTableConvertor());
 convertors.push(new MySqlCreateTableConvertor());
@@ -11835,11 +11949,15 @@ convertors.push(new CreateMySqlIndexConvertor());
 convertors.push(new CreateSqliteIndexConvertor());
 convertors.push(new PgDropIndexConvertor());
 convertors.push(new SqliteDropIndexConvertor());
+convertors.push(new MySqlDropIndexConvertor());
 convertors.push(new AlterTypeAddValueConvertor());
 convertors.push(new PgAlterTableAlterColumnSetNotNullConvertor());
 convertors.push(new PgAlterTableAlterColumnDropNotNullConvertor());
 convertors.push(new PgAlterTableAlterColumnSetDefaultConvertor());
 convertors.push(new PgAlterTableAlterColumnDropDefaultConvertor());
+convertors.push(new MySqlModifyColumn());
+convertors.push(new MySqlAlterTableAlterColumnSetDefaultConvertor());
+convertors.push(new MySqlAlterTableAlterColumnDropDefaultConvertor());
 convertors.push(new PgCreateForeignKeyConvertor());
 convertors.push(new MySqlCreateForeignKeyConvertor());
 convertors.push(new PgAlterForeignKeyConvertor());
@@ -11874,7 +11992,7 @@ var fromJson = (statements, dialect3) => {
     });
     const convertor = filtered.length === 1 ? filtered[0] : void 0;
     if (!convertor) {
-      console.log("no convertor:", statement.type);
+      console.log("no convertor:", statement.type, dialect3);
       return "dry run";
     }
     return convertor.convert(statement);
@@ -11998,10 +12116,10 @@ var prepareRenameColumns = (tableName, schema3, pairs) => {
     };
   });
 };
-var prepareAlterTableColumnsJson = (tableName, schema3, deleted, added, altered, addedFk, dialect3) => {
+var prepareAlterTableColumnsJson = (tableName, schema3, deleted, added, altered, addedFk, json2, dialect3) => {
   const addColumns = [];
   const dropColumns = _prepareDropColumns(tableName, schema3, deleted);
-  const alterColumns = _prepareAlterColumns(tableName, schema3, altered);
+  const alterColumns = _prepareAlterColumns(tableName, schema3, altered, json2);
   if (dialect3 === "sqlite") {
     let jsonCreateFKStatements = Object.values(addedFk);
     const sqliteAddColumns = _prepareSQLiteAddColumns(
@@ -12051,11 +12169,16 @@ var _prepareSQLiteAddColumns = (tableName, columns, referenceData) => {
     };
   });
 };
-var _prepareAlterColumns = (tableName, schema3, columns) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   let statements = [];
   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;
     if (typeof column4.name !== "string") {
       statements.push({
         type: "alter_table_rename_column",
@@ -12071,7 +12194,11 @@ var _prepareAlterColumns = (tableName, schema3, columns) => {
         tableName,
         columnName,
         newDataType: column4.type.new,
-        schema: schema3
+        schema: schema3,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
       });
     }
     if (((_b = column4.default) == null ? void 0 : _b.type) === "added") {
@@ -12105,7 +12232,12 @@ var _prepareAlterColumns = (tableName, schema3, columns) => {
         type: "alter_table_alter_column_set_notnull",
         tableName,
         columnName,
-        schema: schema3
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
       });
     }
     if (((_f = column4.notNull) == null ? void 0 : _f.type) === "changed") {
@@ -12114,7 +12246,12 @@ var _prepareAlterColumns = (tableName, schema3, columns) => {
         type,
         tableName,
         columnName,
-        schema: schema3
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
       });
     }
     if (((_g = column4.notNull) == null ? void 0 : _g.type) === "deleted") {
@@ -12122,7 +12259,78 @@ var _prepareAlterColumns = (tableName, schema3, columns) => {
         type: "alter_table_alter_column_drop_notnull",
         tableName,
         columnName,
-        schema: schema3
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
+      });
+    }
+    if (((_h = column4.autoincrement) == null ? void 0 : _h.type) === "added") {
+      statements.push({
+        type: "alter_table_alter_column_set_autoincrement",
+        tableName,
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
+      });
+    }
+    if (((_i = column4.autoincrement) == null ? void 0 : _i.type) === "changed") {
+      const type = column4.autoincrement.new ? "alter_table_alter_column_set_notnull" : "alter_table_alter_column_drop_notnull";
+      statements.push({
+        type,
+        tableName,
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
+      });
+    }
+    if (((_j = column4.autoincrement) == null ? void 0 : _j.type) === "deleted") {
+      statements.push({
+        type: "alter_table_alter_column_drop_autoincrement",
+        tableName,
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
+      });
+    }
+    if (((_k = column4.onUpdate) == null ? void 0 : _k.type) === "added") {
+      statements.push({
+        type: "alter_table_alter_column_set_on_update",
+        tableName,
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
+      });
+    }
+    if (((_l = column4.onUpdate) == null ? void 0 : _l.type) === "deleted") {
+      statements.push({
+        type: "alter_table_alter_column_drop_on_update",
+        tableName,
+        columnName,
+        schema: schema3,
+        newDataType: columnType,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement
       });
     }
   }
@@ -12283,13 +12491,16 @@ var columnSchema = objectType({
   unique: booleanType().optional(),
   default: anyType().optional(),
   notNull: booleanType().optional(),
-  autoincrement: booleanType().optional()
+  autoincrement: booleanType().optional(),
+  onUpdate: booleanType().optional()
 }).strict();
 var alteredColumnSchema = objectType({
   name: makeSelfOrChanged(stringType()),
   type: makeChanged(stringType()).optional(),
   default: makePatched(anyType()).optional(),
-  notNull: makePatched(booleanType()).optional()
+  notNull: makePatched(booleanType()).optional(),
+  onUpdate: makePatched(booleanType()).optional(),
+  autoincrement: makePatched(booleanType()).optional()
 }).strict();
 var enumSchema2 = objectType({
   name: stringType(),
@@ -12497,6 +12708,7 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
       it.added,
       it.altered,
       it.addedForeignKeys,
+      json2,
       dialect3
     );
   }).flat().reduce(
@@ -12591,8 +12803,14 @@ var applySnapshotsDiff = async (json1, json2, dialect3, schemasResolver, tablesR
   jsonStatements.push(...jsonRemoveTableFromSchemas);
   jsonStatements.push(...dropSchemas);
   const sqlStatements = fromJson(jsonStatements, dialect3);
+  const uniqueSqlStatements = [];
+  sqlStatements.forEach((ss) => {
+    if (!uniqueSqlStatements.includes(ss)) {
+      uniqueSqlStatements.push(ss);
+    }
+  });
   const _meta = prepareMigrationMeta(rSchemas, rTables, rColumns);
-  return { statements: jsonStatements, sqlStatements, _meta };
+  return { statements: jsonStatements, sqlStatements: uniqueSqlStatements, _meta };
 };
 
 // src/cli/commands/upFolders.ts