drizzle-kit 0.22.0-12a1bf8 → 0.22.0-18d9643

package/bin.cjs

@@ -1092,7 +1092,7 @@ var init_views = __esm({
       return source_default.grey(msg);
     };
     error = (error2, greyMsg = "") => {
-      return `${source_default.red.bold("Err:")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
+      return `${source_default.bgRed.bold(" Error ")} ${error2} ${greyMsg ? source_default.grey(greyMsg) : ""}`.trim();
     };
     schema = (schema5) => {
       const tables = Object.values(schema5.tables);
@@ -1451,6 +1451,9 @@ Is ${source_default.bold.blue(
 function assertUnreachable(x3) {
   throw new Error("Didn't expect to get here");
 }
+function softAssertUnreachable(x3) {
+  return null;
+}
 var originUUID, snapshotVersion, mapValues, mapKeys, mapEntries;
 var init_global = __esm({
   "src/global.ts"() {
@@ -5474,7 +5477,16 @@ var init_mysqlSchema = __esm({
             objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
           )
         }).optional()
-      )
+      ).optional(),
+      indexes: recordType(
+        stringType(),
+        objectType({
+          columns: recordType(
+            stringType(),
+            objectType({ isExpression: booleanType().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
     }).optional();
     dialect = literalType("mysql");
     schemaHash = objectType({
@@ -6139,7 +6151,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, kitInternals3, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -6217,6 +6229,17 @@ var init_sqliteSchema = __esm({
         columns: recordType(stringType(), stringType())
       })
     }).strict();
+    kitInternals3 = objectType({
+      indexes: recordType(
+        stringType(),
+        objectType({
+          columns: recordType(
+            stringType(),
+            objectType({ isExpression: booleanType().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
+    }).optional();
     latestVersion = literalType("6");
     schemaInternal2 = objectType({
       version: latestVersion,
@@ -6226,7 +6249,8 @@ var init_sqliteSchema = __esm({
       _meta: objectType({
         tables: recordType(stringType(), stringType()),
         columns: recordType(stringType(), stringType())
-      })
+      }),
+      internal: kitInternals3
     }).strict();
     schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
     schemaV42 = schemaInternalV42.merge(schemaHash3).strict();
@@ -7281,7 +7305,7 @@ var require_coerce = __commonJS({
     var SemVer = require_semver();
     var parse7 = require_parse();
     var { safeRe: re2, t: t2 } = require_re();
-    var coerce3 = (version2, options) => {
+    var coerce2 = (version2, options) => {
       if (version2 instanceof SemVer) {
         return version2;
       }
@@ -7316,7 +7340,7 @@ var require_coerce = __commonJS({
       const build = options.includePrerelease && match2[6] ? `+${match2[6]}` : "";
       return parse7(`${major}.${minor}.${patch}${prerelease}${build}`, options);
     };
-    module2.exports = coerce3;
+    module2.exports = coerce2;
   }
 });
 
@@ -8317,7 +8341,7 @@ var require_semver2 = __commonJS({
     var gte = require_gte();
     var lte = require_lte();
     var cmp = require_cmp();
-    var coerce3 = require_coerce();
+    var coerce2 = require_coerce();
     var Comparator = require_comparator();
     var Range = require_range();
     var satisfies = require_satisfies();
@@ -8355,7 +8379,7 @@ var require_semver2 = __commonJS({
       gte,
       lte,
       cmp,
-      coerce: coerce3,
+      coerce: coerce2,
       Comparator,
       Range,
       satisfies,
@@ -8575,12 +8599,137 @@ var init_utils3 = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    init_lib();
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = unionType([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = unionType([
+      pgSchema,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+var assertCollisions, sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema, wrapParam;
+var init_common = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    init_lib();
+    init_schemaValidator();
+    init_source();
+    assertCollisions = (options, command, inputWhitelist = []) => {
+      const { config, ...rest } = options;
+      let atLeastOneParam = false;
+      for (const key of Object.keys(rest)) {
+        if (inputWhitelist.includes(key))
+          continue;
+        atLeastOneParam = true;
+      }
+      if (!atLeastOneParam && typeof config !== "undefined") {
+        return "config";
+      }
+      if (typeof config === "undefined" && atLeastOneParam) {
+        return "cli";
+      }
+      if (typeof config === "undefined" && !atLeastOneParam) {
+        return "config";
+      }
+      console.log(outputs.common.ambiguousParams(command));
+      process.exit(1);
+    };
+    sqliteDriversLiterals = [
+      literalType("turso"),
+      literalType("d1-http"),
+      literalType("expo")
+    ];
+    sqliteDriver = unionType(sqliteDriversLiterals);
+    postgresDriver = literalType("aws-data-api");
+    mysqlDriver = literalType("mysql2");
+    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = objectType({
+      dialect: dialect3,
+      schema: unionType([stringType(), stringType().array()]).optional(),
+      out: stringType().optional(),
+      breakpoints: booleanType().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
+      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
+    });
+    casing = unionType([literalType("camel"), literalType("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = 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: objectType({
+        casing
+      }).default({ casing: "camel" })
+    });
+    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),
+      out: stringType().optional()
+    });
+    wrapParam = (name, param, optional = false) => {
+      const check = `[${source_default.green("\u2713")}]`;
+      const cross = `[${source_default.red("x")}]`;
+      if (typeof param === "string") {
+        if (param.length === 0) {
+          return `    ${cross} ${name}: ''`;
+        }
+        return `    ${check} ${name}: '${param}'`;
+      }
+      if (optional) {
+        return source_default.gray(`        ${name}?: `);
+      }
+      return `    ${cross} ${name}: ${source_default.gray("undefined")}`;
+    };
+  }
+});
+
 // src/cli/validations/outputs.ts
 var withStyle, outputs;
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
     init_source();
+    init_common();
     withStyle = {
       error: (str) => `${source_default.red(`${source_default.white.bgRed(" Invalid input ")} ${str}`)}`,
       warning: (str) => `${source_default.white.bgGray(" Warning ")} ${str}`,
@@ -8630,14 +8779,17 @@ var init_outputs = __esm({
       },
       sqlite: {
         connection: {
-          driver: () => withStyle.error(
-            `Either "turso", "libsql", "better-sqlite" are available options for "--driver"`
-          ),
-          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`
+          driver: () => {
+            const listOfDrivers = sqliteDriversLiterals.map((it) => `'${it.value}'`).join(", ");
+            return withStyle.error(
+              `Either ${listOfDrivers} are available options for 'driver' param`
+            );
+          },
+          url: (driver3) => withStyle.error(
+            `"url" is a required option for driver "${driver3}". 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`
+          authToken: (driver3) => withStyle.error(
+            `"authToken" is a required option for driver "${driver3}". You can read more about drizzle.config: https://orm.drizzle.team/kit-docs/config-reference`
           )
         },
         introspect: {},
@@ -8654,13 +8806,15 @@ var init_mysql = __esm({
     "use strict";
     init_lib();
     init_outputs();
+    init_common();
+    init_views();
     mysqlCredentials = unionType([
       objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("mysql"),
-        password: stringType().optional(),
-        database: stringType(),
+        host: stringType().min(1),
+        port: coerce.number().min(1).optional(),
+        user: stringType().min(1).optional(),
+        password: stringType().min(1).optional(),
+        database: stringType().min(1),
         ssl: unionType([
           stringType(),
           objectType({
@@ -8676,35 +8830,47 @@ var init_mysql = __esm({
         ]).optional()
       }),
       objectType({
-        url: stringType()
+        url: stringType().min(1)
       })
     ]);
     printConfigConnectionIssues = (options) => {
-      if (options.driver !== "mysql2") {
-        console.log(outputs.mysql.connection.driver());
-      }
-      const { uri, connectionString, url, host, database } = options;
-      if (!uri && !connectionString && !url && (!host || !database)) {
-        console.log(outputs.mysql.connection.required());
+      if ("url" in options) {
+        let text2 = `Please provide required params for MySQL driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("url", options.url));
+        process.exit(1);
       }
+      let text = `Please provide required params for MySQL driver:
+`;
+      console.log(error(text));
+      console.log(wrapParam("host", options.host));
+      console.log(wrapParam("port", options.port, true));
+      console.log(wrapParam("user", options.user, true));
+      console.log(wrapParam("password", options.password, true));
+      console.log(wrapParam("database", options.database));
+      console.log(wrapParam("ssl", options.ssl, true));
+      process.exit(1);
     };
   }
 });
 
-// src/cli/validations/pg.ts
+// src/cli/validations/postgres.ts
 var postgresCredentials, printConfigConnectionIssues2;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
+var init_postgres = __esm({
+  "src/cli/validations/postgres.ts"() {
     "use strict";
     init_lib();
-    init_outputs();
+    init_common();
+    init_views();
     postgresCredentials = unionType([
       objectType({
-        host: stringType(),
-        port: coerce.number().optional(),
-        user: stringType().default("postgres"),
-        password: stringType().optional(),
-        database: stringType(),
+        driver: undefinedType(),
+        host: stringType().min(1),
+        port: coerce.number().min(1).optional(),
+        user: stringType().min(1).optional(),
+        password: stringType().min(1).optional(),
+        database: stringType().min(1),
         ssl: unionType([
           literalType("require"),
           literalType("allow"),
@@ -8712,26 +8878,60 @@ var init_pg = __esm({
           literalType("verify-full"),
           booleanType(),
           objectType({}).passthrough()
-        ])
+        ]).optional()
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
       objectType({
-        url: stringType()
+        driver: undefinedType(),
+        url: stringType().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
       objectType({
         driver: literalType("aws-data-api"),
-        database: stringType(),
-        secretArn: stringType(),
-        resourceArn: stringType()
+        database: stringType().min(1),
+        secretArn: stringType().min(1),
+        resourceArn: stringType().min(1)
       })
     ]);
     printConfigConnectionIssues2 = (options) => {
       if (options.driver === "aws-data-api") {
-        console.log(outputs.postgres.connection.awsDataApi());
-        return;
+        let text = `Please provide required params for AWS Data API driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("database", options.database));
+        console.log(wrapParam("secretArn", options.secretArn));
+        console.log(wrapParam("resourceArn", options.resourceArn));
+        process.exit(1);
       }
-      if (!("url" in options) && !("host" in options || "database" in options)) {
-        console.log(outputs.postgres.connection.required());
+      if ("url" in options) {
+        let text = `Please provide required params for Postgres driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("url", options.url));
+        process.exit(1);
+      }
+      if ("host" in options || "database" in options) {
+        let text = `Please provide required params for Postgres driver:
+`;
+        console.log(error(text));
+        console.log(wrapParam("host", options.host));
+        console.log(wrapParam("port", options.port, true));
+        console.log(wrapParam("user", options.user, true));
+        console.log(wrapParam("password", options.password, true));
+        console.log(wrapParam("database", options.database));
+        console.log(wrapParam("ssl", options.ssl, true));
+        process.exit(1);
       }
+      console.log(
+        error(
+          `Either connection "url" or "host", "database" are required for database connection`
+        )
+      );
+      process.exit(1);
     };
   }
 });
@@ -8742,154 +8942,77 @@ var init_sqlite = __esm({
   "src/cli/validations/sqlite.ts"() {
     "use strict";
     init_lib();
-    init_outputs();
+    init_common();
+    init_views();
+    init_global();
     sqliteCredentials = unionType([
       objectType({
         driver: literalType("turso"),
-        url: stringType(),
-        authToken: stringType()
+        url: stringType().min(1),
+        authToken: stringType().min(1).optional()
       }),
       objectType({
         driver: literalType("d1-http"),
-        accountId: stringType(),
-        databaseId: stringType(),
-        token: stringType()
+        accountId: stringType().min(1),
+        databaseId: stringType().min(1),
+        token: stringType().min(1)
       }),
       objectType({
-        url: stringType()
+        driver: undefinedType(),
+        url: stringType().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       })
     ]);
-    printConfigConnectionIssues3 = (options) => {
-      if (options.driver === "turso") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("turso"));
-        }
-        if (!options.authToken) {
-          console.log(outputs.sqlite.connection.authToken("turso"));
-        }
-      } else if (options.driver === "libsql") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("libsql"));
-        }
-      } else if (options.driver === "better-sqlite") {
-        if (!options.url) {
-          console.log(outputs.sqlite.connection.url("better-sqlite"));
+    printConfigConnectionIssues3 = (options, command) => {
+      const parsedDriver = sqliteDriver.safeParse(options.driver);
+      const driver3 = parsedDriver.success ? parsedDriver.data : "";
+      if (driver3 === "expo") {
+        if (command === "migrate") {
+          console.log(
+            error(
+              `You can't use 'migrate' command with Expo SQLite, please follow migration instructions in our docs - https://orm.drizzle.team/docs/get-started-sqlite#expo-sqlite`
+            )
+          );
+        } else if (command === "studio") {
+          console.log(
+            error(
+              `You can't use 'studio' command with Expo SQLite, please use Expo Plugin https://www.npmjs.com/package/expo-drizzle-studio-plugin`
+            )
+          );
+        } else if (command === "pull") {
+          console.log(error("You can't use 'pull' command with Expo SQLite"));
+        } else if (command === "push") {
+          console.log(error("You can't use 'push' command with Expo SQLite"));
+        } else {
+          console.log(error("Unexpected error with expo driver \u{1F914}"));
         }
+        process.exit(1);
+      } else if (driver3 === "d1-http") {
+        let text2 = `Please provide required params for D1 HTTP driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("accountId", options.accountId));
+        console.log(wrapParam("databaseId", options.databaseId));
+        console.log(wrapParam("token", options.token));
+        process.exit(1);
+      } else if (driver3 === "turso") {
+        let text2 = `Please provide required params for Turso driver:
+`;
+        console.log(error(text2));
+        console.log(wrapParam("url", options.url));
+        console.log(wrapParam("authToken", options.authToken));
+        return;
       } else {
-        console.log(outputs.sqlite.connection.driver());
-      }
-    };
-  }
-});
-
-// src/schemaValidator.ts
-var dialect3, commonSquashedSchema, commonSchema;
-var init_schemaValidator = __esm({
-  "src/schemaValidator.ts"() {
-    "use strict";
-    init_lib();
-    init_mysqlSchema();
-    init_pgSchema();
-    init_sqliteSchema();
-    dialect3 = enumType(["postgresql", "mysql", "sqlite"]);
-    commonSquashedSchema = unionType([
-      pgSchemaSquashed,
-      mysqlSchemaSquashed,
-      SQLiteSchemaSquashed
-    ]);
-    commonSchema = unionType([
-      pgSchema,
-      mysqlSchema,
-      sqliteSchema
-    ]);
-  }
-});
-
-// src/cli/validations/common.ts
-var assertCollisions, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
-var init_common = __esm({
-  "src/cli/validations/common.ts"() {
-    "use strict";
-    init_outputs();
-    init_lib();
-    init_schemaValidator();
-    assertCollisions = (options, command, inputWhitelist = []) => {
-      const { config, ...rest } = options;
-      let atLeastOneParam = false;
-      for (const key of Object.keys(rest)) {
-        if (inputWhitelist.includes(key))
-          continue;
-        atLeastOneParam = true;
-      }
-      if (!atLeastOneParam && typeof config !== "undefined") {
-        return "config";
+        softAssertUnreachable(driver3);
       }
-      if (typeof config === "undefined" && atLeastOneParam) {
-        return "cli";
-      }
-      if (typeof config === "undefined" && !atLeastOneParam) {
-        return "config";
-      }
-      console.log(outputs.common.ambiguousParams(command));
+      let text = `Please provide required params:
+`;
+      console.log(error(text));
+      console.log(wrapParam("url", options.url));
       process.exit(1);
     };
-    sqliteDriver = unionType([
-      literalType("better-sqlite"),
-      literalType("turso"),
-      literalType("libsql"),
-      literalType("d1"),
-      literalType("d1-http"),
-      literalType("expo")
-    ]);
-    postgresDriver = literalType("aws-data-api");
-    mysqlDriver = literalType("mysql2");
-    driver = unionType([sqliteDriver, postgresDriver, mysqlDriver]);
-    configCommonSchema = objectType({
-      dialect: dialect3,
-      schema: unionType([stringType(), stringType().array()]).optional(),
-      out: stringType().optional(),
-      breakpoints: booleanType().optional().default(true),
-      driver: driver.optional(),
-      tablesFilter: unionType([stringType(), stringType().array()]).optional(),
-      schemaFilter: unionType([stringType(), stringType().array()]).default(["public"])
-    });
-    casing = unionType([literalType("camel"), literalType("preserve")]).default(
-      "preserve"
-    );
-    introspectParams = 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: objectType({
-        casing
-      }).default({ casing: "camel" })
-    });
-    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),
-      out: stringType().optional()
-    });
   }
 });
 
@@ -8951,7 +9074,7 @@ var init_studio = __esm({
     init_mysql();
     init_sqlite();
     init_schemaValidator();
-    init_pg();
+    init_postgres();
     credentials = intersectionType(
       postgresCredentials,
       mysqlCredentials,
@@ -9105,7 +9228,7 @@ var require_common = __commonJS({
     function setup(env3) {
       createDebug.debug = createDebug;
       createDebug.default = createDebug;
-      createDebug.coerce = coerce3;
+      createDebug.coerce = coerce2;
       createDebug.disable = disable;
       createDebug.enable = enable;
       createDebug.enabled = enabled;
@@ -9246,7 +9369,7 @@ var require_common = __commonJS({
       function toNamespace(regexp) {
         return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
       }
-      function coerce3(val2) {
+      function coerce2(val2) {
         if (val2 instanceof Error) {
           return val2.stack || val2.message;
         }
@@ -14601,7 +14724,7 @@ var init_utils4 = __esm({
     import_hanji2 = __toESM(require_hanji());
     init_global();
     init_mysql();
-    init_pg();
+    init_postgres();
     init_sqlite();
     init_common();
     init_schemaValidator();
@@ -14777,7 +14900,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(config);
         if (!parsed.success) {
-          printConfigConnectionIssues3(config);
+          printConfigConnectionIssues3(config, "pull");
           process.exit(1);
         }
         return {
@@ -14852,7 +14975,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(config);
         if (!parsed.success) {
-          printConfigConnectionIssues3(config);
+          printConfigConnectionIssues3(config, "pull");
           process.exit(1);
         }
         return {
@@ -14917,7 +15040,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(flattened);
         if (!parsed.success) {
-          printConfigConnectionIssues3(flattened);
+          printConfigConnectionIssues3(flattened, "studio");
           process.exit(1);
         }
         const credentials2 = parsed.data;
@@ -14992,7 +15115,7 @@ var init_utils4 = __esm({
       if (dialect7 === "sqlite") {
         const parsed = sqliteCredentials.safeParse(flattened);
         if (!parsed.success) {
-          printConfigConnectionIssues3(flattened);
+          printConfigConnectionIssues3(flattened, "migrate");
           process.exit(1);
         }
         const credentials2 = parsed.data;
@@ -15053,8 +15176,9 @@ var init_utils4 = __esm({
       unregister();
       const res = configCommonSchema.safeParse(content);
       if (!res.success) {
-        console.error(res.error);
-        console.log("Missing required params");
+        if (!("dialect" in content)) {
+          console.log(error("Please specify 'dialect' param"));
+        }
         process.exit(1);
       }
       return res.data;
@@ -15165,6 +15289,7 @@ var init_mysqlSerializer = __esm({
     };
     generateMySqlSnapshot = (tables) => {
       const result = {};
+      const internal = { tables: {}, indexes: {} };
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -15315,10 +15440,29 @@ The unique constraint ${source_default.underline.blue(
           const columns2 = value.config.columns;
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
+            var _a;
             if ((0, import_drizzle_orm2.is)(it, import_drizzle_orm3.SQL)) {
-              return dialect4.sqlToQuery(it, "indexes").sql;
+              const sql2 = dialect4.sqlToQuery(it, "indexes").sql;
+              if (typeof internal.indexes[name] === "undefined") {
+                internal.indexes[name] = {
+                  columns: {
+                    [sql2]: {
+                      isExpression: true
+                    }
+                  }
+                };
+              } else {
+                if (typeof ((_a = internal.indexes[name]) == null ? void 0 : _a.columns[sql2]) === "undefined") {
+                  internal.indexes[name].columns[sql2] = {
+                    isExpression: true
+                  };
+                } else {
+                  internal.indexes[name].columns[sql2].isExpression = true;
+                }
+              }
+              return sql2;
             } else {
-              return it.name;
+              return `${it.name}`;
             }
           });
           if (value.config.unique) {
@@ -15385,12 +15529,13 @@ We have encountered a collision between the index name on columns ${source_defau
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase = async (db2, inputSchema, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
-      const internals = { tables: {} };
+      const internals = { tables: {}, indexes: {} };
       const columns = await db2.query(`select * from information_schema.columns
 	where table_schema = '${inputSchema}' and table_name != '__drizzle_migrations'
 	order by table_name, ordinal_position;`);
@@ -16605,6 +16750,7 @@ var init_sqliteSerializer = __esm({
     dialect6 = new import_sqlite_core2.SQLiteSyncDialect();
     generateSqliteSnapshot = (tables) => {
       const result = {};
+      const internal = { indexes: {} };
       for (const table4 of tables) {
         const columnsObject = {};
         const indexesObject = {};
@@ -16690,8 +16836,27 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const columns2 = value.config.columns;
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
+            var _a;
             if ((0, import_drizzle_orm7.is)(it, import_drizzle_orm7.SQL)) {
-              return dialect6.sqlToQuery(it, "indexes").sql;
+              const sql2 = dialect6.sqlToQuery(it, "indexes").sql;
+              if (typeof internal.indexes[name] === "undefined") {
+                internal.indexes[name] = {
+                  columns: {
+                    [sql2]: {
+                      isExpression: true
+                    }
+                  }
+                };
+              } else {
+                if (typeof ((_a = internal.indexes[name]) == null ? void 0 : _a.columns[sql2]) === "undefined") {
+                  internal.indexes[name].columns[sql2] = {
+                    isExpression: true
+                  };
+                } else {
+                  internal.indexes[name].columns[sql2].isExpression = true;
+                }
+              }
+              return sql2;
             } else {
               return it.name;
             }
@@ -16765,7 +16930,8 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase3 = async (db2, tablesFilter = (table4) => true, progressCallback) => {
@@ -17268,7 +17434,14 @@ var init_sqlgenerator = __esm({
         return statement.type === "create_table" && dialect7 === "mysql";
       }
       convert(st) {
-        const { tableName, columns, schema: schema5, compositePKs, uniqueConstraints } = st;
+        const {
+          tableName,
+          columns,
+          schema: schema5,
+          compositePKs,
+          uniqueConstraints,
+          internals
+        } = st;
         let statement = "";
         statement += `CREATE TABLE \`${tableName}\` (
 `;
@@ -17291,7 +17464,11 @@ var init_sqlgenerator = __esm({
           for (const uniqueConstraint4 of uniqueConstraints) {
             statement += ",\n";
             const unsquashedUnique = MySqlSquasher.unsquashUnique(uniqueConstraint4);
-            statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(\`${unsquashedUnique.columns.join(`\`,\``)}\`)`;
+            const uniqueString = unsquashedUnique.columns.map((it) => {
+              var _a, _b;
+              return (internals == null ? void 0 : internals.indexes) ? ((_b = (_a = internals == null ? void 0 : internals.indexes[unsquashedUnique.name]) == null ? void 0 : _a.columns[it]) == null ? void 0 : _b.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
+            }).join(",");
+            statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(${uniqueString})`;
           }
         }
         statement += `
@@ -18220,8 +18397,11 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
           statement.data
         );
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
-        const value = columns.map((it) => `\`${it}\``).join(",");
-        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${value});`;
+        const uniqueString = columns.map((it) => {
+          var _a, _b, _c, _d;
+          return ((_a = statement.internal) == null ? void 0 : _a.indexes) ? ((_d = (_c = (_b = statement.internal) == null ? void 0 : _b.indexes[name]) == null ? void 0 : _c.columns[it]) == null ? void 0 : _d.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
+        }).join(",");
+        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${uniqueString});`;
       }
     };
     CreateSqliteIndexConvertor = class extends Convertor {
@@ -18234,8 +18414,11 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         );
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const whereStatement = where ? ` WHERE ${where}` : "";
-        const value = columns.map((it) => `\`${it}\``).join(",");
-        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${value})${whereStatement};`;
+        const uniqueString = columns.map((it) => {
+          var _a, _b, _c, _d;
+          return ((_a = statement.internal) == null ? void 0 : _a.indexes) ? ((_d = (_c = (_b = statement.internal) == null ? void 0 : _b.indexes[name]) == null ? void 0 : _c.columns[it]) == null ? void 0 : _d.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
+        }).join(",");
+        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${uniqueString})${whereStatement};`;
       }
     };
     PgDropIndexConvertor = class extends Convertor {
@@ -18883,7 +19066,7 @@ var init_jsonStatements = __esm({
         uniqueConstraints: Object.values(uniqueConstraints)
       };
     };
-    prepareMySqlCreateTableJson = (table4, json2) => {
+    prepareMySqlCreateTableJson = (table4, json2, internals) => {
       const { name, schema: schema5, columns, compositePrimaryKeys, uniqueConstraints } = table4;
       return {
         type: "create_table",
@@ -18892,7 +19075,8 @@ var init_jsonStatements = __esm({
         columns: Object.values(columns),
         compositePKs: Object.values(compositePrimaryKeys),
         compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[MySqlSquasher.unsquashPK(Object.values(compositePrimaryKeys)[0]).name].name : "",
-        uniqueConstraints: Object.values(uniqueConstraints)
+        uniqueConstraints: Object.values(uniqueConstraints),
+        internals
       };
     };
     prepareSQLiteCreateTable = (table4) => {
@@ -19649,13 +19833,14 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareCreateIndexesJson = (tableName, schema5, indexes) => {
+    prepareCreateIndexesJson = (tableName, schema5, indexes, internal) => {
       return Object.values(indexes).map((indexData) => {
         return {
           type: "create_index",
           tableName,
           data: indexData,
-          schema: schema5
+          schema: schema5,
+          internal
         };
       });
     };
@@ -20560,7 +20745,12 @@ var init_snapshotsDiffer = __esm({
       const typedResult = diffResultSchemeMysql.parse(diffResult);
       const jsonStatements = [];
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
-        return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
+        return prepareCreateIndexesJson(
+          it.name,
+          it.schema,
+          it.indexes,
+          curFull.internal
+        );
       }).flat();
       const jsonDropTables = deletedTables.map((it) => {
         return prepareDropTableJson(it);
@@ -20659,7 +20849,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = alteredTables.map((it) => {
@@ -20719,7 +20910,11 @@ var init_snapshotsDiffer = __esm({
         (t2) => t2.type === "delete_reference"
       );
       const jsonMySqlCreateTables = createdTables.map((it) => {
-        return prepareMySqlCreateTableJson(it, curFull);
+        return prepareMySqlCreateTableJson(
+          it,
+          curFull,
+          curFull.internal
+        );
       });
       jsonStatements.push(...jsonMySqlCreateTables);
       jsonStatements.push(...jsonDropTables);
@@ -20759,7 +20954,7 @@ var init_snapshotsDiffer = __esm({
         _meta
       };
     };
-    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2) => {
+    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
       const tablesDiff = diffSchemasOrTables(json1.tables, json2.tables);
       const {
         created: createdTables,
@@ -20839,7 +21034,12 @@ var init_snapshotsDiffer = __esm({
         return prepareSQLiteCreateTable(it);
       });
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
-        return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
+        return prepareCreateIndexesJson(
+          it.name,
+          it.schema,
+          it.indexes,
+          curFull.internal
+        );
       }).flat();
       const jsonDropTables = deletedTables.map((it) => {
         return prepareDropTableJson(it);
@@ -20941,7 +21141,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = allAltered.map((it) => {
@@ -22632,7 +22833,9 @@ var init_migrate = __esm({
           squashedPrev,
           squashedCur,
           tablesResolver,
-          columnsResolver
+          columnsResolver,
+          validatedPrev,
+          validatedCur
         );
         writeResult({
           cur,
@@ -22658,7 +22861,9 @@ var init_migrate = __esm({
         squashedPrev,
         squashedCur,
         tablesResolver,
-        columnsResolver
+        columnsResolver,
+        validatedPrev,
+        validatedCur
       );
       return {
         sqlStatements,
@@ -24928,14 +25133,14 @@ var require_to_regex_range = __commonJS({
       }
       return tokens;
     }
-    function filterPatterns(arr, comparison, prefix, intersection2, options) {
+    function filterPatterns(arr, comparison, prefix, intersection, options) {
       let result = [];
       for (let ele of arr) {
         let { string } = ele;
-        if (!intersection2 && !contains(comparison, "string", string)) {
+        if (!intersection && !contains(comparison, "string", string)) {
           result.push(prefix + string);
         }
-        if (intersection2 && contains(comparison, "string", string)) {
+        if (intersection && contains(comparison, "string", string)) {
           result.push(prefix + string);
         }
       }
@@ -111934,11 +112139,11 @@ var init_connections = __esm({
       );
       process.exit(1);
     };
-    prepareSqliteParams = (params, driver2) => {
+    prepareSqliteParams = (params, driver3) => {
       return params.map((param) => {
         if (param && typeof param === "object" && "type" in param && "value" in param && param.type === "binary") {
           const value = typeof param.value === "object" ? JSON.stringify(param.value) : param.value;
-          if (driver2 === "d1-http") {
+          if (driver3 === "d1-http") {
             return value;
           }
           return Buffer.from(value);
@@ -111948,8 +112153,8 @@ var init_connections = __esm({
     };
     connectToSQLite = async (credentials2) => {
       if ("driver" in credentials2) {
-        const { driver: driver2 } = credentials2;
-        if (driver2 === "turso") {
+        const { driver: driver3 } = credentials2;
+        if (driver3 === "turso") {
           assertPackages("@libsql/client");
           const { createClient: createClient2 } = await import("@libsql/client");
           const { drizzle } = await import("drizzle-orm/libsql");
@@ -111986,7 +112191,7 @@ var init_connections = __esm({
             }
           };
           return { ...db2, ...proxy, migrate: migrateFn };
-        } else if (driver2 === "d1-http") {
+        } else if (driver3 === "d1-http") {
           const { drizzle } = await import("drizzle-orm/sqlite-proxy");
           const { migrate } = await import("drizzle-orm/sqlite-proxy/migrator");
           const remoteCallback = async (sql2, params, method) => {
@@ -112046,7 +112251,7 @@ var init_connections = __esm({
           };
           return { ...db2, ...proxy, migrate: migrateFn };
         } else {
-          assertUnreachable(driver2);
+          assertUnreachable(driver3);
         }
       }
       if (await checkPackage("@libsql/client")) {
@@ -116820,7 +117025,9 @@ var init_introspect = __esm({
           squashSqliteScheme(drySQLite),
           squashSqliteScheme(schema5),
           tablesResolver,
-          columnsResolver
+          columnsResolver,
+          drySQLite,
+          schema5
         );
         writeResult({
           cur: schema5,
@@ -120347,13 +120554,13 @@ var init_studio2 = __esm({
       const customDefaults = getCustomDefaults(sqliteSchema2);
       let dbUrl;
       if ("driver" in credentials2) {
-        const { driver: driver2 } = credentials2;
-        if (driver2 === "d1-http") {
+        const { driver: driver3 } = credentials2;
+        if (driver3 === "d1-http") {
           dbUrl = `d1-http://${credentials2.accountId}/${credentials2.databaseId}/${credentials2.token}`;
-        } else if (driver2 === "turso") {
+        } else if (driver3 === "turso") {
           dbUrl = `turso://${credentials2.url}/${credentials2.authToken}`;
         } else {
-          assertUnreachable(driver2);
+          assertUnreachable(driver3);
         }
       } else {
         dbUrl = credentials2.url;
@@ -120465,7 +120672,7 @@ var init_studio2 = __esm({
     };
     prepareServer = async ({
       dialect: dialect7,
-      driver: driver2,
+      driver: driver3,
       proxy,
       customDefaults,
       schema: drizzleSchema,
@@ -120515,7 +120722,7 @@ var init_studio2 = __esm({
           return c.json({
             version: "6",
             dialect: dialect7,
-            driver: driver2,
+            driver: driver3,
             schemaFiles,
             customDefaults: preparedDefaults,
             relations: extractRelations(relationsConfig),