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

package/payload.d.ts

@@ -50,14 +50,14 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
                 nulls: zod.ZodOptional<zod.ZodString>;
                 opclass: zod.ZodOptional<zod.ZodString>;
             }, "strip", zod.ZodTypeAny, {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
             }, {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -70,8 +70,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         }, "strict", zod.ZodTypeAny, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -84,8 +84,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         }, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -163,8 +163,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         indexes: Record<string, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -211,8 +211,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         indexes: Record<string, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -336,8 +336,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         indexes: Record<string, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -410,8 +410,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         indexes: Record<string, {
             name: string;
             columns: {
-                expression: string;
                 isExpression: boolean;
+                expression: string;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -636,6 +636,37 @@ declare const schema$1: zod.ZodObject<zod.objectUtil.extendShape<{
         columns: Record<string, string>;
         tables: Record<string, string>;
     }>;
+    internal: zod.ZodOptional<zod.ZodObject<{
+        indexes: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+            columns: zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+                isExpression: zod.ZodOptional<zod.ZodBoolean>;
+            }, "strip", zod.ZodTypeAny, {
+                isExpression?: boolean | undefined;
+            }, {
+                isExpression?: boolean | undefined;
+            }>>>;
+        }, "strip", zod.ZodTypeAny, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        }, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        }>>>>;
+    }, "strip", zod.ZodTypeAny, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+    }, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+    }>>;
 }, {
     id: zod.ZodString;
     prevId: zod.ZodString;
@@ -683,6 +714,13 @@ declare const schema$1: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     enums: {};
+    internal?: {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+    } | undefined;
 }, {
     tables: Record<string, {
         name: string;
@@ -727,6 +765,13 @@ declare const schema$1: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     enums: {};
+    internal?: {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+    } | undefined;
 }>;
 type SQLiteSchema = TypeOf<typeof schema$1>;
 
@@ -911,7 +956,7 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     }>;
     internal: zod.ZodOptional<zod.ZodObject<{
-        tables: zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+        tables: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
             columns: zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
                 isDefaultAnExpression: zod.ZodOptional<zod.ZodBoolean>;
             }, "strip", zod.ZodTypeAny, {
@@ -927,19 +972,46 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        }>>>;
+        }>>>>;
+        indexes: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+            columns: zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+                isExpression: zod.ZodOptional<zod.ZodBoolean>;
+            }, "strip", zod.ZodTypeAny, {
+                isExpression?: boolean | undefined;
+            }, {
+                isExpression?: boolean | undefined;
+            }>>>;
+        }, "strip", zod.ZodTypeAny, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        }, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        }>>>>;
     }, "strip", zod.ZodTypeAny, {
-        tables: Record<string, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+        tables?: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined>;
+        } | undefined> | undefined;
     }, {
-        tables: Record<string, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+        tables?: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined>;
+        } | undefined> | undefined;
     }>>;
 }, {
     id: zod.ZodString;
@@ -991,11 +1063,16 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     internal?: {
-        tables: Record<string, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+        tables?: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined>;
+        } | undefined> | undefined;
     } | undefined;
 }, {
     tables: Record<string, {
@@ -1044,11 +1121,16 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     internal?: {
-        tables: Record<string, {
+        indexes?: Record<string, {
+            columns: Record<string, {
+                isExpression?: boolean | undefined;
+            } | undefined>;
+        } | undefined> | undefined;
+        tables?: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined>;
+        } | undefined> | undefined;
     } | undefined;
 }>;
 type MySqlSchema = TypeOf<typeof schema>;

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();
@@ -12091,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",
@@ -12100,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) => {
@@ -12854,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
         };
       });
     };
@@ -13797,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);
@@ -13896,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) => {
@@ -13956,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);
@@ -13996,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,
@@ -14076,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);
@@ -14178,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) => {
@@ -14612,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}\` (
 `;
@@ -14635,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 += `
@@ -15564,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 {
@@ -15578,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 {
@@ -19155,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 = {};
@@ -19241,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;
             }
@@ -19315,7 +19387,8 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        }
+        },
+        internal
       };
     };
     fromDatabase2 = async (db, tablesFilter = (table4) => true, progressCallback) => {
@@ -23577,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,
@@ -23728,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) {
@@ -23797,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;`);
@@ -25345,7 +25438,9 @@ var generateSQLiteMigration = async (prev, cur) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   return sqlStatements;
 };
@@ -25374,7 +25469,9 @@ var pushSQLiteSchema = async (imports, drizzleInstance) => {
     squashedPrev,
     squashedCur,
     tablesResolver,
-    columnsResolver
+    columnsResolver,
+    validatedPrev,
+    validatedCur
   );
   const { shouldAskForApprove, statementsToExecute, infoToPrint } = await logSuggestionsAndReturn(
     db,