drizzle-kit 0.20.7-b11c289 → 0.20.7-c9519c9

package/cli/commands/migrate.d.ts

@@ -256,15 +256,5 @@ export declare const prepareSQL: (prev: CommonSquashedSchema, cur: CommonSquashe
     } | undefined;
 }>;
 export declare const BREAKPOINT = "--> statement-breakpoint\n";
-export declare const writeResult: ({ cur, sqlStatements, journal, _meta, outFolder, breakpoints, bundle, type, }: {
-    cur: CommonSchema;
-    sqlStatements: string[];
-    journal: Journal;
-    _meta?: any;
-    outFolder: string;
-    breakpoints: boolean;
-    bundle?: boolean | undefined;
-    type?: "none" | "custom" | "introspect" | undefined;
-}) => void;
-export declare const embeddedMigrations: (journal: Journal) => string;
+export declare const writeResult: (cur: CommonSchema, sqlStatements: string[], journal: Journal, _meta: any, outFolder: string, breakpoints: boolean, type?: "introspect" | "custom" | "none") => void;
 export declare const prepareSnapshotFolderName: () => string;

package/cli/commands/utils.d.ts

@@ -7,7 +7,6 @@ export type GenerateConfig = {
     out: string;
     breakpoints: boolean;
     custom: boolean;
-    bundle: boolean;
 };
 export declare const prepareGenerateConfig: (options: {
     schema?: string | string[];
@@ -21,17 +20,14 @@ export declare const assertOutFolder: (it: {
 } | {
     out: string;
 }) => Promise<string>;
-export declare const driver: import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>;
 export declare const configCommonSchema: import("zod").ZodObject<{
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     out: import("zod").ZodOptional<import("zod").ZodString>;
     breakpoints: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    driver: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
 }, "strip", import("zod").ZodTypeAny, {
     out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schema: string | string[];
     breakpoints: boolean;
@@ -39,7 +35,6 @@ export declare const configCommonSchema: import("zod").ZodObject<{
 }, {
     out?: string | undefined;
     breakpoints?: boolean | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schemaFilter?: string | string[] | undefined;
     schema: string | string[];
@@ -169,12 +164,10 @@ export declare const mySqlCliConfigSchema: import("zod").ZodIntersection<import(
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
     out: import("zod").ZodOptional<import("zod").ZodString>;
     breakpoints: import("zod").ZodDefault<import("zod").ZodBoolean>;
-    driver: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodLiteral<"better-sqlite">, import("zod").ZodLiteral<"turso">, import("zod").ZodLiteral<"libsql">, import("zod").ZodLiteral<"d1">, import("zod").ZodLiteral<"expo">, import("zod").ZodLiteral<"pg">, import("zod").ZodLiteral<"mysql2">]>>;
     tablesFilter: import("zod").ZodOptional<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
     schemaFilter: import("zod").ZodDefault<import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>>;
 }, "strip", import("zod").ZodTypeAny, {
     out?: string | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schema: string | string[];
     breakpoints: boolean;
@@ -182,7 +175,6 @@ export declare const mySqlCliConfigSchema: import("zod").ZodIntersection<import(
 }, {
     out?: string | undefined;
     breakpoints?: boolean | undefined;
-    driver?: "turso" | "better-sqlite" | "libsql" | "d1" | "pg" | "mysql2" | "expo" | undefined;
     tablesFilter?: string | string[] | undefined;
     schemaFilter?: string | string[] | undefined;
     schema: string | string[];
@@ -269,6 +261,5 @@ export declare const mySqlIntrospectConfigSchema: import("zod").ZodIntersection<
 }>, import("zod").ZodObject<{}, "strip", import("zod").ZodTypeAny, {}, {}>]>>;
 export type MySqlCliConfig = TypeOf<typeof mySqlCliConfigSchema>;
 export type CliConfig = MySqlCliConfig;
-export type Driver = TypeOf<typeof driver>;
 export declare const drizzleConfigFromFile: (configPath?: string) => Promise<CliConfig>;
 export declare const readDrizzleConfig: (configPath?: string) => Promise<any>;

package/cli/validations/mysql.d.ts

@@ -9,17 +9,17 @@ export declare const mysqlConnectionCli: import("zod").ZodUnion<[import("zod").Z
 }, "strip", import("zod").ZodTypeAny, {
     port?: number | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     user: string;
     database: string;
+    driver: "mysql2";
 }, {
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     database: string;
+    driver: "mysql2";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
     uri: import("zod").ZodString;
@@ -217,17 +217,17 @@ export declare const mysqlCliIntrospectParams: import("zod").ZodIntersection<imp
 }, "strip", import("zod").ZodTypeAny, {
     port?: number | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     user: string;
     database: string;
+    driver: "mysql2";
 }, {
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     database: string;
+    driver: "mysql2";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
     uri: import("zod").ZodString;
@@ -266,17 +266,17 @@ export declare const mysqlCliPushParams: import("zod").ZodIntersection<import("z
 }, "strip", import("zod").ZodTypeAny, {
     port?: number | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     user: string;
     database: string;
+    driver: "mysql2";
 }, {
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
-    driver: "mysql2";
     host: string;
     database: string;
+    driver: "mysql2";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"mysql2">;
     uri: import("zod").ZodString;

package/cli/validations/pg.d.ts

@@ -13,31 +13,31 @@ export declare const pgConnectionCli: import("zod").ZodUnion<[import("zod").ZodO
     password?: string | undefined;
     ssl?: boolean | undefined;
     type: "params";
-    driver: "pg";
     host: string;
     user: string;
     database: string;
+    driver: "pg";
 }, {
     type?: "params" | undefined;
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
     ssl?: boolean | undefined;
-    driver: "pg";
     host: string;
     database: string;
+    driver: "pg";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     connectionString: import("zod").ZodString;
     type: import("zod").ZodDefault<import("zod").ZodLiteral<"url">>;
 }, "strip", import("zod").ZodTypeAny, {
     type: "url";
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }, {
     type?: "url" | undefined;
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }>]>;
 export declare const pgConnectionConfig: import("zod").ZodUnion<[import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
@@ -253,31 +253,31 @@ export declare const pgCliIntrospectParams: import("zod").ZodIntersection<import
     password?: string | undefined;
     ssl?: boolean | undefined;
     type: "params";
-    driver: "pg";
     host: string;
     user: string;
     database: string;
+    driver: "pg";
 }, {
     type?: "params" | undefined;
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
     ssl?: boolean | undefined;
-    driver: "pg";
     host: string;
     database: string;
+    driver: "pg";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     connectionString: import("zod").ZodString;
     type: import("zod").ZodDefault<import("zod").ZodLiteral<"url">>;
 }, "strip", import("zod").ZodTypeAny, {
     type: "url";
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }, {
     type?: "url" | undefined;
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }>]>>;
 export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;
@@ -311,31 +311,31 @@ export declare const pgCliPushParams: import("zod").ZodIntersection<import("zod"
     password?: string | undefined;
     ssl?: boolean | undefined;
     type: "params";
-    driver: "pg";
     host: string;
     user: string;
     database: string;
+    driver: "pg";
 }, {
     type?: "params" | undefined;
     port?: number | undefined;
     user?: string | undefined;
     password?: string | undefined;
     ssl?: boolean | undefined;
-    driver: "pg";
     host: string;
     database: string;
+    driver: "pg";
 }>, import("zod").ZodObject<{
     driver: import("zod").ZodLiteral<"pg">;
     connectionString: import("zod").ZodString;
     type: import("zod").ZodDefault<import("zod").ZodLiteral<"url">>;
 }, "strip", import("zod").ZodTypeAny, {
     type: "url";
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }, {
     type?: "url" | undefined;
-    driver: "pg";
     connectionString: string;
+    driver: "pg";
 }>]>>;
 export declare const pgConfigPushParams: import("zod").ZodIntersection<import("zod").ZodObject<{
     schema: import("zod").ZodUnion<[import("zod").ZodString, import("zod").ZodArray<import("zod").ZodString, "many">]>;

package/index.d.mts

@@ -101,7 +101,5 @@ export type Config = {
         wranglerConfigPath: string;
         dbName: string;
     };
-} | {
-    driver: "expo";
 } | {});
 export declare function defineConfig(config: Config): Config;

package/index.d.ts

@@ -101,7 +101,5 @@ export type Config = {
         wranglerConfigPath: string;
         dbName: string;
     };
-} | {
-    driver: "expo";
 } | {});
 export declare function defineConfig(config: Config): Config;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.20.7-b11c289",
+  "version": "0.20.7-c9519c9",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/utils.js

@@ -11140,7 +11140,7 @@ var require_node2 = __commonJS({
 });
 
 // src/cli/commands/utils.ts
-var import_hanji2, assertES5, safeRegister, driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema;
+var import_hanji2, assertES5, safeRegister, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema;
 var init_utils = __esm({
   "src/cli/commands/utils.ts"() {
     init_serializer();
@@ -11189,20 +11189,10 @@ var init_utils = __esm({
       await assertES5(res.unregister);
       return res;
     };
-    driver = unionType([
-      literalType("better-sqlite"),
-      literalType("turso"),
-      literalType("libsql"),
-      literalType("d1"),
-      literalType("expo"),
-      literalType("pg"),
-      literalType("mysql2")
-    ]);
     configCommonSchema = objectType({
       schema: unionType([stringType(), stringType().array()]),
       out: stringType().optional(),
       breakpoints: booleanType().default(true),
-      driver: driver.optional(),
       tablesFilter: unionType([stringType(), stringType().array()]).optional(),
       schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
     });
@@ -11731,9 +11721,9 @@ We have encountered a collision between the index name on columns ${source_defau
       }
       try {
         const fks = await db.execute(
-          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,information_schema.referential_constraints.UPDATE_RULE, information_schema.referential_constraints.DELETE_RULE
+          `SELECT INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.COLUMN_NAME,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_SCHEMA,INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME, INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_COLUMN_NAME,INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.UPDATE_RULE, INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.DELETE_RULE
 		FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-		LEFT JOIN information_schema.referential_constraints on information_schema.referential_constraints.constraint_name = information_schema.KEY_COLUMN_USAGE.CONSTRAINT_NAME
+		LEFT JOIN INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS on INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME = INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME
 		WHERE INFORMATION_SCHEMA.KEY_COLUMN_USAGE.TABLE_SCHEMA = ? AND INFORMATION_SCHEMA.KEY_COLUMN_USAGE.CONSTRAINT_NAME != 'PRIMARY' and INFORMATION_SCHEMA.KEY_COLUMN_USAGE.REFERENCED_TABLE_NAME is not null;
 		`,
           [inputSchema]
@@ -14632,7 +14622,6 @@ var init_words = __esm({
 var migrate_exports = {};
 __export(migrate_exports, {
   BREAKPOINT: () => BREAKPOINT,
-  embeddedMigrations: () => embeddedMigrations,
   prepareAndMigrateMySql: () => prepareAndMigrateMySql,
   prepareAndMigratePg: () => prepareAndMigratePg,
   prepareAndMigrateSqlite: () => prepareAndMigrateSqlite,
@@ -14643,7 +14632,7 @@ __export(migrate_exports, {
   prepareSnapshotFolderName: () => prepareSnapshotFolderName,
   writeResult: () => writeResult
 });
-var import_fs3, import_path2, import_hanji3, prepareAndMigratePg, prepareMySQLPush, prepareSQLitePush, preparePgPush, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, BREAKPOINT, writeResult, embeddedMigrations, prepareSnapshotFolderName, two;
+var import_fs3, import_path2, import_hanji3, prepareAndMigratePg, prepareMySQLPush, prepareSQLitePush, preparePgPush, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, BREAKPOINT, writeResult, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
     import_fs3 = __toESM(require("fs"));
@@ -14672,14 +14661,19 @@ var init_migrate = __esm({
         const validatedPrev = pgSchema.parse(prev);
         const validatedCur = pgSchema.parse(cur);
         if (config.custom) {
-          writeResult({
-            cur: custom,
-            sqlStatements: [],
+          writeResult(
+            custom,
+            [],
             journal,
+            {
+              columns: {},
+              schemas: {},
+              tables: {}
+            },
             outFolder,
-            breakpoints: config.breakpoints,
-            type: "custom"
-          });
+            config.breakpoints,
+            "custom"
+          );
           return;
         }
         const squashedPrev = squashPgScheme(validatedPrev);
@@ -14691,13 +14685,14 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult({
+        writeResult(
           cur,
           sqlStatements,
           journal,
+          _meta,
           outFolder,
-          breakpoints: config.breakpoints
-        });
+          config.breakpoints
+        );
       } catch (e) {
         console.error(e);
       }
@@ -14791,14 +14786,19 @@ var init_migrate = __esm({
         const validatedPrev = mysqlSchema.parse(prev);
         const validatedCur = mysqlSchema.parse(cur);
         if (config.custom) {
-          writeResult({
-            cur: custom,
-            sqlStatements: [],
+          writeResult(
+            custom,
+            [],
             journal,
+            {
+              columns: {},
+              schemas: {},
+              tables: {}
+            },
             outFolder,
-            breakpoints: config.breakpoints,
-            type: "custom"
-          });
+            config.breakpoints,
+            "custom"
+          );
           return;
         }
         const squashedPrev = squashMysqlScheme(validatedPrev);
@@ -14810,14 +14810,14 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult({
+        writeResult(
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          breakpoints: config.breakpoints
-        });
+          config.breakpoints
+        );
       } catch (e) {
         console.error(e);
       }
@@ -14835,15 +14835,19 @@ var init_migrate = __esm({
         const validatedPrev = sqliteSchema.parse(prev);
         const validatedCur = sqliteSchema.parse(cur);
         if (config.custom) {
-          writeResult({
-            cur: custom,
-            sqlStatements: [],
+          writeResult(
+            custom,
+            [],
             journal,
+            {
+              columns: {},
+              schemas: {},
+              tables: {}
+            },
             outFolder,
-            breakpoints: config.breakpoints,
-            bundle: config.bundle,
-            type: "custom"
-          });
+            config.breakpoints,
+            "custom"
+          );
           return;
         }
         const squashedPrev = squashSqliteScheme(validatedPrev);
@@ -14853,15 +14857,14 @@ var init_migrate = __esm({
           squashedCur,
           "sqlite"
         );
-        writeResult({
+        writeResult(
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          breakpoints: config.breakpoints,
-          bundle: config.bundle
-        });
+          config.breakpoints
+        );
       } catch (e) {
         console.error(e);
       }
@@ -15049,20 +15052,7 @@ var init_migrate = __esm({
       return result;
     };
     BREAKPOINT = "--> statement-breakpoint\n";
-    writeResult = ({
-      cur,
-      sqlStatements,
-      journal,
-      _meta = {
-        columns: {},
-        schemas: {},
-        tables: {}
-      },
-      outFolder,
-      breakpoints,
-      bundle = false,
-      type = "none"
-    }) => {
+    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints, type = "none") => {
       if (type === "none") {
         console.log(schema(cur));
         if (sqlStatements.length === 0) {
@@ -15103,10 +15093,6 @@ ${sql2}
       });
       import_fs3.default.writeFileSync(metaJournal, JSON.stringify(journal, null, 2));
       import_fs3.default.writeFileSync(`${outFolder}/${tag}.sql`, sql2);
-      if (bundle) {
-        const js = embeddedMigrations(journal);
-        import_fs3.default.writeFileSync(`${outFolder}/migrations.js`, js);
-      }
       (0, import_hanji3.render)(
         `[${source_default.green(
           "\u2713"
@@ -15115,22 +15101,6 @@ ${sql2}
         )} \u{1F680}`
       );
     };
-    embeddedMigrations = (journal) => {
-      let content = "import journal from './meta/_journal.json';\n";
-      journal.entries.forEach((entry) => {
-        content += `import m${entry.idx.toString().padStart(4, "0")} from './${entry.tag}.sql';
-`;
-      });
-      content += `
-  export default {
-    journal,
-    migrations: {
-      ${journal.entries.map((it) => `m${it.idx.toString().padStart(4, "0")}`).join(",\n")}
-    }
-  }
-  `;
-      return content;
-    };
     prepareSnapshotFolderName = () => {
       const now = /* @__PURE__ */ new Date();
       return `${now.getFullYear()}${two(now.getUTCMonth() + 1)}${two(