drizzle-kit 0.22.0-18d9643 → 0.22.0-29f7626

package/bin.cjs

@@ -5477,16 +5477,7 @@ 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({
@@ -6151,7 +6142,7 @@ var init_pgSchema = __esm({
 });
 
 // src/serializer/sqliteSchema.ts
-var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, kitInternals3, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
+var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dialect2, schemaHash3, schemaInternalV32, schemaInternalV42, schemaInternalV52, latestVersion, schemaInternal2, schemaV32, schemaV42, schemaV52, schema3, tableSquashed3, schemaSquashed2, SQLiteSquasher, squashSqliteScheme, drySQLite, sqliteSchemaV5, sqliteSchema, SQLiteSchemaSquashed, backwardCompatibleSqliteSchema;
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     "use strict";
@@ -6229,17 +6220,6 @@ 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,
@@ -6249,8 +6229,7 @@ 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();
@@ -15289,7 +15268,6 @@ var init_mysqlSerializer = __esm({
     };
     generateMySqlSnapshot = (tables) => {
       const result = {};
-      const internal = { tables: {}, indexes: {} };
       for (const table4 of tables) {
         const {
           name: tableName,
@@ -15440,29 +15418,10 @@ The unique constraint ${source_default.underline.blue(
           const columns2 = value.config.columns;
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
-            var _a;
             if ((0, import_drizzle_orm2.is)(it, import_drizzle_orm3.SQL)) {
-              const sql2 = dialect4.sqlToQuery(it, "indexes").sql;
-              if (typeof internal.indexes[name] === "undefined") {
-                internal.indexes[name] = {
-                  columns: {
-                    [sql2]: {
-                      isExpression: true
-                    }
-                  }
-                };
-              } else {
-                if (typeof ((_a = internal.indexes[name]) == null ? void 0 : _a.columns[sql2]) === "undefined") {
-                  internal.indexes[name].columns[sql2] = {
-                    isExpression: true
-                  };
-                } else {
-                  internal.indexes[name].columns[sql2].isExpression = true;
-                }
-              }
-              return sql2;
+              return dialect4.sqlToQuery(it, "indexes").sql;
             } else {
-              return `${it.name}`;
+              return it.name;
             }
           });
           if (value.config.unique) {
@@ -15529,13 +15488,12 @@ We have encountered a collision between the index name on columns ${source_defau
         _meta: {
           tables: {},
           columns: {}
-        },
-        internal
+        }
       };
     };
     fromDatabase = async (db2, inputSchema, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
-      const internals = { tables: {}, indexes: {} };
+      const internals = { tables: {} };
       const columns = await db2.query(`select * from information_schema.columns
 	where table_schema = '${inputSchema}' and table_name != '__drizzle_migrations'
 	order by table_name, ordinal_position;`);
@@ -16750,7 +16708,6 @@ var init_sqliteSerializer = __esm({
     dialect6 = new import_sqlite_core2.SQLiteSyncDialect();
     generateSqliteSnapshot = (tables) => {
       const result = {};
-      const internal = { indexes: {} };
       for (const table4 of tables) {
         const columnsObject = {};
         const indexesObject = {};
@@ -16836,27 +16793,8 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const columns2 = value.config.columns;
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
-            var _a;
             if ((0, import_drizzle_orm7.is)(it, import_drizzle_orm7.SQL)) {
-              const sql2 = dialect6.sqlToQuery(it, "indexes").sql;
-              if (typeof internal.indexes[name] === "undefined") {
-                internal.indexes[name] = {
-                  columns: {
-                    [sql2]: {
-                      isExpression: true
-                    }
-                  }
-                };
-              } else {
-                if (typeof ((_a = internal.indexes[name]) == null ? void 0 : _a.columns[sql2]) === "undefined") {
-                  internal.indexes[name].columns[sql2] = {
-                    isExpression: true
-                  };
-                } else {
-                  internal.indexes[name].columns[sql2].isExpression = true;
-                }
-              }
-              return sql2;
+              return dialect6.sqlToQuery(it, "indexes").sql;
             } else {
               return it.name;
             }
@@ -16930,8 +16868,7 @@ The unique constraint ${source_default.underline.blue(
         _meta: {
           tables: {},
           columns: {}
-        },
-        internal
+        }
       };
     };
     fromDatabase3 = async (db2, tablesFilter = (table4) => true, progressCallback) => {
@@ -17434,14 +17371,7 @@ var init_sqlgenerator = __esm({
         return statement.type === "create_table" && dialect7 === "mysql";
       }
       convert(st) {
-        const {
-          tableName,
-          columns,
-          schema: schema5,
-          compositePKs,
-          uniqueConstraints,
-          internals
-        } = st;
+        const { tableName, columns, schema: schema5, compositePKs, uniqueConstraints } = st;
         let statement = "";
         statement += `CREATE TABLE \`${tableName}\` (
 `;
@@ -17464,11 +17394,7 @@ var init_sqlgenerator = __esm({
           for (const uniqueConstraint4 of uniqueConstraints) {
             statement += ",\n";
             const unsquashedUnique = MySqlSquasher.unsquashUnique(uniqueConstraint4);
-            const uniqueString = unsquashedUnique.columns.map((it) => {
-              var _a, _b;
-              return (internals == null ? void 0 : internals.indexes) ? ((_b = (_a = internals == null ? void 0 : internals.indexes[unsquashedUnique.name]) == null ? void 0 : _a.columns[it]) == null ? void 0 : _b.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
-            }).join(",");
-            statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(${uniqueString})`;
+            statement += `	CONSTRAINT \`${unsquashedUnique.name}\` UNIQUE(\`${unsquashedUnique.columns.join(`\`,\``)}\`)`;
           }
         }
         statement += `
@@ -18397,11 +18323,8 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
           statement.data
         );
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
-        const uniqueString = columns.map((it) => {
-          var _a, _b, _c, _d;
-          return ((_a = statement.internal) == null ? void 0 : _a.indexes) ? ((_d = (_c = (_b = statement.internal) == null ? void 0 : _b.indexes[name]) == null ? void 0 : _c.columns[it]) == null ? void 0 : _d.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
-        }).join(",");
-        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${uniqueString});`;
+        const value = columns.map((it) => `\`${it}\``).join(",");
+        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${value});`;
       }
     };
     CreateSqliteIndexConvertor = class extends Convertor {
@@ -18414,11 +18337,8 @@ ${BREAKPOINT}ALTER TABLE ${tableNameWithSchema} ADD CONSTRAINT ${statement.newCo
         );
         const indexPart = isUnique ? "UNIQUE INDEX" : "INDEX";
         const whereStatement = where ? ` WHERE ${where}` : "";
-        const uniqueString = columns.map((it) => {
-          var _a, _b, _c, _d;
-          return ((_a = statement.internal) == null ? void 0 : _a.indexes) ? ((_d = (_c = (_b = statement.internal) == null ? void 0 : _b.indexes[name]) == null ? void 0 : _c.columns[it]) == null ? void 0 : _d.isExpression) ? it : `\`${it}\`` : `\`${it}\``;
-        }).join(",");
-        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${uniqueString})${whereStatement};`;
+        const value = columns.map((it) => `\`${it}\``).join(",");
+        return `CREATE ${indexPart} \`${name}\` ON \`${statement.tableName}\` (${value})${whereStatement};`;
       }
     };
     PgDropIndexConvertor = class extends Convertor {
@@ -19066,7 +18986,7 @@ var init_jsonStatements = __esm({
         uniqueConstraints: Object.values(uniqueConstraints)
       };
     };
-    prepareMySqlCreateTableJson = (table4, json2, internals) => {
+    prepareMySqlCreateTableJson = (table4, json2) => {
       const { name, schema: schema5, columns, compositePrimaryKeys, uniqueConstraints } = table4;
       return {
         type: "create_table",
@@ -19075,8 +18995,7 @@ var init_jsonStatements = __esm({
         columns: Object.values(columns),
         compositePKs: Object.values(compositePrimaryKeys),
         compositePkName: Object.values(compositePrimaryKeys).length > 0 ? json2.tables[name].compositePrimaryKeys[MySqlSquasher.unsquashPK(Object.values(compositePrimaryKeys)[0]).name].name : "",
-        uniqueConstraints: Object.values(uniqueConstraints),
-        internals
+        uniqueConstraints: Object.values(uniqueConstraints)
       };
     };
     prepareSQLiteCreateTable = (table4) => {
@@ -19833,14 +19752,13 @@ var init_jsonStatements = __esm({
         };
       });
     };
-    prepareCreateIndexesJson = (tableName, schema5, indexes, internal) => {
+    prepareCreateIndexesJson = (tableName, schema5, indexes) => {
       return Object.values(indexes).map((indexData) => {
         return {
           type: "create_index",
           tableName,
           data: indexData,
-          schema: schema5,
-          internal
+          schema: schema5
         };
       });
     };
@@ -20745,12 +20663,7 @@ var init_snapshotsDiffer = __esm({
       const typedResult = diffResultSchemeMysql.parse(diffResult);
       const jsonStatements = [];
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
-        return prepareCreateIndexesJson(
-          it.name,
-          it.schema,
-          it.indexes,
-          curFull.internal
-        );
+        return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
       }).flat();
       const jsonDropTables = deletedTables.map((it) => {
         return prepareDropTableJson(it);
@@ -20849,8 +20762,7 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {},
-          curFull.internal
+          it.addedIndexes || {}
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = alteredTables.map((it) => {
@@ -20910,11 +20822,7 @@ var init_snapshotsDiffer = __esm({
         (t2) => t2.type === "delete_reference"
       );
       const jsonMySqlCreateTables = createdTables.map((it) => {
-        return prepareMySqlCreateTableJson(
-          it,
-          curFull,
-          curFull.internal
-        );
+        return prepareMySqlCreateTableJson(it, curFull);
       });
       jsonStatements.push(...jsonMySqlCreateTables);
       jsonStatements.push(...jsonDropTables);
@@ -20954,7 +20862,7 @@ var init_snapshotsDiffer = __esm({
         _meta
       };
     };
-    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2, prevFull, curFull) => {
+    applySqliteSnapshotsDiff = async (json1, json2, tablesResolver2, columnsResolver2) => {
       const tablesDiff = diffSchemasOrTables(json1.tables, json2.tables);
       const {
         created: createdTables,
@@ -21034,12 +20942,7 @@ var init_snapshotsDiffer = __esm({
         return prepareSQLiteCreateTable(it);
       });
       const jsonCreateIndexesForCreatedTables = createdTables.map((it) => {
-        return prepareCreateIndexesJson(
-          it.name,
-          it.schema,
-          it.indexes,
-          curFull.internal
-        );
+        return prepareCreateIndexesJson(it.name, it.schema, it.indexes);
       }).flat();
       const jsonDropTables = deletedTables.map((it) => {
         return prepareDropTableJson(it);
@@ -21141,8 +21044,7 @@ var init_snapshotsDiffer = __esm({
         return prepareCreateIndexesJson(
           it.name,
           it.schema,
-          it.addedIndexes || {},
-          curFull.internal
+          it.addedIndexes || {}
         );
       }).flat();
       const jsonDropIndexesForAllAlteredTables = allAltered.map((it) => {
@@ -22833,9 +22735,7 @@ var init_migrate = __esm({
           squashedPrev,
           squashedCur,
           tablesResolver,
-          columnsResolver,
-          validatedPrev,
-          validatedCur
+          columnsResolver
         );
         writeResult({
           cur,
@@ -22861,9 +22761,7 @@ var init_migrate = __esm({
         squashedPrev,
         squashedCur,
         tablesResolver,
-        columnsResolver,
-        validatedPrev,
-        validatedCur
+        columnsResolver
       );
       return {
         sqlStatements,
@@ -117025,9 +116923,7 @@ var init_introspect = __esm({
           squashSqliteScheme(drySQLite),
           squashSqliteScheme(schema5),
           tablesResolver,
-          columnsResolver,
-          drySQLite,
-          schema5
+          columnsResolver
         );
         writeResult({
           cur: schema5,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.22.0-18d9643",
+  "version": "0.22.0-29f7626",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/payload.d.mts

@@ -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, {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
             }, {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 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: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -84,8 +84,8 @@ declare const pgSchema: zod.ZodObject<zod.objectUtil.extendShape<{
         }, {
             name: string;
             columns: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 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: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 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: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 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: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 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: {
-                isExpression: boolean;
                 expression: string;
+                isExpression: boolean;
                 asc: boolean;
                 nulls?: string | undefined;
                 opclass?: string | undefined;
@@ -636,37 +636,6 @@ 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;
@@ -714,13 +683,6 @@ 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;
@@ -765,13 +727,6 @@ 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>;
 
@@ -956,7 +911,7 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     }>;
     internal: zod.ZodOptional<zod.ZodObject<{
-        tables: zod.ZodOptional<zod.ZodRecord<zod.ZodString, zod.ZodOptional<zod.ZodObject<{
+        tables: 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, {
@@ -972,46 +927,19 @@ 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, {
-        indexes?: Record<string, {
-            columns: Record<string, {
-                isExpression?: boolean | undefined;
-            } | undefined>;
-        } | undefined> | undefined;
-        tables?: Record<string, {
+        tables: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined> | undefined;
+        } | undefined>;
     }, {
-        indexes?: Record<string, {
-            columns: Record<string, {
-                isExpression?: boolean | undefined;
-            } | undefined>;
-        } | undefined> | undefined;
-        tables?: Record<string, {
+        tables: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined> | undefined;
+        } | undefined>;
     }>>;
 }, {
     id: zod.ZodString;
@@ -1063,16 +991,11 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     internal?: {
-        indexes?: Record<string, {
-            columns: Record<string, {
-                isExpression?: boolean | undefined;
-            } | undefined>;
-        } | undefined> | undefined;
-        tables?: Record<string, {
+        tables: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined> | undefined;
+        } | undefined>;
     } | undefined;
 }, {
     tables: Record<string, {
@@ -1121,16 +1044,11 @@ declare const schema: zod.ZodObject<zod.objectUtil.extendShape<{
         tables: Record<string, string>;
     };
     internal?: {
-        indexes?: Record<string, {
-            columns: Record<string, {
-                isExpression?: boolean | undefined;
-            } | undefined>;
-        } | undefined> | undefined;
-        tables?: Record<string, {
+        tables: Record<string, {
             columns: Record<string, {
                 isDefaultAnExpression?: boolean | undefined;
             } | undefined>;
-        } | undefined> | undefined;
+        } | undefined>;
     } | undefined;
 }>;
 type MySqlSchema = TypeOf<typeof schema>;