drizzle-kit 0.22.0-29f7626 → 0.22.0-3c62a84

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();
@@ -12140,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",
@@ -12149,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) => {
@@ -12903,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
         };
       });
     };
@@ -13857,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);
@@ -13956,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) => {
@@ -14016,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);
@@ -14056,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,
@@ -14136,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);
@@ -14238,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) => {
@@ -14672,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}\` (
 `;
@@ -14695,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 += `
@@ -15624,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 {
@@ -15638,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 {
@@ -19215,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 = {};
@@ -19301,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;
             }
@@ -19375,7 +19447,8 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase2 = async (db, tablesFilter = (table4) => true, progressCallback) => {
@@ -23637,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,
@@ -23788,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) {
@@ -23857,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;`);
@@ -25391,7 +25484,9 @@ var generateSQLiteMigration = async (prev, cur) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   return sqlStatements;
 };
@@ -25420,7 +25515,9 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,

package/utils-studio.js

@@ -4918,7 +4918,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({
@@ -5338,7 +5347,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, schema2, tableSquashed3, schemaSquashed2, 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, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -5416,6 +5425,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,
@@ -5425,7 +5445,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();

package/utils-studio.mjs

@@ -4919,7 +4919,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({
@@ -5339,7 +5348,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, schema2, tableSquashed3, schemaSquashed2, 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, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -5417,6 +5426,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,
@@ -5426,7 +5446,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();

package/utils.js

@@ -4914,7 +4914,16 @@ var kitInternals = objectType({
         objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
       )
     }).optional()
-  )
+  ).optional(),
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
 }).optional();
 var dialect = literalType("mysql");
 var schemaHash = objectType({
@@ -5395,6 +5404,17 @@ var schemaInternalV52 = objectType({
     columns: recordType(stringType(), stringType())
   })
 }).strict();
+var kitInternals3 = objectType({
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
+}).optional();
 var latestVersion = literalType("6");
 var schemaInternal2 = objectType({
   version: latestVersion,
@@ -5404,7 +5424,8 @@ var schemaInternal2 = objectType({
   _meta: objectType({
     tables: recordType(stringType(), stringType()),
     columns: recordType(stringType(), stringType())
-  })
+  }),
+  internal: kitInternals3
 }).strict();
 var schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
 var schemaV42 = schemaInternalV42.merge(schemaHash3).strict();

package/utils.mjs

@@ -4904,7 +4904,16 @@ var kitInternals = objectType({
         objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
       )
     }).optional()
-  )
+  ).optional(),
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
 }).optional();
 var dialect = literalType("mysql");
 var schemaHash = objectType({
@@ -5385,6 +5394,17 @@ var schemaInternalV52 = objectType({
     columns: recordType(stringType(), stringType())
   })
 }).strict();
+var kitInternals3 = objectType({
+  indexes: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  ).optional()
+}).optional();
 var latestVersion = literalType("6");
 var schemaInternal2 = objectType({
   version: latestVersion,
@@ -5394,7 +5414,8 @@ var schemaInternal2 = objectType({
   _meta: objectType({
     tables: recordType(stringType(), stringType()),
     columns: recordType(stringType(), stringType())
-  })
+  }),
+  internal: kitInternals3
 }).strict();
 var schemaV32 = schemaInternalV32.merge(schemaHash3).strict();
 var schemaV42 = schemaInternalV42.merge(schemaHash3).strict();