drizzle-kit 0.22.0-12a1bf8 → 0.22.0-25da1e6

package/payload.mjs

@@ -8005,7 +8005,16 @@ var init_mysqlSchema = __esm({
             object({ isDefaultAnExpression: boolean().optional() }).optional()
           )
         }).optional()
-      )
+      ).optional(),
+      indexes: record(
+        string(),
+        object({
+          columns: record(
+            string(),
+            object({ isExpression: boolean().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
     }).optional();
     dialect = literal("mysql");
     schemaHash = object({
@@ -8690,7 +8699,7 @@ import {
   literal as literal3,
   union as union4
 } from "zod";
-var 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 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";
@@ -8767,6 +8776,17 @@ var init_sqliteSchema = __esm({
         columns: record3(string3(), string3())
       })
     }).strict();
+    kitInternals3 = object3({
+      indexes: record3(
+        string3(),
+        object3({
+          columns: record3(
+            string3(),
+            object3({ isExpression: boolean3().optional() }).optional()
+          )
+        }).optional()
+      ).optional()
+    }).optional();
     latestVersion = literal3("6");
     schemaInternal2 = object3({
       version: latestVersion,
@@ -8776,7 +8796,8 @@ var init_sqliteSchema = __esm({
       _meta: object3({
         tables: record3(string3(), string3()),
         columns: record3(string3(), string3())
-      })
+      }),
+      internal: kitInternals3
     }).strict();
     schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
     schemaV42 = schemaInternalV42.merge(schemaHash3).strict();
@@ -8965,7 +8986,7 @@ var init_views = __esm({
     init_source();
     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;
@@ -9172,12 +9193,102 @@ var init_serializer = __esm({
   }
 });
 
+// src/schemaValidator.ts
+import { enum as enumType4, union as union5 } from "zod";
+var dialect3, commonSquashedSchema, commonSchema;
+var init_schemaValidator = __esm({
+  "src/schemaValidator.ts"() {
+    "use strict";
+    init_mysqlSchema();
+    init_pgSchema();
+    init_sqliteSchema();
+    dialect3 = enumType4(["postgresql", "mysql", "sqlite"]);
+    commonSquashedSchema = union5([
+      pgSchemaSquashed,
+      mysqlSchemaSquashed,
+      SQLiteSchemaSquashed
+    ]);
+    commonSchema = union5([
+      pgSchema,
+      mysqlSchema,
+      sqliteSchema
+    ]);
+  }
+});
+
+// src/cli/validations/common.ts
+import { object as object4, string as string4, union as union6, boolean as boolean4, literal as literal4 } from "zod";
+var sqliteDriversLiterals, sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
+var init_common2 = __esm({
+  "src/cli/validations/common.ts"() {
+    "use strict";
+    init_outputs();
+    init_schemaValidator();
+    sqliteDriversLiterals = [
+      literal4("turso"),
+      literal4("d1-http"),
+      literal4("expo")
+    ];
+    sqliteDriver = union6(sqliteDriversLiterals);
+    postgresDriver = literal4("aws-data-api");
+    mysqlDriver = literal4("mysql2");
+    driver = union6([sqliteDriver, postgresDriver, mysqlDriver]);
+    configCommonSchema = object4({
+      dialect: dialect3,
+      schema: union6([string4(), string4().array()]).optional(),
+      out: string4().optional(),
+      breakpoints: boolean4().optional().default(true),
+      driver: driver.optional(),
+      tablesFilter: union6([string4(), string4().array()]).optional(),
+      schemaFilter: union6([string4(), string4().array()]).default(["public"])
+    });
+    casing = union6([literal4("camel"), literal4("preserve")]).default(
+      "preserve"
+    );
+    introspectParams = object4({
+      schema: union6([string4(), string4().array()]).optional(),
+      out: string4().optional().default("./drizzle"),
+      breakpoints: boolean4().default(true),
+      tablesFilter: union6([string4(), string4().array()]).optional(),
+      schemaFilter: union6([string4(), string4().array()]).default(["public"]),
+      introspect: object4({
+        casing
+      }).default({ casing: "camel" })
+    });
+    configIntrospectCliSchema = object4({
+      schema: union6([string4(), string4().array()]).optional(),
+      out: string4().optional().default("./drizzle"),
+      breakpoints: boolean4().default(true),
+      tablesFilter: union6([string4(), string4().array()]).optional(),
+      schemaFilter: union6([string4(), string4().array()]).default(["public"]),
+      introspectCasing: union6([literal4("camel"), literal4("preserve")]).default(
+        "camel"
+      )
+    });
+    configGenerateSchema = object4({
+      schema: union6([string4(), string4().array()]),
+      out: string4().optional().default("./drizzle"),
+      breakpoints: boolean4().default(true)
+    });
+    configPushSchema = object4({
+      dialect: dialect3,
+      schema: union6([string4(), string4().array()]),
+      tablesFilter: union6([string4(), string4().array()]).optional(),
+      schemaFilter: union6([string4(), string4().array()]).default(["public"]),
+      verbose: boolean4().default(false),
+      strict: boolean4().default(false),
+      out: string4().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}`,
@@ -9190,203 +9301,131 @@ var init_outputs = __esm({
 });
 
 // src/cli/validations/mysql.ts
-import { boolean as boolean4, coerce, object as object4, string as string4, union as union5 } from "zod";
+import { boolean as boolean5, coerce, object as object5, string as string5, union as union7 } from "zod";
 var mysqlCredentials;
 var init_mysql = __esm({
   "src/cli/validations/mysql.ts"() {
     "use strict";
     init_outputs();
-    mysqlCredentials = union5([
-      object4({
-        host: string4(),
-        port: coerce.number().optional(),
-        user: string4().default("mysql"),
-        password: string4().optional(),
-        database: string4(),
-        ssl: union5([
-          string4(),
-          object4({
-            pfx: string4().optional(),
-            key: string4().optional(),
-            passphrase: string4().optional(),
-            cert: string4().optional(),
-            ca: union5([string4(), string4().array()]).optional(),
-            crl: union5([string4(), string4().array()]).optional(),
-            ciphers: string4().optional(),
-            rejectUnauthorized: boolean4().optional()
+    init_common2();
+    init_views();
+    mysqlCredentials = union7([
+      object5({
+        host: string5().min(1),
+        port: coerce.number().min(1).optional(),
+        user: string5().min(1).optional(),
+        password: string5().min(1).optional(),
+        database: string5().min(1),
+        ssl: union7([
+          string5(),
+          object5({
+            pfx: string5().optional(),
+            key: string5().optional(),
+            passphrase: string5().optional(),
+            cert: string5().optional(),
+            ca: union7([string5(), string5().array()]).optional(),
+            crl: union7([string5(), string5().array()]).optional(),
+            ciphers: string5().optional(),
+            rejectUnauthorized: boolean5().optional()
           })
         ]).optional()
       }),
-      object4({
-        url: string4()
+      object5({
+        url: string5().min(1)
       })
     ]);
   }
 });
 
-// src/cli/validations/pg.ts
-import { boolean as boolean5, coerce as coerce2, literal as literal4, object as object5, string as string5, union as union6 } from "zod";
+// src/cli/validations/postgres.ts
+import {
+  boolean as boolean6,
+  coerce as coerce2,
+  literal as literal5,
+  object as object6,
+  string as string6,
+  undefined as undefined2,
+  union as union8
+} from "zod";
 var postgresCredentials;
-var init_pg = __esm({
-  "src/cli/validations/pg.ts"() {
+var init_postgres = __esm({
+  "src/cli/validations/postgres.ts"() {
     "use strict";
-    init_outputs();
-    postgresCredentials = union6([
-      object5({
-        host: string5(),
-        port: coerce2.number().optional(),
-        user: string5().default("postgres"),
-        password: string5().optional(),
-        database: string5(),
-        ssl: union6([
-          literal4("require"),
-          literal4("allow"),
-          literal4("prefer"),
-          literal4("verify-full"),
-          boolean5(),
-          object5({}).passthrough()
-        ])
+    init_common2();
+    init_views();
+    postgresCredentials = union8([
+      object6({
+        driver: undefined2(),
+        host: string6().min(1),
+        port: coerce2.number().min(1).optional(),
+        user: string6().min(1).optional(),
+        password: string6().min(1).optional(),
+        database: string6().min(1),
+        ssl: union8([
+          literal5("require"),
+          literal5("allow"),
+          literal5("prefer"),
+          literal5("verify-full"),
+          boolean6(),
+          object6({}).passthrough()
+        ]).optional()
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
-      object5({
-        url: string5()
+      object6({
+        driver: undefined2(),
+        url: string6().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       }),
-      object5({
-        driver: literal4("aws-data-api"),
-        database: string5(),
-        secretArn: string5(),
-        resourceArn: string5()
+      object6({
+        driver: literal5("aws-data-api"),
+        database: string6().min(1),
+        secretArn: string6().min(1),
+        resourceArn: string6().min(1)
       })
     ]);
   }
 });
 
 // src/cli/validations/sqlite.ts
-import { literal as literal5, object as object6, string as string6, union as union7 } from "zod";
+import { literal as literal6, object as object7, string as string7, undefined as undefined3, union as union9 } from "zod";
 var sqliteCredentials;
 var init_sqlite = __esm({
   "src/cli/validations/sqlite.ts"() {
     "use strict";
-    init_outputs();
-    sqliteCredentials = union7([
-      object6({
-        driver: literal5("turso"),
-        url: string6(),
-        authToken: string6()
+    init_common2();
+    init_views();
+    init_global();
+    sqliteCredentials = union9([
+      object7({
+        driver: literal6("turso"),
+        url: string7().min(1),
+        authToken: string7().min(1).optional()
       }),
-      object6({
-        driver: literal5("d1-http"),
-        accountId: string6(),
-        databaseId: string6(),
-        token: string6()
+      object7({
+        driver: literal6("d1-http"),
+        accountId: string7().min(1),
+        databaseId: string7().min(1),
+        token: string7().min(1)
       }),
-      object6({
-        url: string6()
+      object7({
+        driver: undefined3(),
+        url: string7().min(1)
+      }).transform((o) => {
+        delete o.driver;
+        return o;
       })
     ]);
   }
 });
 
-// src/schemaValidator.ts
-import { enum as enumType4, union as union8 } from "zod";
-var dialect3, commonSquashedSchema, commonSchema;
-var init_schemaValidator = __esm({
-  "src/schemaValidator.ts"() {
-    "use strict";
-    init_mysqlSchema();
-    init_pgSchema();
-    init_sqliteSchema();
-    dialect3 = enumType4(["postgresql", "mysql", "sqlite"]);
-    commonSquashedSchema = union8([
-      pgSchemaSquashed,
-      mysqlSchemaSquashed,
-      SQLiteSchemaSquashed
-    ]);
-    commonSchema = union8([
-      pgSchema,
-      mysqlSchema,
-      sqliteSchema
-    ]);
-  }
-});
-
-// src/cli/validations/common.ts
-import {
-  object as object7,
-  string as string7,
-  union as union9,
-  boolean as boolean6,
-  literal as literal6
-} from "zod";
-var sqliteDriver, postgresDriver, mysqlDriver, driver, configCommonSchema, casing, introspectParams, configIntrospectCliSchema, configGenerateSchema, configPushSchema;
-var init_common2 = __esm({
-  "src/cli/validations/common.ts"() {
-    "use strict";
-    init_outputs();
-    init_schemaValidator();
-    sqliteDriver = union9([
-      literal6("better-sqlite"),
-      literal6("turso"),
-      literal6("libsql"),
-      literal6("d1"),
-      literal6("d1-http"),
-      literal6("expo")
-    ]);
-    postgresDriver = literal6("aws-data-api");
-    mysqlDriver = literal6("mysql2");
-    driver = union9([sqliteDriver, postgresDriver, mysqlDriver]);
-    configCommonSchema = object7({
-      dialect: dialect3,
-      schema: union9([string7(), string7().array()]).optional(),
-      out: string7().optional(),
-      breakpoints: boolean6().optional().default(true),
-      driver: driver.optional(),
-      tablesFilter: union9([string7(), string7().array()]).optional(),
-      schemaFilter: union9([string7(), string7().array()]).default(["public"])
-    });
-    casing = union9([literal6("camel"), literal6("preserve")]).default(
-      "preserve"
-    );
-    introspectParams = object7({
-      schema: union9([string7(), string7().array()]).optional(),
-      out: string7().optional().default("./drizzle"),
-      breakpoints: boolean6().default(true),
-      tablesFilter: union9([string7(), string7().array()]).optional(),
-      schemaFilter: union9([string7(), string7().array()]).default(["public"]),
-      introspect: object7({
-        casing
-      }).default({ casing: "camel" })
-    });
-    configIntrospectCliSchema = object7({
-      schema: union9([string7(), string7().array()]).optional(),
-      out: string7().optional().default("./drizzle"),
-      breakpoints: boolean6().default(true),
-      tablesFilter: union9([string7(), string7().array()]).optional(),
-      schemaFilter: union9([string7(), string7().array()]).default(["public"]),
-      introspectCasing: union9([literal6("camel"), literal6("preserve")]).default(
-        "camel"
-      )
-    });
-    configGenerateSchema = object7({
-      schema: union9([string7(), string7().array()]),
-      out: string7().optional().default("./drizzle"),
-      breakpoints: boolean6().default(true)
-    });
-    configPushSchema = object7({
-      dialect: dialect3,
-      schema: union9([string7(), string7().array()]),
-      tablesFilter: union9([string7(), string7().array()]).optional(),
-      schemaFilter: union9([string7(), string7().array()]).default(["public"]),
-      verbose: boolean6().default(false),
-      strict: boolean6().default(false),
-      out: string7().optional()
-    });
-  }
-});
-
 // src/cli/validations/cli.ts
 import {
   boolean as boolean7,
-  intersection as intersection2,
+  intersection,
   literal as literal7,
   object as object8,
   string as string8,
@@ -9430,7 +9469,7 @@ var init_cli = __esm({
       dialect: dialect3.optional(),
       out: string8().optional()
     });
-    cliConfigCheck = intersection2(
+    cliConfigCheck = intersection(
       object8({
         config: string8().optional()
       }),
@@ -9440,7 +9479,7 @@ var init_cli = __esm({
 });
 
 // src/cli/validations/studio.ts
-import { coerce as coerce4, intersection as intersection3, object as object9, string as string9, union as union11 } from "zod";
+import { coerce as coerce3, intersection as intersection2, object as object9, string as string9, union as union11 } from "zod";
 var credentials, studioCliParams, studioConfig;
 var init_studio = __esm({
   "src/cli/validations/studio.ts"() {
@@ -9448,14 +9487,14 @@ var init_studio = __esm({
     init_mysql();
     init_sqlite();
     init_schemaValidator();
-    init_pg();
-    credentials = intersection3(
+    init_postgres();
+    credentials = intersection2(
       postgresCredentials,
       mysqlCredentials,
       sqliteCredentials
     );
     studioCliParams = object9({
-      port: coerce4.number().optional().default(4983),
+      port: coerce3.number().optional().default(4983),
       host: string9().optional().default("127.0.0.1"),
       config: string9().optional()
     });
@@ -9491,7 +9530,7 @@ var init_utils6 = __esm({
     init_views();
     init_global();
     init_mysql();
-    init_pg();
+    init_postgres();
     init_sqlite();
     init_common2();
     init_schemaValidator();
@@ -12122,7 +12161,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",
@@ -12131,7 +12170,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) => {
@@ -12885,13 +12925,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
         };
       });
     };
@@ -13091,7 +13132,7 @@ import {
   array as array2,
   record as record4,
   literal as literal8,
-  never
+  never as never2
 } from "zod";
 var makeChanged, makeSelfOrChanged, makePatched, makeSelfOrPatched, columnSchema, alteredColumnSchema, enumSchema2, changedEnumSchema, tableScheme, alteredTableScheme, diffResultScheme, diffResultSchemeMysql, diffResultSchemeSQLite, schemaChangeFor, nameChangeFor, nameSchemaChangeFor, columnChangeFor, applyPgSnapshotsDiff, applyMysqlSnapshotsDiff, applySqliteSnapshotsDiff;
 var init_snapshotsDiffer = __esm({
@@ -13253,11 +13294,11 @@ var init_snapshotsDiffer = __esm({
     }).strict();
     diffResultSchemeMysql = object11({
       alteredTablesWithColumns: alteredTableScheme.array(),
-      alteredEnums: never().array()
+      alteredEnums: never2().array()
     }).strict();
     diffResultSchemeSQLite = object11({
       alteredTablesWithColumns: alteredTableScheme.array(),
-      alteredEnums: never().array()
+      alteredEnums: never2().array()
     }).strict();
     schemaChangeFor = (table4, renamedSchemas) => {
       for (let ren of renamedSchemas) {
@@ -13839,7 +13880,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);
@@ -13938,7 +13984,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = alteredTables.map((it) => {
@@ -13998,7 +14045,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);
@@ -14038,7 +14089,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,
@@ -14118,7 +14169,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);
@@ -14220,7 +14276,8 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {}
+          it.addedIndexes || {},
+          curFull.internal
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = allAltered.map((it) => {
@@ -14654,7 +14711,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}\` (
 `;
@@ -14677,7 +14741,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 += `
@@ -15606,8 +15673,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 {
@@ -15620,8 +15689,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 {
@@ -19197,6 +19268,7 @@ var init_sqliteSerializer = __esm({
     dialect5 = new SQLiteSyncDialect();
     generateSqliteSnapshot = (tables) => {
       const result = {};
+      const internal = { indexes: {} };
       for (const table4 of tables) {
         const columnsObject = {};
         const indexesObject = {};
@@ -19283,7 +19355,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;
             }
@@ -19357,7 +19447,8 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase2 = async (db, tablesFilter = (table4) => true, progressCallback) => {
@@ -23619,6 +23710,7 @@ var init_mysqlSerializer = __esm({
     dialect6 = new MySqlDialect();
     generateMySqlSnapshot = (tables) => {
       const result = {};
+      const internal = { tables: {}, indexes: {} };
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -23770,9 +23862,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) {
@@ -23839,12 +23949,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;`);
@@ -25373,7 +25484,9 @@ var generateSQLiteMigration = async (prev, cur) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   return sqlStatements;
 };
@@ -25402,7 +25515,9 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,