drizzle-kit 0.17.0-fac8395 → 0.17.1-9fd4c75

package/index.js

@@ -14092,7 +14092,7 @@ ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintNam
         const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
         const fromColumnsString = columnsFrom.map((it) => `"${it}"`).join(",");
         const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
-        const alterStatement = `ALTER TABLE ${tableFrom} ADD CONSTRAINT ${name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+        const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT ${name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
         let sql = "DO $$ BEGIN\n";
         sql += " " + alterStatement + ";\n";
         sql += "EXCEPTION\n";
@@ -14143,13 +14143,13 @@ ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintNam
       convert(statement) {
         const newFk = PgSquasher.unsquashFK(statement.data);
         const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
-        let sql = `ALTER TABLE ${oldFk.tableFrom} DROP CONSTRAINT ${oldFk.name};
+        let sql = `ALTER TABLE "${oldFk.tableFrom}" DROP CONSTRAINT ${oldFk.name};
 `;
         const onDeleteStatement = newFk.onDelete ? `ON DELETE ${newFk.onDelete}` : "";
         const onUpdateStatement = newFk.onUpdate ? `ON UPDATE ${newFk.onDelete}` : "";
         const fromColumnsString = newFk.columnsFrom.map((it) => `"${it}"`).join(",");
         const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
-        const alterStatement = `ALTER TABLE ${newFk.tableFrom} ADD CONSTRAINT ${newFk.name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${newFk.tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+        const alterStatement = `ALTER TABLE "${newFk.tableFrom}" ADD CONSTRAINT ${newFk.name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${newFk.tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
         sql += "DO $$ BEGIN\n";
         sql += " " + alterStatement + ";\n";
         sql += "EXCEPTION\n";
@@ -14180,7 +14180,7 @@ ALTER TABLE "${statement.tableName}" ADD CONSTRAINT ${statement.newConstraintNam
       convert(statement) {
         const tableFrom = statement.tableName;
         const { name } = PgSquasher.unsquashFK(statement.data);
-        return `ALTER TABLE ${tableFrom} DROP CONSTRAINT ${name};
+        return `ALTER TABLE "${tableFrom}" DROP CONSTRAINT ${name};
 `;
       }
     };
@@ -17553,6 +17553,7 @@ var init_upFolders = __esm({
           date.setUTCHours(Number(it.substring(8, 10)));
           date.setUTCMinutes(Number(it.substring(10, 12)));
           date.setUTCSeconds(Number(it.substring(12, 14)));
+          date.setUTCMilliseconds(0);
           const path2 = (0, import_path.join)(out, it);
           const pathJson = (0, import_path.join)(out, it, "snapshot.json");
           const pathSQL = (0, import_path.join)(out, it, "migration.sql");
@@ -27180,7 +27181,7 @@ var init_migrate = __esm({
       result.deleted.push(...leftMissing);
       return result;
     };
-    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints) => {
+    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints, isIntrospect = false) => {
       console.log(schema(cur));
       if (sqlStatements.length === 0) {
         console.log("No schema changes, nothing to migrate \u{1F634}");
@@ -27198,7 +27199,14 @@ var init_migrate = __esm({
         JSON.stringify(toSave, null, 2)
       );
       const sqlDelimiter = breakpoints ? "--> statement-breakpoint\n" : "\n";
-      const sql = sqlStatements.join(sqlDelimiter);
+      let sql = sqlStatements.join(sqlDelimiter);
+      if (isIntrospect) {
+        sql = `-- Current sql file was generated after introspecting the database
+-- If you want to run this migration please uncomment this code before executing migraitons
+/*
+${sql}
+*/`;
+      }
       journal.entries.push({
         idx,
         version: cur.version,
@@ -49265,7 +49273,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.17.0",
+  version: "0.17.1",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",
@@ -49277,7 +49285,7 @@ var package_default = {
     "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/introspect-mysql --schema ./dev/introspect-mysql/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",
@@ -49648,7 +49656,8 @@ var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Mi
       journal,
       _meta,
       res.data.out,
-      res.data.breakpoints
+      res.data.breakpoints,
+      true
     );
   } else {
     (0, import_hanji6.render)(
@@ -49699,7 +49708,8 @@ var introspectMySqlCommand = new Command("introspect:mysql").option("--out <out>
       journal,
       _meta,
       res.data.out,
-      res.data.breakpoints
+      res.data.breakpoints,
+      true
     );
   } else {
     (0, import_hanji6.render)(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.17.0-fac8395",
+  "version": "0.17.1-9fd4c75",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",
@@ -12,7 +12,7 @@
     "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/introspect-mysql --schema ./dev/introspect-mysql/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/readme.md

@@ -1,16 +1,19 @@
 ## Drizzle Kit
+
 DrizzleKit - is a CLI migrator tool for DrizzleORM. It is probably one and only tool that lets you completely automatically generate SQL migrations and covers ~95% of the common cases like delitions and renames by prompting user input.\
-https://github.com/drizzle-team/drizzle-kit-mirror - is a mirror repository for issues.
+<https://github.com/drizzle-team/drizzle-kit-mirror> - is a mirror repository for issues.
 
 ### How it works
+
 `drizzle-kit` will traverse `schema folder` or `schema file`, generate schema snapshot and compare it to the previous version(if there's one).\
  Based on the difference it will generate all needed SQL migrations and if there're any `automatically unresolvable` cases like `renames` it will prompt user for input.
 
 For schema file:
+
 ```typescript
 // ./src/db/schema.ts
 
-import { integer, pgTable, serial, text, varchar } from "drizzle-orm-pg";
+import { integer, pgTable, serial, text, varchar } from "drizzle-orm/pg-core";
 
 const users = pgTable("users", {
     id: serial("id").primaryKey(),
@@ -26,17 +29,19 @@ export const authOtp = pgTable("auth_otp", {
   userId: integer("user_id").references(() => users.id),
 });
 ```
+
 It will generate:
+
 ```SQL
 CREATE TABLE IF NOT EXISTS auth_otp (
-	"id" SERIAL PRIMARY KEY,
-	"phone" character varying(256),
-	"user_id" INT
+ "id" SERIAL PRIMARY KEY,
+ "phone" character varying(256),
+ "user_id" INT
 );
 
 CREATE TABLE IF NOT EXISTS users (
-	"id" SERIAL PRIMARY KEY,
-	"full_name" character varying(256)
+ "id" SERIAL PRIMARY KEY,
+ "full_name" character varying(256)
 );
 
 DO $$ BEGIN
@@ -49,26 +54,69 @@ CREATE INDEX IF NOT EXISTS users_full_name_index ON users (full_name);
 ```
 
 ### Installation & configuration
+
 ```shell
-$ npm install -D drizzle-kit
+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
+npx drizzle-kit generate:pg --out migrations-folder --schema src/db/schema.ts
 ```
 
 Or put your file to `drizzle.config.json` configuration file:
+
 ```json
 {
   "out": "./migrations-folder",
   "schema": "./src/db"
 }
 ```
+
 ---
+
+## Upgrading to 0.17.0
+
+Before running any new migrations `drizzle-kit` will ask you to upgrade in a first place
+
+Migration file structure < 0.17.0
+
+```plaintext
+📦 <project root>
+ └ 📂 migrations
+    └ 📂 20221207174503
+       ├ 📜 migration.sql
+       ├ 📜 snapshot.json
+    └ 📂 20230101104503
+       ├ 📜 migration.sql
+       ├ 📜 snapshot.json
+```
+
+Migration file structure >= 0.17.0
+
+```plaintext
+📦 <project root>
+ └ 📂 migrations
+    └ 📂 meta
+      ├ 📜 _journal.json
+      ├ 📜 0000_snapshot.json
+      ├ 📜 0001_snapshot.json
+    └ 📜 0000_icy_stranger.sql
+    └ 📜 0001_strange_avengers.sql
+```
+
+To easily migrate from previous folder structure to new you need to run `up` command in drizzle kit. It's a great helper to upgrade your migrations to new format on each drizzle kit major update
+
+![](media/up_mysql.gif)
+---
+
 ## List of commands
 
 ### Generate SQL migrations based on current .ts schema\
+
+---
+
 **`$ drizzle-kit generate:pg`** \
 **`$ drizzle-kit generate:mysql`** \
 **`$ drizzle-kit generate:sqlite`** \
@@ -76,6 +124,7 @@ Or put your file to `drizzle.config.json` configuration file:
 `--config` [optional defalut=drizzle.config.json] config file path\
 `--schema` path to typescript schema file or folder with multiple schema files\
 `--out` [optional default=drizzle/] migrations folder
+
 ```shell
 $ drizzle-kit generate:pg 
 ## runs generate command with drizzle.config.json 
@@ -91,40 +140,65 @@ $ drizzle-kit generate:pg --schema=./src/schema.ts --out=./migrations/
 ```  
 
 ### Introspect existing database and generate typescript schema
-**`$ drizzle-kit introspect:pg`**
+
+---
+
+**`$ drizzle-kit introspect:pg`** \
+**`$ drizzle-kit introspect:mysql`**
+
 ```shell
 drizzle-kit introspect:pg --out=migrations/ --connectionString=postgresql://user:pass@host:port/db_name
 
 drizzle-kit introspect:pg --out=migrations/ --host=0.0.0.0 --port=5432 --user=postgres --password=pass --database=db_name --ssl
 ```
 
+![](media/introspect_mysql.gif)
+
 ### Update stale snapshots
+
+---
+
 **`$ drizzle-kit up:pg`** \
 **`$ drizzle-kit up:mysql`**\
 **`$ drizzle-kit up:sqlite`**
 
 `--out` [optional] migrations folder\
 `--config` [optional defalut=drizzle.config.json] config file path
+
 ```shell
 ## migrations folder is taken from drizzle.config.json
-drizzle-kit up:pg
+drizzle-kit up:mysql
 
-drizzle-kit up:pg --out=migrations/ 
+drizzle-kit up:mysql --out=migrations/ 
 ```
 
+![](media/up_mysql.gif)
+
+### Drop migration
+
+---
+
+**`$ drizzle-kit drop`** \
+
+`--out` [optional] migrations folder\
+`--config` [optional defalut=drizzle.config.json] config file path
+
+![](media/drop.gif)
+
 ### Migrations collisions check
+
+---
+
 **`$ drizzle-kit check:pg`**\
 **`$ drizzle-kit check:mysql`**\
 **`$ drizzle-kit check:sqlite`**
 
 `--out` [optional] migration folder\
 `--config` [optional defalut=drizzle.config.json] config file path
+
 ```shell
 ## migrations folder is taken from drizzle.config.json
 drizzle-kit check:pg
 
 drizzle-kit check:pg --out=migrations/ 
 ```
-
-
-

package/utils.js

@@ -11810,7 +11810,7 @@ var PgCreateForeignKeyConvertor = class extends Convertor {
     const onUpdateStatement = onUpdate ? `ON UPDATE ${onUpdate}` : "";
     const fromColumnsString = columnsFrom.map((it) => `"${it}"`).join(",");
     const toColumnsString = columnsTo.map((it) => `"${it}"`).join(",");
-    const alterStatement = `ALTER TABLE ${tableFrom} ADD CONSTRAINT ${name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+    const alterStatement = `ALTER TABLE "${tableFrom}" ADD CONSTRAINT ${name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
     let sql = "DO $$ BEGIN\n";
     sql += " " + alterStatement + ";\n";
     sql += "EXCEPTION\n";
@@ -11861,13 +11861,13 @@ var PgAlterForeignKeyConvertor = class extends Convertor {
   convert(statement) {
     const newFk = PgSquasher.unsquashFK(statement.data);
     const oldFk = PgSquasher.unsquashFK(statement.oldFkey);
-    let sql = `ALTER TABLE ${oldFk.tableFrom} DROP CONSTRAINT ${oldFk.name};
+    let sql = `ALTER TABLE "${oldFk.tableFrom}" DROP CONSTRAINT ${oldFk.name};
 `;
     const onDeleteStatement = newFk.onDelete ? `ON DELETE ${newFk.onDelete}` : "";
     const onUpdateStatement = newFk.onUpdate ? `ON UPDATE ${newFk.onDelete}` : "";
     const fromColumnsString = newFk.columnsFrom.map((it) => `"${it}"`).join(",");
     const toColumnsString = newFk.columnsTo.map((it) => `"${it}"`).join(",");
-    const alterStatement = `ALTER TABLE ${newFk.tableFrom} ADD CONSTRAINT ${newFk.name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${newFk.tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
+    const alterStatement = `ALTER TABLE "${newFk.tableFrom}" ADD CONSTRAINT ${newFk.name} FOREIGN KEY (${fromColumnsString}) REFERENCES ${newFk.tableTo}(${toColumnsString}) ${onDeleteStatement} ${onUpdateStatement}`.replace(/  +/g, " ").trim();
     sql += "DO $$ BEGIN\n";
     sql += " " + alterStatement + ";\n";
     sql += "EXCEPTION\n";
@@ -11898,7 +11898,7 @@ var PgDeleteForeignKeyConvertor = class extends Convertor {
   convert(statement) {
     const tableFrom = statement.tableName;
     const { name } = PgSquasher.unsquashFK(statement.data);
-    return `ALTER TABLE ${tableFrom} DROP CONSTRAINT ${name};
+    return `ALTER TABLE "${tableFrom}" DROP CONSTRAINT ${name};
 `;
   }
 };