drizzle-kit 0.20.14-6ce9d1f → 0.20.14-a183d8b

package/bin.cjs

@@ -5724,12 +5724,36 @@ var init_outputs = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    init_lib();
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType(["pg", "mysql", "sqlite"]);
+    commonSquashedSchema = unionType([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = unionType([
+      pgSchema,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
 // src/cli/validations/common.ts
-var checkCollisions;
+var assertCollisions, driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema;
 var init_common = __esm({
   "src/cli/validations/common.ts"() {
     init_outputs();
-    checkCollisions = (options, command, inputWhitelist = []) => {
+    init_lib();
+    init_schemaValidator();
+    assertCollisions = (options, command, inputWhitelist = []) => {
       const { config, ...rest } = options;
       let atLeastOneParam = false;
       for (const key of Object.keys(rest)) {
@@ -5738,29 +5762,87 @@ var init_common = __esm({
         atLeastOneParam = true;
       }
       if (!atLeastOneParam && typeof config !== "undefined") {
-        return {
-          success: true,
-          action: "config"
-        };
+        return "config";
       }
       if (typeof config === "undefined" && atLeastOneParam) {
-        return {
-          success: true,
-          action: "cli"
-        };
+        return "cli";
       }
       if (typeof config === "undefined" && !atLeastOneParam) {
-        return {
-          success: true,
-          action: "config"
-        };
+        return "config";
       }
-      return {
-        success: false,
-        message: outputs.common.ambiguousParams(command),
-        action: "error"
-      };
+      console.log(outputs.common.ambiguousParams(command));
+      process.exit(1);
     };
+    driver = unionType([
+      literalType("better-sqlite"),
+      literalType("turso"),
+      literalType("libsql"),
+      literalType("d1"),
+      literalType("expo"),
+      literalType("pg"),
+      literalType("mysql2")
+    ]);
+    configCommonSchema = objectType({
+      dialect: dialect3,
+      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"])
+    });
+    introspectCasing = objectType({
+      casing: unionType([literalType("camel"), literalType("preserve")]).default("camel")
+    }).default({ casing: "camel" });
+    configIntrospectSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspect: introspectCasing
+    });
+    configIntrospectCliSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = objectType({
+      schema: unionType([stringType(), stringType().array()]),
+      out: stringType().optional().default("./drizzle"),
+      breakpoints: booleanType().default(true)
+    });
+    configPushSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
+      verbose: booleanType().default(false),
+      strict: booleanType().default(false)
+    });
+    mysqlConnectionSchema = unionType([
+      objectType({
+        host: stringType(),
+        port: coerce.number().optional(),
+        user: stringType().default("mysql"),
+        password: stringType().optional(),
+        database: stringType()
+        // ssl: boolean().optional(),
+      }),
+      objectType({
+        connectionString: stringType()
+      }),
+      objectType({})
+    ]);
+    mySqlCliConfigSchema = intersectionType(
+      configCommonSchema,
+      mysqlConnectionSchema
+    );
   }
 });
 
@@ -5771,6 +5853,7 @@ var init_mysql = __esm({
     init_lib();
     init_utils();
     init_common();
+    init_common();
     init_outputs();
     mysqlConnectionCli = unionType([
       objectType({
@@ -5839,12 +5922,8 @@ var init_mysql = __esm({
       }
     };
     validateMySqlIntrospect = async (options) => {
-      const collisionRes = checkCollisions(options, "introspect:mysql");
-      if (!collisionRes.success) {
-        console.log(collisionRes.message);
-        process.exit(1);
-      }
-      if (collisionRes.action === "config") {
+      const action = assertCollisions(options, "introspect:mysql");
+      if (action === "config") {
         const drizzleConfig = await readDrizzleConfig(options.config);
         const configRes = mysqlConfigIntrospectSchema.safeParse(drizzleConfig);
         if (!configRes.success) {
@@ -5889,6 +5968,7 @@ var init_pg = __esm({
     init_lib();
     init_utils();
     init_common();
+    init_common();
     init_outputs();
     pgConnectionCli = unionType([
       objectType({
@@ -5963,12 +6043,8 @@ var init_pg = __esm({
       }
     };
     validatePgIntrospect = async (options) => {
-      const collisionRes = checkCollisions(options, "introspect:pg");
-      if (!collisionRes.success) {
-        console.log(collisionRes.message);
-        process.exit(1);
-      }
-      if (collisionRes.action === "config") {
+      const action = assertCollisions(options, "introspect:pg");
+      if (action === "config") {
         const drizzleConfig = await readDrizzleConfig(options.config);
         const configRes = pgConfigIntrospectSchema.safeParse(drizzleConfig);
         if (!configRes.success) {
@@ -6010,12 +6086,30 @@ var init_pg = __esm({
   }
 });
 
-// src/cli/commands/sqliteUtils.ts
-var sqliteConnectionSchema, sqliteCliConfigSchema;
-var init_sqliteUtils = __esm({
-  "src/cli/commands/sqliteUtils.ts"() {
+// src/cli/validations/sqlite.ts
+var sqliteConnectionCli, sqliteConnectionSchema, sqliteCliConfigSchema, sqliteCliIntrospectParams, sqliteCliPushParams, sqliteConfigPushParams, printCliConnectionIssues3, printConfigConnectionIssues3, validateIntrospect;
+var init_sqlite = __esm({
+  "src/cli/validations/sqlite.ts"() {
     init_lib();
     init_utils();
+    init_common();
+    init_common();
+    init_outputs();
+    sqliteConnectionCli = unionType([
+      objectType({
+        driver: literalType("turso"),
+        url: stringType(),
+        authToken: stringType()
+      }),
+      objectType({
+        driver: literalType("better-sqlite"),
+        url: stringType()
+      }),
+      objectType({
+        driver: literalType("libsql"),
+        url: stringType()
+      })
+    ]);
     sqliteConnectionSchema = unionType([
       objectType({
         driver: literalType("turso"),
@@ -6041,33 +6135,6 @@ var init_sqliteUtils = __esm({
       configIntrospectSchema,
       sqliteConnectionSchema
     );
-  }
-});
-
-// src/cli/validations/sqlite.ts
-var sqliteConnectionCli, sqliteCliIntrospectParams, sqliteCliPushParams, sqliteConfigPushParams, printCliConnectionIssues3, printConfigConnectionIssues3, validateIntrospect;
-var init_sqlite = __esm({
-  "src/cli/validations/sqlite.ts"() {
-    init_lib();
-    init_sqliteUtils();
-    init_utils();
-    init_common();
-    init_outputs();
-    sqliteConnectionCli = unionType([
-      objectType({
-        driver: literalType("turso"),
-        url: stringType(),
-        authToken: stringType()
-      }),
-      objectType({
-        driver: literalType("better-sqlite"),
-        url: stringType()
-      }),
-      objectType({
-        driver: literalType("libsql"),
-        url: stringType()
-      })
-    ]);
     sqliteCliIntrospectParams = intersectionType(
       configIntrospectCliSchema,
       sqliteConnectionCli
@@ -6122,12 +6189,8 @@ var init_sqlite = __esm({
       }
     };
     validateIntrospect = async (options) => {
-      const collisionRes = checkCollisions(options, "introspect:sqlite");
-      if (!collisionRes.success) {
-        console.log(collisionRes.message);
-        process.exit(1);
-      }
-      if (collisionRes.action === "config") {
+      const action = assertCollisions(options, "introspect:sqlite");
+      if (action === "config") {
         const drizzleConfig = await readDrizzleConfig(options.config);
         const configRes = sqliteCliConfigSchema.safeParse(drizzleConfig);
         if (!configRes.success) {
@@ -11786,23 +11849,21 @@ var require_node2 = __commonJS({
 });
 
 // src/cli/commands/utils.ts
-var import_path, import_fs, import_hanji2, assertES5, safeRegister, prepareGenerateConfig, preparePushConfig, assertOutFolder, driver, configCommonSchema, introspectCasing, configIntrospectSchema, configIntrospectCliSchema, configGenerateSchema, configPushSchema, mysqlConnectionSchema, mySqlCliConfigSchema, mySqlIntrospectConfigSchema, drizzleConfigFromFile, readDrizzleConfig;
+var import_path, import_fs, import_hanji2, assertES5, safeRegister, prepareGenerateConfig, preparePushConfig, assertOutFolder, drizzleConfigFromFile, readDrizzleConfig;
 var init_utils = __esm({
   "src/cli/commands/utils.ts"() {
     init_serializer();
-    init_lib();
     import_path = require("path");
     init_source();
     import_fs = require("fs");
     init_views();
     import_hanji2 = __toESM(require_hanji());
-    init_mysql();
-    init_pg();
-    init_sqlite();
     init_outputs();
+    init_global();
+    init_mysql();
     init_pg();
     init_sqlite();
-    init_global();
+    init_common();
     assertES5 = async (unregister) => {
       try {
         init_es5();
@@ -11845,7 +11906,7 @@ var init_utils = __esm({
       return res;
     };
     prepareGenerateConfig = async (options) => {
-      const { schema: schema4, out, config, breakpoints, custom } = options;
+      const { schema: schema4, out, config, breakpoints, custom, dialect: dialect7 } = options;
       if (!(schema4 && out)) {
         const drizzleConfig = await drizzleConfigFromFile(config);
         if (!drizzleConfig.out) {
@@ -11853,6 +11914,7 @@ var init_utils = __esm({
           process.exit(1);
         }
         return {
+          dialect: drizzleConfig.dialect,
           custom,
           breakpoints: drizzleConfig.breakpoints ?? false,
           schema: drizzleConfig.schema,
@@ -11861,7 +11923,11 @@ var init_utils = __esm({
         };
       }
       if (!schema4) {
-        console.error(`'schema' param must be set`);
+        console.error(`You have to provide 'schema' param`);
+        process.exit(1);
+      }
+      if (!dialect7) {
+        console.error(`You have to provide 'dialect' param`);
         process.exit(1);
       }
       const fileNames = prepareFilenames(schema4);
@@ -11873,14 +11939,21 @@ var init_utils = __esm({
         console.error(`'out' param must be set`);
         process.exit(1);
       }
-      return { schema: schema4, out, breakpoints, custom, bundle: false };
+      return { dialect: dialect7, schema: schema4, out, breakpoints, custom, bundle: false };
     };
     preparePushConfig = async (options) => {
       let config;
-      const dialect7 = options.dialect;
-      const drizzleConfig = options.config ? await readDrizzleConfig(options.config) : options;
+      const from = assertCollisions(options, "push");
+      const drizzleConfig = from === "config" ? await readDrizzleConfig(options.config) : options;
       if (!drizzleConfig.schema) {
-        console.error(outputs.common.schema("push:mysql"));
+        console.error(outputs.common.schema("push"));
+      }
+      const dialect7 = drizzleConfig.dialect;
+      if (!dialect7) {
+        console.log(
+          `You have to provide 'dialect' in config file or as a CLI param`
+        );
+        process.exit(1);
       }
       if (dialect7 === "mysql") {
         const parsed = mysqlConfigPushParams.safeParse(drizzleConfig);
@@ -11929,78 +12002,6 @@ 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"])
-    });
-    introspectCasing = objectType({
-      casing: unionType([literalType("camel"), literalType("preserve")]).default("camel")
-    }).default({ casing: "camel" });
-    configIntrospectSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      introspect: introspectCasing
-    });
-    configIntrospectCliSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      introspectCasing: unionType([literalType("camel"), literalType("preserve")]).default(
-        "camel"
-      )
-    });
-    configGenerateSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]),
-      out: stringType().optional().default("./drizzle"),
-      breakpoints: booleanType().default(true)
-    });
-    configPushSchema = objectType({
-      schema: unionType([stringType(), stringType().array()]),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"]),
-      verbose: booleanType().default(false),
-      strict: booleanType().default(false)
-    });
-    mysqlConnectionSchema = unionType([
-      objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType()
-        // ssl: boolean().optional(),
-      }),
-      objectType({
-        connectionString: stringType()
-      }),
-      objectType({})
-    ]);
-    mySqlCliConfigSchema = intersectionType(
-      configCommonSchema,
-      mysqlConnectionSchema
-    );
-    mySqlIntrospectConfigSchema = intersectionType(
-      configIntrospectSchema,
-      mysqlConnectionSchema
-    );
     drizzleConfigFromFile = async (configPath) => {
       const defaultTsConfigExists = (0, import_fs.existsSync)((0, import_path.join)((0, import_path.resolve)("drizzle.config.ts")));
       const defaultJsConfigExists = (0, import_fs.existsSync)((0, import_path.join)((0, import_path.resolve)("drizzle.config.js")));
@@ -12130,7 +12131,7 @@ function clearDefaults(defaultValue, collate) {
     return `${resultDefault}`;
   }
 }
-var import_mysql_core2, import_drizzle_orm2, import_mysql_core3, import_drizzle_orm3, dialect3, indexName, generateMySqlSnapshot, fromDatabase;
+var import_mysql_core2, import_drizzle_orm2, import_mysql_core3, import_drizzle_orm3, dialect4, indexName, generateMySqlSnapshot, fromDatabase;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
     import_mysql_core2 = require("drizzle-orm/mysql-core");
@@ -12140,7 +12141,7 @@ var init_mysqlSerializer = __esm({
     init_serializer();
     init_outputs();
     init_source();
-    dialect3 = new import_mysql_core2.MySqlDialect();
+    dialect4 = new import_mysql_core2.MySqlDialect();
     indexName = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
@@ -12297,7 +12298,7 @@ The unique constraint ${source_default.underline.blue(
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
             if ((0, import_drizzle_orm2.is)(it, import_drizzle_orm3.SQL)) {
-              return dialect3.sqlToQuery(it).sql;
+              return dialect4.sqlToQuery(it).sql;
             } else {
               return it.name;
             }
@@ -12689,7 +12690,7 @@ __export(pgSerializer_exports, {
   generatePgSnapshot: () => generatePgSnapshot,
   indexName: () => indexName2
 });
-var import_pg_core2, import_pg_core3, import_drizzle_orm5, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
+var import_pg_core2, import_pg_core3, import_drizzle_orm5, dialect5, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     import_pg_core2 = require("drizzle-orm/pg-core");
@@ -12698,7 +12699,7 @@ var init_pgSerializer = __esm({
     init_serializer();
     init_source();
     init_outputs();
-    dialect4 = new import_pg_core2.PgDialect();
+    dialect5 = new import_pg_core2.PgDialect();
     indexName2 = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
@@ -12827,7 +12828,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const onUpdate = fk4.onUpdate;
           const reference = fk4.reference();
           const tableTo = (0, import_drizzle_orm5.getTableName)(reference.foreignTable);
-          const schemaTo = (0, import_pg_core3.getTableConfig)(reference.foreignTable).schema;
+          const schemaTo = (0, import_pg_core3.getTableConfig)(reference.foreignTable).schema || "public";
           const columnsFrom = reference.columns.map((it) => it.name);
           const columnsTo = reference.foreignColumns.map((it) => it.name);
           return {
@@ -12853,7 +12854,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           );
           let indexColumns = columns2.map((it) => {
             if ((0, import_drizzle_orm5.is)(it, import_drizzle_orm5.SQL)) {
-              return dialect4.sqlToQuery(it).sql;
+              return dialect5.sqlToQuery(it).sql;
             } else {
               return it.name;
             }
@@ -13412,7 +13413,7 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var import_drizzle_orm7, import_sqlite_core2, dialect5, generateSqliteSnapshot, fromDatabase3;
+var import_drizzle_orm7, import_sqlite_core2, dialect6, generateSqliteSnapshot, fromDatabase3;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
     import_drizzle_orm7 = require("drizzle-orm");
@@ -13420,7 +13421,7 @@ var init_sqliteSerializer = __esm({
     init_serializer();
     init_outputs();
     init_source();
-    dialect5 = new import_sqlite_core2.SQLiteSyncDialect();
+    dialect6 = new import_sqlite_core2.SQLiteSyncDialect();
     generateSqliteSnapshot = (tables, enums) => {
       const result = {};
       for (const table4 of tables) {
@@ -13509,7 +13510,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
             if ((0, import_drizzle_orm7.is)(it, import_drizzle_orm7.SQL)) {
-              return dialect5.sqlToQuery(it).sql;
+              return dialect6.sqlToQuery(it).sql;
             } else {
               return it.name;
             }
@@ -13517,7 +13518,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           let where = void 0;
           if (value.config.where !== void 0) {
             if ((0, import_drizzle_orm7.is)(value.config.where, import_drizzle_orm7.SQL)) {
-              where = dialect5.sqlToQuery(value.config.where).sql;
+              where = dialect6.sqlToQuery(value.config.where).sql;
             }
           }
           indexesObject[name] = {
@@ -56077,7 +56078,7 @@ var init_mysqlIntrospect = __esm({
     init_mjs();
     init_drivers();
     connectToMySQL = async (config) => {
-      const client = await (0, import_promise.createConnection)(config.dbCredentials);
+      const connection = await (0, import_promise.createConnection)(config.dbCredentials);
       let databaseName;
       if ("uri" in config.dbCredentials) {
         const connectionUrl = new URL(config.dbCredentials.uri);
@@ -56095,8 +56096,8 @@ var init_mysqlIntrospect = __esm({
           "Either `connectionString` or `host, port, etc.` params be provided in config file"
         );
       }
-      await client.connect();
-      return { client: new MySQL2Client(client), databaseName };
+      await connection.connect();
+      return { client: new MySQL2Client(connection), databaseName };
     };
     mysqlIntrospect = async (config, filters) => {
       const { client, databaseName } = await connectToMySQL(config);
@@ -60792,14 +60793,14 @@ var pgConnect_exports = {};
 __export(pgConnect_exports, {
   connectToPg: () => connectToPg
 });
-var import_pg3, connectToPg;
+var import_pg2, connectToPg;
 var init_pgConnect = __esm({
   "src/cli/commands/pgConnect.ts"() {
-    import_pg3 = __toESM(require_lib4());
+    import_pg2 = __toESM(require_lib4());
     init_drivers();
     connectToPg = async (config) => {
       if (config.driver === "pg") {
-        const client = new import_pg3.Client(config.dbCredentials);
+        const client = new import_pg2.Client(config.dbCredentials);
         await client.connect();
         const connection = new PgPostgres(client);
         return { client: connection };
@@ -62232,7 +62233,6 @@ var init_studio = __esm({
     init_lib();
     init_pg();
     init_mysql();
-    init_sqliteUtils();
     init_utils();
     init_outputs();
     init_pg();
@@ -63088,24 +63088,8 @@ var certs = async () => {
 };
 certs();
 
-// src/schemaValidator.ts
-init_lib();
-init_mysqlSchema();
-init_pgSchema();
-init_sqliteSchema();
-var dialect6 = enumType(["pg", "mysql", "sqlite"]);
-var commonSquashedSchema = unionType([
-  pgSchemaSquashed,
-  mysqlSchemaSquashed,
-  SQLiteSchemaSquashed
-]);
-var commonSchema = unionType([
-  pgSchema,
-  mysqlSchema,
-  sqliteSchema
-]);
-
 // src/cli/index.ts
+init_schemaValidator();
 var printVersions = async () => {
   const v = await versions();
   console.log(`${source_default.gray(v)}
@@ -63113,35 +63097,29 @@ var printVersions = async () => {
 };
 var versions = async () => {
   const { npmVersion } = await ormCoreVersions();
-  const ormVersion = npmVersion ? `
-drizzle-orm: v${npmVersion}` : "";
-  const versions2 = `drizzle-kit: v${"0.20.14"}${ormVersion}`;
+  const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
+  const envVersion = "0.20.14";
+  const kitVersion = envVersion ? `v${envVersion}` : "--";
+  const versions2 = `drizzle-kit: ${kitVersion}
+${ormVersion}`;
   return versions2;
 };
-var optionsSchemaGenerate = objectType({
-  dialect: dialect6,
+var cliConfigGenerate = objectType({
+  dialect: dialect3.optional(),
   schema: unionType([stringType(), stringType().array()]).optional(),
   out: stringType().optional().default("./drizzle"),
   config: stringType().optional(),
   breakpoints: booleanType().optional().default(true),
   custom: booleanType().optional().default(false)
 }).strict();
-var generateCommand = new import_commander.Command("generate").option("--dialict <dialect>", "Database dialect [pg, mysql, sqlite]").option("--schema <schema...>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option("--custom", "Prepare empty migration file for custom SQL").option(
+var generateCommand = new import_commander.Command("generate").option("--dialect <dialect>", "Database dialect [pg, mysql, sqlite]").option("--schema <schema...>", "Path to a schema file or folder").option("--out <out>", `Output folder, 'drizzle' by default`).option("--breakpoints", `Prepare SQL statements with breakpoints`).option("--custom", "Prepare empty migration file for custom SQL").option(
   "--config <config>",
   "Path to a config.json file, drizzle.config.ts by default"
 ).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "generate",
-    ["custom"]
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
-  const parsed = optionsSchemaGenerate.parse(options);
+  assertCollisions(options, "generate", ["custom"]);
+  const parsed = cliConfigGenerate.parse(options);
   const result = await prepareGenerateConfig(parsed);
   await assertPackages("drizzle-orm");
   const {
@@ -63149,22 +63127,23 @@ var generateCommand = new import_commander.Command("generate").option("--dialict
     prepareAndMigrateMySql: prepareAndMigrateMySql2,
     prepareAndMigrateSqlite: prepareAndMigrateSqlite2
   } = await Promise.resolve().then(() => (init_migrate(), migrate_exports));
-  if (parsed.dialect === "pg") {
+  const dialect7 = result.dialect;
+  if (dialect7 === "pg") {
     await prepareAndMigratePg2(result);
-  } else if (parsed.dialect === "mysql") {
+  } else if (dialect7 === "mysql") {
     await prepareAndMigrateMySql2(result);
-  } else if (parsed.dialect === "sqlite") {
+  } else if (dialect7 === "sqlite") {
     await prepareAndMigrateSqlite2(result);
   } else {
-    assertUnreachable(parsed.dialect);
+    assertUnreachable(dialect7);
   }
 });
 var cliParamsPush = objectType({
   config: stringType().optional(),
-  dialect: dialect6,
+  dialect: dialect3.optional(),
   schema: unionType([stringType(), stringType().array()]).optional(),
   tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-  driver: stringType(),
+  driver: stringType().optional(),
   // mysql / pg
   connectionString: stringType().optional(),
   host: stringType().optional(),
@@ -63176,8 +63155,8 @@ var cliParamsPush = objectType({
   // turso / libsql / sqlite
   uri: stringType().optional(),
   authToken: stringType().optional(),
-  verbose: booleanType().default(false),
-  strict: booleanType().default(false)
+  verbose: booleanType().optional(),
+  strict: booleanType().optional()
 }).strict();
 var dbPushCommand = new import_commander.Command("push").option(
   "--config <config>",
@@ -63190,17 +63169,18 @@ var dbPushCommand = new import_commander.Command("push").option(
   const { config, tablesFilter, schemaFiles } = await preparePushConfig(
     cliParams
   );
-  if (cliParams.dialect === "mysql") {
+  const dialect7 = config.dialect;
+  if (dialect7 === "mysql") {
     const { mysqlPush: mysqlPush2 } = await Promise.resolve().then(() => (init_push(), push_exports));
     await mysqlPush2(config, tablesFilter);
-  } else if (cliParams.dialect === "pg") {
+  } else if (dialect7 === "pg") {
     const { pgPush: pgPush2 } = await Promise.resolve().then(() => (init_push(), push_exports));
     await pgPush2(config, tablesFilter);
-  } else if (cliParams.dialect === "sqlite") {
+  } else if (dialect7 === "sqlite") {
     const { sqlitePush: sqlitePush2 } = await Promise.resolve().then(() => (init_push(), push_exports));
     await sqlitePush2(config, tablesFilter);
   } else {
-    assertUnreachable(cliParams.dialect);
+    assertUnreachable(dialect7);
   }
   process.exit(0);
 });
@@ -63212,14 +63192,7 @@ var checkSchema = objectType({
 var checkPgCommand = new import_commander.Command("check:pg").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "check:pg"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "check:pg");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   checkHandler(out, "pg");
@@ -63228,14 +63201,7 @@ var checkPgCommand = new import_commander.Command("check:pg").option("--out <out
 var checkSqliteCommand = new import_commander.Command("check:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "check:sqlite"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "check:sqlite");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   checkHandler(out, "sqlite");
@@ -63244,14 +63210,7 @@ var checkSqliteCommand = new import_commander.Command("check:sqlite").option("--
 var checkMySqlCommand = new import_commander.Command("check:mysql").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "check:mysql"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "check:mysql");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   checkHandler(out, "mysql");
@@ -63260,14 +63219,7 @@ var checkMySqlCommand = new import_commander.Command("check:mysql").option("--ou
 var upPgCommand = new import_commander.Command("up:pg").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "up:pg"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "up:pg");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   await assertPackages("drizzle-orm");
@@ -63278,14 +63230,7 @@ var upPgCommand = new import_commander.Command("up:pg").option("--out <out>", `O
 var upMysqlCommand = new import_commander.Command("up:mysql").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "up:mysql"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "up:mysql");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   await assertPackages("drizzle-orm");
@@ -63296,14 +63241,7 @@ var upMysqlCommand = new import_commander.Command("up:mysql").option("--out <out
 var upSqliteCommand = new import_commander.Command("up:sqlite").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "up:sqlite"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "up:sqlite");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   upSqliteHandlerV4(out);
@@ -63476,14 +63414,7 @@ var introspectSQLiteCommand = new import_commander.Command("introspect:sqlite").
 var dropCommand = new import_commander.Command("drop").option("--out <out>", `Output folder`).option("--driver <driver>", `Driver used for querying the database`).option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   await printVersions();
   await assertOrmCoreVersion();
-  const collisionRes = checkCollisions(
-    options,
-    "drop"
-  );
-  if (!collisionRes.success) {
-    console.log(collisionRes.message);
-    process.exit(1);
-  }
+  assertCollisions(options, "drop");
   const params = checkSchema.parse(options);
   const out = await assertOutFolder(params);
   let bundle = false;