drizzle-kit 0.20.7-05d4dfb → 0.20.7-0650f86

package/bin.cjs

@@ -11261,7 +11261,7 @@ var require_node2 = __commonJS({
 });
 
 // src/cli/commands/utils.ts
-var import_path, import_fs, import_hanji2, assertES5, safeRegister, prepareGenerateConfig, assertOutFolder, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema, drizzleConfigFromFile, readDrizzleConfig;
+var import_path, import_fs, import_hanji2, assertES5, safeRegister, prepareGenerateConfig, assertOutFolder, driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema, drizzleConfigFromFile, readDrizzleConfig;
 var init_utils = __esm({
   "src/cli/commands/utils.ts"() {
     init_serializer();
@@ -11324,7 +11324,8 @@ var init_utils = __esm({
           custom,
           breakpoints: drizzleConfig.breakpoints ?? false,
           schema: drizzleConfig.schema,
-          out: drizzleConfig.out
+          out: drizzleConfig.out,
+          bundle: drizzleConfig.driver === "expo"
         };
       }
       if (!schema4) {
@@ -11340,7 +11341,7 @@ var init_utils = __esm({
         console.error(`'out' param must be set`);
         process.exit(1);
       }
-      return { schema: schema4, out, breakpoints, custom };
+      return { schema: schema4, out, breakpoints, custom, bundle: false };
     };
     assertOutFolder = async (it) => {
       if ("out" in it)
@@ -11356,10 +11357,20 @@ var init_utils = __esm({
       }
       return cliConfig.out;
     };
+    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"])
     });
@@ -11566,9 +11577,9 @@ var init_outputs = __esm({
           driver: () => withStyle.error(
             `Either "turso", "libsql", "better-sqlite" are available options for "--driver"`
           ),
-          url: (driver) => withStyle.error(`"url" is a required option for driver "${driver}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`),
-          authToken: (driver) => withStyle.error(
-            `"authToken" is a required option for driver "${driver}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
+          url: (driver2) => withStyle.error(`"url" is a required option for driver "${driver2}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`),
+          authToken: (driver2) => withStyle.error(
+            `"authToken" is a required option for driver "${driver2}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
           )
         },
         introspect: {},
@@ -12180,6 +12191,7 @@ var init_pgSerializer = __esm({
     };
     generatePgSnapshot = (tables, enums, schemas, schemaFilter) => {
       const result = {};
+      const indexesInSchema = {};
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -12331,6 +12343,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,
@@ -14895,7 +14925,7 @@ __export(migrate_exports, {
   prepareSnapshotFolderName: () => prepareSnapshotFolderName,
   writeResult: () => writeResult
 });
-var import_fs4, import_path3, import_hanji3, prepareAndMigratePg, prepareMySQLPush, prepareSQLitePush, preparePgPush, prepareAndMigrateMySql, prepareAndMigrateSqlite, prepareSQL, promptColumnsConflicts, promptTablesConflict, promptSchemasConflict, BREAKPOINT, writeResult, prepareSnapshotFolderName, two;
+var import_fs4, import_path3, 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_fs4 = __toESM(require("fs"));
@@ -14924,19 +14954,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);
@@ -14948,14 +14973,13 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
-          _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -15049,19 +15073,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);
@@ -15073,14 +15092,14 @@ var init_migrate = __esm({
           validatedPrev,
           validatedCur
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -15098,19 +15117,14 @@ 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,
+            type: "custom"
+          });
           return;
         }
         const squashedPrev = squashSqliteScheme(validatedPrev);
@@ -15120,14 +15134,14 @@ var init_migrate = __esm({
           squashedCur,
           "sqlite"
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -15315,7 +15329,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) {
@@ -15356,6 +15383,10 @@ ${sql2}
       });
       import_fs4.default.writeFileSync(metaJournal, JSON.stringify(journal, null, 2));
       import_fs4.default.writeFileSync(`${outFolder}/${tag}.sql`, sql2);
+      if (bundle) {
+        const js = embeddedMigrations(journal);
+        import_fs4.default.writeFileSync(`${outFolder}/migrations.js`, js);
+      }
       (0, import_hanji3.render)(
         `[${source_default.green(
           "\u2713"
@@ -15364,6 +15395,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(
@@ -15458,7 +15505,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) {
@@ -17855,9 +17902,9 @@ var init_snapshotsDiffer = __esm({
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
-      jsonStatements.push(...jsonAddedCompositePKs);
-      jsonStatements.push(...jsonTableAlternations.alterColumns);
       jsonStatements.push(...jsonDeletedCompositePKs);
+      jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAddedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);
@@ -60321,8 +60368,8 @@ var init_studioUtils = __esm({
       };
     };
     drizzleForSQLite = async (config, sqliteSchema2, relations4, ts, verbose) => {
-      const { driver, dbCredentials: creds } = config;
-      if (driver === "d1") {
+      const { driver: driver2, dbCredentials: creds } = config;
+      if (driver2 === "d1") {
         const { drizzle: drizzle2 } = await Promise.resolve().then(() => (init_driver(), driver_exports));
         const { execute: execute2 } = await Promise.resolve().then(() => (init_wrangler_client(), wrangler_client_exports));
         const db = drizzle2(execute2, creds.wranglerConfigPath, creds.dbName, {
@@ -60340,7 +60387,7 @@ var init_studioUtils = __esm({
           ts
         };
       }
-      if (driver === "better-sqlite") {
+      if (driver2 === "better-sqlite") {
         assertPackages("better-sqlite3");
         const { drizzle: drizzle2 } = await import("drizzle-orm/better-sqlite3");
         const Database = await import("better-sqlite3");
@@ -60359,7 +60406,7 @@ var init_studioUtils = __esm({
           ts
         };
       }
-      if (driver === "libsql" || driver === "turso") {
+      if (driver2 === "libsql" || driver2 === "turso") {
         assertPackages("@libsql/client");
         const { drizzle: drizzle2 } = await import("drizzle-orm/libsql");
         const { createClient } = await import("@libsql/client");
@@ -60383,7 +60430,7 @@ var init_studioUtils = __esm({
           ts
         };
       }
-      assertUnreachable(driver);
+      assertUnreachable(driver2);
     };
     drizzleDb = async (drizzleConfig, models, logger) => {
       if (drizzleConfig.driver === "pg") {
@@ -61097,8 +61144,8 @@ var init_mysql = __esm({
       mysqlConnectionConfig
     );
     printCliConnectionIssues3 = (options) => {
-      const { driver, uri, host, database } = options || {};
-      if (driver !== "mysql2") {
+      const { driver: driver2, uri, host, database } = options || {};
+      if (driver2 !== "mysql2") {
         console.log(outputs.mysql.connection.driver());
       }
       if (!uri && (!host || !database)) {
@@ -61137,7 +61184,7 @@ var init_mysql = __esm({
       const {
         out,
         schema: schema4,
-        driver,
+        driver: driver2,
         schemaFilter,
         tablesFilter,
         breakpoints,
@@ -61147,7 +61194,7 @@ var init_mysql = __esm({
       return {
         out,
         schema: schema4,
-        driver,
+        driver: driver2,
         schemaFilter,
         tablesFilter,
         breakpoints,
@@ -61183,13 +61230,13 @@ var init_mysql = __esm({
         strict,
         verbose,
         schema: schema4,
-        driver,
+        driver: driver2,
         schemaFilter,
         tablesFilter,
         ...rest
       } = cliRes.data;
       return {
-        driver,
+        driver: driver2,
         schema: schema4,
         strict,
         verbose,
@@ -63632,9 +63679,9 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
     prepareSQLiteSchema: prepareSQLiteSchema2,
     drizzleForSQLite: drizzleForSQLite2
   } = await Promise.resolve().then(() => (init_studioUtils(), studioUtils_exports));
-  const { driver, schema: schemaPath } = drizzleConfig;
+  const { driver: driver2, schema: schemaPath } = drizzleConfig;
   let setup;
-  if (driver === "pg") {
+  if (driver2 === "pg") {
     const { schemaToTypeScript: schemaToTypeScript4, relationsToTypeScript: relationsToTypeScript2 } = await Promise.resolve().then(() => (init_introspect_pg(), introspect_pg_exports));
     const { serializePg: serializePg2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
     const { schema: schema4, relations: relations4 } = await preparePgSchema2(schemaPath);
@@ -63652,7 +63699,7 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
       },
       Boolean(options.verbose)
     );
-  } else if (driver === "mysql2") {
+  } else if (driver2 === "mysql2") {
     const { schemaToTypeScript: schemaToTypeScript4 } = await Promise.resolve().then(() => (init_introspect_mysql(), introspect_mysql_exports));
     const { schema: schema4, relations: relations4 } = await prepareMySqlSchema2(schemaPath);
     const { serializeMySql: serializeMySql2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
@@ -63669,7 +63716,7 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
       },
       Boolean(options.verbose)
     );
-  } else if (driver === "better-sqlite" || driver === "d1" || driver === "libsql" || driver === "turso") {
+  } else if (driver2 === "better-sqlite" || driver2 === "d1" || driver2 === "libsql" || driver2 === "turso") {
     const { schemaToTypeScript: schemaToTypeScript4 } = await Promise.resolve().then(() => (init_introspect_sqlite(), introspect_sqlite_exports));
     const { schema: schema4, relations: relations4 } = await prepareSQLiteSchema2(schemaPath);
     const { serializeSQLite: serializeSQLite2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
@@ -63687,7 +63734,7 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
       Boolean(options.verbose)
     );
   } else {
-    assertUnreachable(driver);
+    assertUnreachable(driver2);
   }
   const qeueryEngine = (0, import_studio.queryEngineForSetup)(setup);
   const server = await (0, import_server.prepareServer)((_2) => {
@@ -63701,7 +63748,7 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
       "Drizzle Studio is currently in Beta. If you find anything that is not working as expected or should be improved, feel free to create an issue on GitHub: https://github.com/drizzle-team/drizzle-kit-mirror/issues/new or write to us on Discord: https://discord.gg/WcRKz2FFxN"
     )
   );
-  if (driver === "d1") {
+  if (driver2 === "d1") {
     console.log(
       withStyle.fullWarning(
         "It seems like you are trying to access your D1 Database. Please make sure to run 'wrangler login' before using Drizzle Studio to ensure it has your token for making requests to the D1 Database. If you encounter an error related to CLOUDFLARE_TOKEN, please run 'wrangler login' and restart the studio"

package/cli/commands/migrate.d.ts

@@ -256,5 +256,14 @@ 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 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-05d4dfb",
+  "version": "0.20.7-0650f86",
   "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,
@@ -14613,7 +14642,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 +14671,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 +14690,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 +14790,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 +14809,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 +14834,14 @@ 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,
+            type: "custom"
+          });
           return;
         }
         const squashedPrev = squashSqliteScheme(validatedPrev);
@@ -14838,14 +14851,14 @@ var init_migrate = __esm({
           squashedCur,
           "sqlite"
         );
-        writeResult(
+        writeResult({
           cur,
           sqlStatements,
           journal,
           _meta,
           outFolder,
-          config.breakpoints
-        );
+          breakpoints: config.breakpoints
+        });
       } catch (e) {
         console.error(e);
       }
@@ -15033,7 +15046,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 +15100,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 +15112,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 +15222,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) {
@@ -17573,9 +17619,9 @@ var init_snapshotsDiffer = __esm({
       }
       jsonStatements.push(...jsonDroppedReferencesForAlteredTables);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
-      jsonStatements.push(...jsonAddedCompositePKs);
-      jsonStatements.push(...jsonTableAlternations.alterColumns);
       jsonStatements.push(...jsonDeletedCompositePKs);
+      jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonAddedCompositePKs);
       if (dialect6 === "mysql") {
         jsonStatements.push(...jsonAddedUniqueConstraints);
         jsonStatements.push(...jsonDeletedUniqueConstraints);