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

package/payload.js

@@ -7990,7 +7990,16 @@ var init_mysqlSchema = __esm({
             (0, import_zod.object)({ isDefaultAnExpression: (0, import_zod.boolean)().optional() }).optional()
           )
         }).optional()
-      )
+      ).optional(),
+      indexes: (0, import_zod.record)(
+        (0, import_zod.string)(),
+        (0, import_zod.object)({
+          columns: (0, import_zod.record)(
+            (0, import_zod.string)(),
+            (0, import_zod.object)({ isExpression: (0, import_zod.boolean)().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
     }).optional();
     dialect = (0, import_zod.literal)("mysql");
     schemaHash = (0, import_zod.object)({
@@ -8655,7 +8664,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var import_zod3, index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
+var import_zod3, index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, kitInternals3, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema2, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -8733,6 +8742,17 @@ var init_sqliteSchema = __esm({
         columns: (0, import_zod3.record)((0, import_zod3.string)(), (0, import_zod3.string)())
       })
     }).strict();
+    kitInternals3 = (0, import_zod3.object)({
+      indexes: (0, import_zod3.record)(
+        (0, import_zod3.string)(),
+        (0, import_zod3.object)({
+          columns: (0, import_zod3.record)(
+            (0, import_zod3.string)(),
+            (0, import_zod3.object)({ isExpression: (0, import_zod3.boolean)().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
+    }).optional();
     latestVersion = (0, import_zod3.literal)("6");
     schemaInternal2 = (0, import_zod3.object)({
       version: latestVersion,
@@ -8742,7 +8762,8 @@ var init_sqliteSchema = __esm({
       _meta: (0, import_zod3.object)({
         tables: (0, import_zod3.record)((0, import_zod3.string)(), (0, import_zod3.string)()),
         columns: (0, import_zod3.record)((0, import_zod3.string)(), (0, import_zod3.string)())
-      })
+      }),
+      internal: kitInternals3
     }).strict();
     schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
     schemaV42 = schemaInternalV42.merge(schemaHash3).strict();
@@ -8931,7 +8952,7 @@ var init_views = __esm({
     import_hanji = require("hanji");
     init_utils5();
     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();
     };
     isRenamePromptItem = (item) => {
       return "from" in item && "to" in item;
@@ -9138,12 +9159,102 @@ var init_serializer = __esm({
   }
 });
 
+// src/schemaValidator.ts
+var import_zod4, dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    import_zod4 = require("zod");
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = (0, import_zod4.enum)(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = (0, import_zod4.union)([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = (0, import_zod4.union)([
+      pgSchema,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+var import_zod5, sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
+var init_common2 = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    import_zod5 = require("zod");
+    init_schemaValidator();
+    sqliteDriversLiterals = [
+      (0, import_zod5.literal)("turso"),
+      (0, import_zod5.literal)("d1-http"),
+      (0, import_zod5.literal)("expo")
+    ];
+    sqliteDriver = (0, import_zod5.union)(sqliteDriversLiterals);
+    postgresDriver = (0, import_zod5.literal)("aws-data-api");
+    mysqlDriver = (0, import_zod5.literal)("mysql2");
+    driver = (0, import_zod5.union)([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = (0, import_zod5.object)({
+      dialect: dialect3,
+      schema: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      out: (0, import_zod5.string)().optional(),
+      breakpoints: (0, import_zod5.boolean)().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      schemaFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).default(["public"])
+    });
+    casing = (0, import_zod5.union)([(0, import_zod5.literal)("camel"), (0, import_zod5.literal)("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = (0, import_zod5.object)({
+      schema: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      out: (0, import_zod5.string)().optional().default("./drizzle"),
+      breakpoints: (0, import_zod5.boolean)().default(true),
+      tablesFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      schemaFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).default(["public"]),
+      introspect: (0, import_zod5.object)({
+        casing
+      }).default({ casing: "camel" })
+    });
+    configIntrospectCliSchema = (0, import_zod5.object)({
+      schema: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      out: (0, import_zod5.string)().optional().default("./drizzle"),
+      breakpoints: (0, import_zod5.boolean)().default(true),
+      tablesFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      schemaFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).default(["public"]),
+      introspectCasing: (0, import_zod5.union)([(0, import_zod5.literal)("camel"), (0, import_zod5.literal)("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = (0, import_zod5.object)({
+      schema: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]),
+      out: (0, import_zod5.string)().optional().default("./drizzle"),
+      breakpoints: (0, import_zod5.boolean)().default(true)
+    });
+    configPushSchema = (0, import_zod5.object)({
+      dialect: dialect3,
+      schema: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]),
+      tablesFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).optional(),
+      schemaFilter: (0, import_zod5.union)([(0, import_zod5.string)(), (0, import_zod5.string)().array()]).default(["public"]),
+      verbose: (0, import_zod5.boolean)().default(false),
+      strict: (0, import_zod5.boolean)().default(false),
+      out: (0, import_zod5.string)().optional()
+    });
+  }
+});
+
 // src/cli/validations/outputs.ts
 var withStyle;
 var init_outputs = __esm({
   "src/cli/validations/outputs.ts"() {
     "use strict";
     init_source();
+    init_common2();
     withStyle = {
       error: (str) => `${source_default.red(`${source_default.white.bgRed(" Invalid input ")} ${str}`)}`,
       warning: (str) => `${source_default.white.bgGray(" Warning ")} ${str}`,
@@ -9156,193 +9267,119 @@ var init_outputs = __esm({
 });
 
 // src/cli/validations/mysql.ts
-var import_zod4, mysqlCredentials;
+var import_zod6, mysqlCredentials;
 var init_mysql = __esm({
   "src/cli/validations/mysql.ts"() {
     "use strict";
-    import_zod4 = require("zod");
+    import_zod6 = require("zod");
     init_outputs();
-    mysqlCredentials = (0, import_zod4.union)([
-      (0, import_zod4.object)({
-        host: (0, import_zod4.string)(),
-        port: import_zod4.coerce.number().optional(),
-        user: (0, import_zod4.string)().default("mysql"),
-        password: (0, import_zod4.string)().optional(),
-        database: (0, import_zod4.string)(),
-        ssl: (0, import_zod4.union)([
-          (0, import_zod4.string)(),
-          (0, import_zod4.object)({
-            pfx: (0, import_zod4.string)().optional(),
-            key: (0, import_zod4.string)().optional(),
-            passphrase: (0, import_zod4.string)().optional(),
-            cert: (0, import_zod4.string)().optional(),
-            ca: (0, import_zod4.union)([(0, import_zod4.string)(), (0, import_zod4.string)().array()]).optional(),
-            crl: (0, import_zod4.union)([(0, import_zod4.string)(), (0, import_zod4.string)().array()]).optional(),
-            ciphers: (0, import_zod4.string)().optional(),
-            rejectUnauthorized: (0, import_zod4.boolean)().optional()
+    init_common2();
+    init_views();
+    mysqlCredentials = (0, import_zod6.union)([
+      (0, import_zod6.object)({
+        host: (0, import_zod6.string)().min(1),
+        port: import_zod6.coerce.number().min(1).optional(),
+        user: (0, import_zod6.string)().min(1).optional(),
+        password: (0, import_zod6.string)().min(1).optional(),
+        database: (0, import_zod6.string)().min(1),
+        ssl: (0, import_zod6.union)([
+          (0, import_zod6.string)(),
+          (0, import_zod6.object)({
+            pfx: (0, import_zod6.string)().optional(),
+            key: (0, import_zod6.string)().optional(),
+            passphrase: (0, import_zod6.string)().optional(),
+            cert: (0, import_zod6.string)().optional(),
+            ca: (0, import_zod6.union)([(0, import_zod6.string)(), (0, import_zod6.string)().array()]).optional(),
+            crl: (0, import_zod6.union)([(0, import_zod6.string)(), (0, import_zod6.string)().array()]).optional(),
+            ciphers: (0, import_zod6.string)().optional(),
+            rejectUnauthorized: (0, import_zod6.boolean)().optional()
           })
         ]).optional()
       }),
-      (0, import_zod4.object)({
-        url: (0, import_zod4.string)()
+      (0, import_zod6.object)({
+        url: (0, import_zod6.string)().min(1)
       })
     ]);
   }
 });
 
-// src/cli/validations/pg.ts
-var import_zod5, postgresCredentials;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
+// src/cli/validations/postgres.ts
+var import_zod7, postgresCredentials;
+var init_postgres = __esm({
+  "src/cli/validations/postgres.ts"() {
     "use strict";
-    import_zod5 = require("zod");
-    init_outputs();
-    postgresCredentials = (0, import_zod5.union)([
-      (0, import_zod5.object)({
-        host: (0, import_zod5.string)(),
-        port: import_zod5.coerce.number().optional(),
-        user: (0, import_zod5.string)().default("postgres"),
-        password: (0, import_zod5.string)().optional(),
-        database: (0, import_zod5.string)(),
-        ssl: (0, import_zod5.union)([
-          (0, import_zod5.literal)("require"),
-          (0, import_zod5.literal)("allow"),
-          (0, import_zod5.literal)("prefer"),
-          (0, import_zod5.literal)("verify-full"),
-          (0, import_zod5.boolean)(),
-          (0, import_zod5.object)({}).passthrough()
-        ])
+    import_zod7 = require("zod");
+    init_common2();
+    init_views();
+    postgresCredentials = (0, import_zod7.union)([
+      (0, import_zod7.object)({
+        driver: (0, import_zod7.undefined)(),
+        host: (0, import_zod7.string)().min(1),
+        port: import_zod7.coerce.number().min(1).optional(),
+        user: (0, import_zod7.string)().min(1).optional(),
+        password: (0, import_zod7.string)().min(1).optional(),
+        database: (0, import_zod7.string)().min(1),
+        ssl: (0, import_zod7.union)([
+          (0, import_zod7.literal)("require"),
+          (0, import_zod7.literal)("allow"),
+          (0, import_zod7.literal)("prefer"),
+          (0, import_zod7.literal)("verify-full"),
+          (0, import_zod7.boolean)(),
+          (0, import_zod7.object)({}).passthrough()
+        ]).optional()
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
-      (0, import_zod5.object)({
-        url: (0, import_zod5.string)()
+      (0, import_zod7.object)({
+        driver: (0, import_zod7.undefined)(),
+        url: (0, import_zod7.string)().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
-      (0, import_zod5.object)({
-        driver: (0, import_zod5.literal)("aws-data-api"),
-        database: (0, import_zod5.string)(),
-        secretArn: (0, import_zod5.string)(),
-        resourceArn: (0, import_zod5.string)()
+      (0, import_zod7.object)({
+        driver: (0, import_zod7.literal)("aws-data-api"),
+        database: (0, import_zod7.string)().min(1),
+        secretArn: (0, import_zod7.string)().min(1),
+        resourceArn: (0, import_zod7.string)().min(1)
       })
     ]);
   }
 });
 
 // src/cli/validations/sqlite.ts
-var import_zod6, sqliteCredentials;
+var import_zod8, sqliteCredentials;
 var init_sqlite = __esm({
   "src/cli/validations/sqlite.ts"() {
     "use strict";
-    import_zod6 = require("zod");
-    init_outputs();
-    sqliteCredentials = (0, import_zod6.union)([
-      (0, import_zod6.object)({
-        driver: (0, import_zod6.literal)("turso"),
-        url: (0, import_zod6.string)(),
-        authToken: (0, import_zod6.string)()
+    import_zod8 = require("zod");
+    init_common2();
+    init_views();
+    init_global();
+    sqliteCredentials = (0, import_zod8.union)([
+      (0, import_zod8.object)({
+        driver: (0, import_zod8.literal)("turso"),
+        url: (0, import_zod8.string)().min(1),
+        authToken: (0, import_zod8.string)().min(1).optional()
       }),
-      (0, import_zod6.object)({
-        driver: (0, import_zod6.literal)("d1-http"),
-        accountId: (0, import_zod6.string)(),
-        databaseId: (0, import_zod6.string)(),
-        token: (0, import_zod6.string)()
+      (0, import_zod8.object)({
+        driver: (0, import_zod8.literal)("d1-http"),
+        accountId: (0, import_zod8.string)().min(1),
+        databaseId: (0, import_zod8.string)().min(1),
+        token: (0, import_zod8.string)().min(1)
       }),
-      (0, import_zod6.object)({
-        url: (0, import_zod6.string)()
+      (0, import_zod8.object)({
+        driver: (0, import_zod8.undefined)(),
+        url: (0, import_zod8.string)().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       })
     ]);
   }
 });
 
-// src/schemaValidator.ts
-var import_zod7, dialect3, commonSquashedSchema, commonSchema;
-var init_schemaValidator = __esm({
-  "src/schemaValidator.ts"() {
-    "use strict";
-    import_zod7 = require("zod");
-    init_mysqlSchema();
-    init_pgSchema();
-    init_sqliteSchema();
-    dialect3 = (0, import_zod7.enum)(["postgresql", "mysql", "sqlite"]);
-    commonSquashedSchema = (0, import_zod7.union)([
-      pgSchemaSquashed,
-      mysqlSchemaSquashed,
-      SQLiteSchemaSquashed
-    ]);
-    commonSchema = (0, import_zod7.union)([
-      pgSchema,
-      mysqlSchema,
-      sqliteSchema
-    ]);
-  }
-});
-
-// src/cli/validations/common.ts
-var import_zod8, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
-var init_common2 = __esm({
-  "src/cli/validations/common.ts"() {
-    "use strict";
-    init_outputs();
-    import_zod8 = require("zod");
-    init_schemaValidator();
-    sqliteDriver = (0, import_zod8.union)([
-      (0, import_zod8.literal)("better-sqlite"),
-      (0, import_zod8.literal)("turso"),
-      (0, import_zod8.literal)("libsql"),
-      (0, import_zod8.literal)("d1"),
-      (0, import_zod8.literal)("d1-http"),
-      (0, import_zod8.literal)("expo")
-    ]);
-    postgresDriver = (0, import_zod8.literal)("aws-data-api");
-    mysqlDriver = (0, import_zod8.literal)("mysql2");
-    driver = (0, import_zod8.union)([sqliteDriver, postgresDriver, mysqlDriver]);
-    configCommonSchema = (0, import_zod8.object)({
-      dialect: dialect3,
-      schema: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      out: (0, import_zod8.string)().optional(),
-      breakpoints: (0, import_zod8.boolean)().optional().default(true),
-      driver: driver.optional(),
-      tablesFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      schemaFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).default(["public"])
-    });
-    casing = (0, import_zod8.union)([(0, import_zod8.literal)("camel"), (0, import_zod8.literal)("preserve")]).default(
-      "preserve"
-    );
-    introspectParams = (0, import_zod8.object)({
-      schema: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      out: (0, import_zod8.string)().optional().default("./drizzle"),
-      breakpoints: (0, import_zod8.boolean)().default(true),
-      tablesFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      schemaFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).default(["public"]),
-      introspect: (0, import_zod8.object)({
-        casing
-      }).default({ casing: "camel" })
-    });
-    configIntrospectCliSchema = (0, import_zod8.object)({
-      schema: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      out: (0, import_zod8.string)().optional().default("./drizzle"),
-      breakpoints: (0, import_zod8.boolean)().default(true),
-      tablesFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      schemaFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).default(["public"]),
-      introspectCasing: (0, import_zod8.union)([(0, import_zod8.literal)("camel"), (0, import_zod8.literal)("preserve")]).default(
-        "camel"
-      )
-    });
-    configGenerateSchema = (0, import_zod8.object)({
-      schema: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]),
-      out: (0, import_zod8.string)().optional().default("./drizzle"),
-      breakpoints: (0, import_zod8.boolean)().default(true)
-    });
-    configPushSchema = (0, import_zod8.object)({
-      dialect: dialect3,
-      schema: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]),
-      tablesFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).optional(),
-      schemaFilter: (0, import_zod8.union)([(0, import_zod8.string)(), (0, import_zod8.string)().array()]).default(["public"]),
-      verbose: (0, import_zod8.boolean)().default(false),
-      strict: (0, import_zod8.boolean)().default(false),
-      out: (0, import_zod8.string)().optional()
-    });
-  }
-});
-
 // src/cli/validations/cli.ts
 var import_zod9, cliConfigGenerate, pushParams, pullParams, configCheck, cliConfigCheck;
 var init_cli = __esm({
@@ -9401,7 +9438,7 @@ var init_studio = __esm({
     init_mysql();
     init_sqlite();
     init_schemaValidator();
-    init_pg();
+    init_postgres();
     credentials = (0, import_zod10.intersection)(
       postgresCredentials,
       mysqlCredentials,
@@ -9443,7 +9480,7 @@ var init_utils6 = __esm({
     import_hanji2 = require("hanji");
     init_global();
     init_mysql();
-    init_pg();
+    init_postgres();
     init_sqlite();
     init_common2();
     init_schemaValidator();
@@ -12075,7 +12112,7 @@ var init_jsonStatements = __esm({
         uniqueConstraints: Object.values(uniqueConstraints)
       };
     };
-    prepareMySqlCreateTableJson = (table4, json2) => {
+    prepareMySqlCreateTableJson = (table4, json2, internals) => {
       const { name: name2, schema: schema4, columns, compositePrimaryKeys, uniqueConstraints } = table4;
       return {
         type: "create_table",
@@ -12084,7 +12121,8 @@ var init_jsonStatements = __esm({
         columns: Object.values(columns),
         compositePKs: Object.values(compositePrimaryKeys),
         compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name2].compositePrimaryKeys[MySqlSquasher.unsquashPK(Object.values(compositePrimaryKeys)[0]).name].name : "",
-        uniqueConstraints: Object.values(uniqueConstraints)
+        uniqueConstraints: Object.values(uniqueConstraints),
+        internals
       };
     };
     prepareSQLiteCreateTable = (table4) => {
@@ -12838,13 +12876,14 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareCreateIndexesJson = (tableName, schema4, indexes) => {
+    prepareCreateIndexesJson = (tableName, schema4, indexes, internal) => {
       return Object.values(indexes).map((indexData) => {
         return {
           type: "create_index",
           tableName,
           data: indexData,
-          schema: schema4
+          schema: schema4,
+          internal
         };
       });
     };
@@ -13781,7 +13820,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);
@@ -13880,7 +13924,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = alteredTables.map((it) => {
@@ -13940,7 +13985,11 @@ var init_snapshotsDiffer = __esm({
         (t) => t.type === "delete_reference"
       );
       const jsonMySqlCreateTables = createdTables.map((it) => {
-        return prepareMySqlCreateTableJson(it, curFull);
+        return prepareMySqlCreateTableJson(
+          it,
+          curFull,
+          curFull.internal
+        );
       });
       jsonStatements.push(...jsonMySqlCreateTables);
       jsonStatements.push(...jsonDropTables);
@@ -13980,7 +14029,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,
@@ -14060,7 +14109,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);
@@ -14162,7 +14216,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = allAltered.map((it) => {
@@ -14596,7 +14651,14 @@ var init_sqlgenerator = __esm({
         return statement.type === "create_table" && dialect7 === "mysql";
       }
       convert(st) {
-        const { tableName, columns, schema: schema4, compositePKs, uniqueConstraints } = st;
+        const {
+          tableName,
+          columns,
+          schema: schema4,
+          compositePKs,
+          uniqueConstraints,
+          internals
+        } = st;
         let statement = "";
         statement += `CREATE TABLE \`${tableName}\` (
 `;
@@ -14619,7 +14681,10 @@ 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) => {
+              return internals?.indexes ? internals?.indexes[unsquashedUnique.name]?.columns[it]?.isExpression ? it : `\`${it}\`` : `\`${it}\``;
+            }).join(",");
+            statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(${uniqueString})`;
           }
         }
         statement += `
@@ -15548,8 +15613,10 @@ ${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} \`${name2}\` ON \`${statement.tableName}\` (${value});`;
+        const uniqueString = columns.map((it) => {
+          return statement.internal?.indexes ? statement.internal?.indexes[name2]?.columns[it]?.isExpression ? it : `\`${it}\`` : `\`${it}\``;
+        }).join(",");
+        return `CREATE ${indexPart} \`${name2}\` ON \`${statement.tableName}\` (${uniqueString});`;
       }
     };
     CreateSqliteIndexConvertor = class extends Convertor {
@@ -15562,8 +15629,10 @@ ${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} \`${name2}\` ON \`${statement.tableName}\` (${value})${whereStatement};`;
+        const uniqueString = columns.map((it) => {
+          return statement.internal?.indexes ? statement.internal?.indexes[name2]?.columns[it]?.isExpression ? it : `\`${it}\`` : `\`${it}\``;
+        }).join(",");
+        return `CREATE ${indexPart} \`${name2}\` ON \`${statement.tableName}\` (${uniqueString})${whereStatement};`;
       }
     };
     PgDropIndexConvertor = class extends Convertor {
@@ -19139,6 +19208,7 @@ var init_sqliteSerializer = __esm({
     dialect5 = new SQLiteSyncDialect();
     generateSqliteSnapshot = (tables) => {
       const result = {};
+      const internal = { indexes: {} };
       for (const table4 of tables) {
         const columnsObject = {};
         const indexesObject = {};
@@ -19225,7 +19295,25 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const name2 = value.config.name;
           let indexColumns = columns2.map((it) => {
             if (is(it, SQL)) {
-              return dialect5.sqlToQuery(it, "indexes").sql;
+              const sql2 = dialect5.sqlToQuery(it, "indexes").sql;
+              if (typeof internal.indexes[name2] === "undefined") {
+                internal.indexes[name2] = {
+                  columns: {
+                    [sql2]: {
+                      isExpression: true
+                    }
+                  }
+                };
+              } else {
+                if (typeof internal.indexes[name2]?.columns[sql2] === "undefined") {
+                  internal.indexes[name2].columns[sql2] = {
+                    isExpression: true
+                  };
+                } else {
+                  internal.indexes[name2].columns[sql2].isExpression = true;
+                }
+              }
+              return sql2;
             } else {
               return it.name;
             }
@@ -19299,7 +19387,8 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase2 = async (db, tablesFilter = (table4) => true, progressCallback) => {
@@ -23561,6 +23650,7 @@ var init_mysqlSerializer = __esm({
     dialect6 = new MySqlDialect();
     generateMySqlSnapshot = (tables) => {
       const result = {};
+      const internal = { tables: {}, indexes: {} };
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -23712,9 +23802,27 @@ The unique constraint ${source_default.underline.blue(
           const name2 = value.config.name;
           let indexColumns = columns2.map((it) => {
             if (is(it, SQL)) {
-              return dialect6.sqlToQuery(it, "indexes").sql;
+              const sql2 = dialect6.sqlToQuery(it, "indexes").sql;
+              if (typeof internal.indexes[name2] === "undefined") {
+                internal.indexes[name2] = {
+                  columns: {
+                    [sql2]: {
+                      isExpression: true
+                    }
+                  }
+                };
+              } else {
+                if (typeof internal.indexes[name2]?.columns[sql2] === "undefined") {
+                  internal.indexes[name2].columns[sql2] = {
+                    isExpression: true
+                  };
+                } else {
+                  internal.indexes[name2].columns[sql2].isExpression = true;
+                }
+              }
+              return sql2;
             } else {
-              return it.name;
+              return `${it.name}`;
             }
           });
           if (value.config.unique) {
@@ -23781,12 +23889,13 @@ We have encountered a collision between the index name on columns ${source_defau
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase3 = async (db, inputSchema, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
-      const internals = { tables: {} };
+      const internals = { tables: {}, indexes: {} };
       const columns = await db.query(`select * from information_schema.columns
 	where table_schema = '${inputSchema}' and table_name != '__drizzle_migrations'
 	order by table_name, ordinal_position;`);
@@ -25329,7 +25438,9 @@ var generateSQLiteMigration = async (prev, cur) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   return sqlStatements;
 };
@@ -25358,7 +25469,9 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,