drizzle-kit 0.20.7-72b0933 → 0.20.7-8d149c2

package/cli/commands/migrate.d.ts

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

package/cli/commands/utils.d.ts

@@ -7,6 +7,7 @@ export type GenerateConfig = {
     out: string;
     breakpoints: boolean;
     custom: boolean;
+    bundle: boolean;
 };
 export declare const prepareGenerateConfig: (options: {
     schema?: string | string[];
@@ -20,14 +21,17 @@ 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;
@@ -35,6 +39,7 @@ 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[];
@@ -164,10 +169,12 @@ 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;
@@ -175,6 +182,7 @@ 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[];
@@ -261,5 +269,6 @@ 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";
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }, {
     type?: "url" | undefined;
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }>]>;
 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";
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }, {
     type?: "url" | undefined;
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }>]>>;
 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";
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }, {
     type?: "url" | undefined;
-    connectionString: string;
     driver: "pg";
+    connectionString: string;
 }>]>>;
 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,5 +101,7 @@ export type Config = {
         wranglerConfigPath: string;
         dbName: string;
     };
+} | {
+    driver: "expo";
 } | {});
 export declare function defineConfig(config: Config): Config;

package/index.d.ts

@@ -101,5 +101,7 @@ 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-72b0933",
+  "version": "0.20.7-8d149c2",
   "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, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema;
+var import_hanji2, assertES5, safeRegister, driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema;
 var init_utils = __esm({
   "src/cli/commands/utils.ts"() {
     init_serializer();
@@ -11189,10 +11189,20 @@ 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"])
     });
@@ -11906,6 +11916,7 @@ var init_pgSerializer = __esm({
     };
     generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
+      const indexesInSchema = {};
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -12057,6 +12068,24 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
               return it.name;
             }
           });
+          if (typeof indexesInSchema[schema4 ?? "public"] !== "undefined") {
+            if (indexesInSchema[schema4 ?? "public"].includes(name)) {
+              console.log(
+                `
+${withStyle.errorWarning(
+                  `We've found duplicated index name across ${source_default.underline.blue(
+                    schema4 ?? "public"
+                  )} schema. Please rename your index in either the ${source_default.underline.blue(
+                    tableName
+                  )} table or the table with the duplicated index name`
+                )}`
+              );
+              process.exit(1);
+            }
+            indexesInSchema[schema4 ?? "public"].push(name);
+          } else {
+            indexesInSchema[schema4 ?? "public"] = [name];
+          }
           indexesObject[name] = {
             name,
             columns: indexColumns,
@@ -14603,6 +14632,7 @@ var init_words = __esm({
 var migrate_exports = {};
 __export(migrate_exports, {
   BREAKPOINT: () => BREAKPOINT,
+  embeddedMigrations: () => embeddedMigrations,
   prepareAndMigrateMySql: () => prepareAndMigrateMySql,
   prepareAndMigratePg: () => prepareAndMigratePg,
   prepareAndMigrateSqlite: () => prepareAndMigrateSqlite,
@@ -14613,7 +14643,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, prepareSnapshotFolderName, two;
+var import_fs3, import_path2, import_hanji3, prepareAndMigratePg, prepareMySQLPush, prepareSQLitePush, preparePgPush, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, BREAKPOINT, writeResult, embeddedMigrations, prepareSnapshotFolderName, two;
 var init_migrate = __esm({
   "src/cli/commands/migrate.ts"() {
     import_fs3 = __toESM(require("fs"));
@@ -14642,19 +14672,14 @@ var init_migrate = __esm({
         const validatedPrev = pgSchema.parse(prev);
         const validatedCur = pgSchema.parse(cur);
         if (config.custom) {
-          writeResult(
-            custom,
-            [],
+          writeResult({
+            cur: custom,
+            sqlStatements: [],
             journal,
-            {
-              columns: {},
-              schemas: {},
-              tables: {}
-            },
             outFolder,
-            config.breakpoints,
-            "custom"
-          );
+            breakpoints: config.breakpoints,
+            type: "custom"
+          });
           return;
         }
         const squashedPrev = squashPgScheme(validatedPrev);
@@ -14666,14 +14691,13 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
-          _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -14767,19 +14791,14 @@ var init_migrate = __esm({
         const validatedPrev = mysqlSchema.parse(prev);
         const validatedCur = mysqlSchema.parse(cur);
         if (config.custom) {
-          writeResult(
-            custom,
-            [],
+          writeResult({
+            cur: custom,
+            sqlStatements: [],
             journal,
-            {
-              columns: {},
-              schemas: {},
-              tables: {}
-            },
             outFolder,
-            config.breakpoints,
-            "custom"
-          );
+            breakpoints: config.breakpoints,
+            type: "custom"
+          });
           return;
         }
         const squashedPrev = squashMysqlScheme(validatedPrev);
@@ -14791,14 +14810,14 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -14816,19 +14835,15 @@ var init_migrate = __esm({
         const validatedPrev = sqliteSchema.parse(prev);
         const validatedCur = sqliteSchema.parse(cur);
         if (config.custom) {
-          writeResult(
-            custom,
-            [],
+          writeResult({
+            cur: custom,
+            sqlStatements: [],
             journal,
-            {
-              columns: {},
-              schemas: {},
-              tables: {}
-            },
             outFolder,
-            config.breakpoints,
-            "custom"
-          );
+            breakpoints: config.breakpoints,
+            bundle: config.bundle,
+            type: "custom"
+          });
           return;
         }
         const squashedPrev = squashSqliteScheme(validatedPrev);
@@ -14838,14 +14853,15 @@ var init_migrate = __esm({
           squashedCur,
           "sqlite"
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints,
+          bundle: config.bundle
+        });
       } catch (e) {
         console.error(e);
       }
@@ -15033,7 +15049,20 @@ var init_migrate = __esm({
       return result;
     };
     BREAKPOINT = "--> statement-breakpoint\n";
-    writeResult = (cur, sqlStatements, journal, _meta, outFolder, breakpoints, type = "none") => {
+    writeResult = ({
+      cur,
+      sqlStatements,
+      journal,
+      _meta = {
+        columns: {},
+        schemas: {},
+        tables: {}
+      },
+      outFolder,
+      breakpoints,
+      bundle = false,
+      type = "none"
+    }) => {
       if (type === "none") {
         console.log(schema(cur));
         if (sqlStatements.length === 0) {
@@ -15074,6 +15103,10 @@ ${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"
@@ -15082,6 +15115,22 @@ ${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(
@@ -15176,7 +15225,7 @@ var init_sqlgenerator = __esm({
         if (typeof compositePKs !== "undefined" && compositePKs.length > 0) {
           statement += ",\n";
           const compositePK4 = PgSquasher.unsquashPK(compositePKs[0]);
-          statement += `	CONSTRAINT ${st.compositePkName} PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
+          statement += `	CONSTRAINT "${st.compositePkName}" PRIMARY KEY("${compositePK4.columns.join(`","`)}")`;
         }
         if (typeof uniqueConstraints !== "undefined" && uniqueConstraints.length > 0) {
           for (const uniqueConstraint4 of uniqueConstraints) {
@@ -17568,13 +17617,14 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonDropTables);
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
-      jsonStatements.push(...jsonDeletedCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonDeletedUniqueConstraints);
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
+      jsonStatements.push(...jsonDeletedCompositePKs);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAddedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);
@@ -17586,7 +17636,6 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonTableAlternations.dropColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
-      jsonStatements.push(...jsonAddedCompositePKs);
       jsonStatements.push(...jsonAlteredCompositePKs);
       if (dialect6 !== "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);