drizzle-kit 0.17.0-7c10593 → 0.17.0-bbbcd6a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.0-7c10593",
+  "version": "0.17.0-bbbcd6a",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -9,12 +9,13 @@
   },
   "scripts": {
     "migrate:old": "drizzle-kit generate:pg --out ./dev/migrations-pg --schema ./dev/migrations-pg/schema.ts",
+    "push": "node -r esbuild-register ./src/cli/index.ts push:mysql",
     "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/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",
+    "start:mysql": "node -r esbuild-register ./src/cli/index.ts generate:mysql --out ./dev/introspect-mysql --schema ./dev/introspect-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:mysql": "node -r esbuild-register ./src/cli/index.ts introspect:mysql",
     "introspect:pg": "node -r esbuild-register ./src/cli/index.ts introspect:pg --out ./dev/introspect-pg --connectionString=postgresql://postgres@localhost:5432/introspect",
     "up:pg": "node -r esbuild-register ./src/cli/index.ts up:pg --out ./dev/migrations-pg",
     "up:mysql": "node -r esbuild-register ./src/cli/index.ts up:mysql --out ./dev/migrations-mysql",

package/readme.md

@@ -62,7 +62,7 @@ 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:pg --out migrations-folder --schema src/db/schema.ts
 ```
 
 Or put your file to `drizzle.config.json` configuration file:

package/utils.js

@@ -11231,7 +11231,9 @@ var MySqlCreateTableConvertor = class extends Convertor {
 `;
     if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
       const compositePK4 = MySqlSquasher.unsquashPK(compositePKs[0]);
-      statement += `ALTER TABLE ${tName} ADD PRIMARY KEY(\`${compositePK4.columns.join("`,`")}\`);`;
+      statement += `ALTER TABLE ${tName} ADD PRIMARY KEY(\`${compositePK4.columns.join(
+        "`,`"
+      )}\`);`;
       statement += `
 `;
     }
@@ -11325,7 +11327,7 @@ var DropTableConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName } = statement;
-    return `DROP TABLE ${tableName};`;
+    return `DROP TABLE \`${tableName}\`;`;
   }
 };
 var PgRenameTableConvertor = class extends Convertor {
@@ -11433,12 +11435,13 @@ var MySqlAlterTableAddColumnConvertor = class extends Convertor {
   }
   convert(statement) {
     const { tableName, column: column4 } = statement;
-    const { name, type, notNull, primaryKey, autoincrement } = column4;
-    const defaultStatement = `${column4.default !== void 0 ? `DEFAULT ${column4.default}` : ""}`;
-    const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
-    const primaryKeyStatement = `${primaryKey ? "PRIMARY KEY" : ""}`;
-    const autoincrementStatement = `${autoincrement ? "AUTO_INCREMENT" : ""}`;
-    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type} ${primaryKeyStatement} ${autoincrementStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
+    const { name, type, notNull, primaryKey, autoincrement, onUpdate } = column4;
+    const defaultStatement = `${column4.default !== void 0 ? ` DEFAULT ${column4.default}` : ""}`;
+    const notNullStatement = `${notNull ? " NOT NULL" : ""}`;
+    const primaryKeyStatement = `${primaryKey ? " PRIMARY KEY" : ""}`;
+    const autoincrementStatement = `${autoincrement ? " AUTO_INCREMENT" : ""}`;
+    const onUpdateStatement = `${onUpdate ? " ON UPDATE CURRENT_TIMESTAMP" : ""}`;
+    return `ALTER TABLE ${tableName} ADD \`${name}\` ${type}${primaryKeyStatement}${autoincrementStatement}${defaultStatement}${notNullStatement}${onUpdateStatement};`;
   }
 };
 var SQLiteAlterTableAddColumnConvertor = class extends Convertor {
@@ -11513,27 +11516,9 @@ 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";
+    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" || statement.type === "alter_table_alter_column_set_default" || statement.type === "alter_table_alter_column_drop_default") && dialect3 === "mysql";
   }
   convert(statement) {
     const { tableName, columnName } = statement;
@@ -11578,6 +11563,18 @@ var MySqlModifyColumn = class extends Convertor {
       columnType = ` ${statement.newDataType}`;
       columnDefault = statement.columnDefault ? ` DEFAULT ${statement.columnDefault}` : "";
       columnAutoincrement = "";
+    } else if (statement.type === "alter_table_alter_column_set_default") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = ` DEFAULT ${statement.newDefaultValue}`;
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
+    } else if (statement.type === "alter_table_alter_column_drop_default") {
+      columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
+      columnOnUpdate = columnOnUpdate = statement.columnOnUpdate ? ` ON UPDATE CURRENT_TIMESTAMP` : "";
+      columnType = ` ${statement.newDataType}`;
+      columnDefault = "";
+      columnAutoincrement = statement.columnAutoIncrement ? " AUTO_INCREMENT" : "";
     } else {
       columnType = ` ${statement.newDataType}`;
       columnNotNull = statement.columnNotNull ? ` NOT NULL` : "";
@@ -12142,8 +12139,6 @@ 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());
@@ -12416,7 +12411,11 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         tableName,
         columnName,
         newDefaultValue: column4.default.value,
-        schema: schema3
+        schema: schema3,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        newDataType: columnType
       });
     }
     if (((_c = column4.default) == null ? void 0 : _c.type) === "changed") {
@@ -12425,7 +12424,11 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         tableName,
         columnName,
         newDefaultValue: column4.default.new,
-        schema: schema3
+        schema: schema3,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        newDataType: columnType
       });
     }
     if (((_d = column4.default) == null ? void 0 : _d.type) === "deleted") {
@@ -12433,7 +12436,12 @@ var _prepareAlterColumns = (tableName, schema3, columns, json2) => {
         type: "alter_table_alter_column_drop_default",
         tableName,
         columnName,
-        schema: schema3
+        schema: schema3,
+        columnDefault,
+        columnOnUpdate,
+        columnNotNull,
+        columnAutoIncrement,
+        newDataType: columnType
       });
     }
     if (((_e = column4.notNull) == null ? void 0 : _e.type) === "added") {