drizzle-kit 0.19.6-8c1d0e5 → 0.19.6-e96052c

package/index.cjs

@@ -4551,7 +4551,7 @@ var init_global = __esm({
 });
 
 // src/serializer/mysqlSchema.ts
-var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, schemaInternal, schemaV3, schemaV4, schema2, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, squashMysqlSchemeV4, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
+var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, dialect, schemaHash, schemaInternalV3, schemaInternalV4, kitInternals, schemaInternal, schemaV3, schemaV4, schema2, tableSquashedV4, tableSquashed, schemaSquashed, schemaSquashedV4, MySqlSquasher, squashMysqlSchemeV4, squashMysqlScheme, mysqlSchema, mysqlSchemaV4, mysqlSchemaV3, backwardCompatibleMysqlSchema, dryMySql;
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
     init_global();
@@ -4629,6 +4629,17 @@ var init_mysqlSchema = __esm({
       tables: recordType(stringType(), tableV4),
       schemas: recordType(stringType(), stringType())
     }).strict();
+    kitInternals = objectType({
+      tables: recordType(
+        stringType(),
+        objectType({
+          columns: recordType(
+            stringType(),
+            objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
+          )
+        }).optional()
+      )
+    }).optional();
     schemaInternal = objectType({
       version: literalType("5"),
       dialect,
@@ -4638,7 +4649,8 @@ var init_mysqlSchema = __esm({
         schemas: recordType(stringType(), stringType()),
         tables: recordType(stringType(), stringType()),
         columns: recordType(stringType(), stringType())
-      })
+      }),
+      internal: kitInternals
     }).strict();
     schemaV3 = schemaInternalV3.merge(schemaHash);
     schemaV4 = schemaInternalV4.merge(schemaHash);
@@ -4767,9 +4779,12 @@ var init_mysqlSchema = __esm({
           const squashedPKs = mapValues(it[1].compositePrimaryKeys, (pk) => {
             return MySqlSquasher.squashPK(pk);
           });
-          const squashedUniqueConstraints = mapValues(it[1].uniqueConstraints, (unq) => {
-            return MySqlSquasher.squashUnique(unq);
-          });
+          const squashedUniqueConstraints = mapValues(
+            it[1].uniqueConstraints,
+            (unq) => {
+              return MySqlSquasher.squashUnique(unq);
+            }
+          );
           return [
             it[0],
             {
@@ -11467,12 +11482,12 @@ function clearDefaults(defaultValue, collate) {
   if (defaultValue.startsWith(collate)) {
     resultDefault = resultDefault.substring(collate.length, defaultValue.length).replace(/\\/g, "");
     if (resultDefault.startsWith("'") && resultDefault.endsWith("'")) {
-      return `('${resultDefault.substring(1, resultDefault.length - 1)}')`;
+      return `'${resultDefault.substring(1, resultDefault.length - 1)}'`;
     } else {
-      return `('${resultDefault}')`;
+      return `'${resultDefault}'`;
     }
   } else {
-    return `(${resultDefault})`;
+    return `${resultDefault}`;
   }
 }
 var import_mysql_core2, import_drizzle_orm2, import_mysql_core3, import_drizzle_orm3, dialect3, indexName, generateMySqlSnapshot, fromDatabase;
@@ -11517,14 +11532,6 @@ var init_mysqlSerializer = __esm({
             notNull,
             autoincrement: typeof column7.autoIncrement === "undefined" ? false : column7.autoIncrement,
             onUpdate: column7.hasOnUpdateNow
-            // autoincrement:
-            //   column instanceof MySqlColumnWithAutoIncrement
-            //     ? column.autoIncrement
-            //     : false,
-            // onUpdate:
-            //   column instanceof MySqlDateBaseColumn
-            //     ? column.hasOnUpdateNow
-            //     : undefined,
           };
           if (column7.isUnique) {
             const existingUnique = uniqueConstraintObject[column7.uniqueName];
@@ -11667,6 +11674,22 @@ The unique index ${source_default.underline.blue(
               );
               process.exit(1);
             }
+          } else {
+            if (typeof foreignKeysObject[name] !== "undefined") {
+              console.log(
+                `
+${withStyle.errorWarning(`In MySQL, when creating a foreign key, an index is automatically generated with the same name as the foreign key constraint.
+
+We have encountered a collision between the index name on columns ${source_default.underline.blue(
+                  indexColumns.join(",")
+                )} and the foreign key on columns ${source_default.underline.blue(
+                  foreignKeysObject[name].columnsFrom.join(",")
+                )}. Please change either the index name or the foreign key name. For more information, please refer to https://dev.mysql.com/doc/refman/8.0/en/constraint-foreign-key.html
+
+            `)}`
+              );
+              process.exit(1);
+            }
           }
           indexesObject[name] = {
             name,
@@ -11704,6 +11727,7 @@ The unique index ${source_default.underline.blue(
     };
     fromDatabase = async (db, inputSchema, tablesFilter = (table4) => true, progressCallback) => {
       const result = {};
+      const internals = { tables: {} };
       const columns = await db.execute(`select * from information_schema.columns
 	where table_schema = '${inputSchema}' and table_name != '__drizzle_migrations'
 	order by table_name, ordinal_position;`);
@@ -11762,6 +11786,25 @@ The unique index ${source_default.underline.blue(
           notNull: !isNullable,
           onUpdate
         };
+        if (isDefaultAnExpression) {
+          if (typeof internals.tables[tableName] === "undefined") {
+            internals.tables[tableName] = {
+              columns: {
+                [columnName]: {
+                  isDefaultAnExpression: true
+                }
+              }
+            };
+          } else {
+            if (typeof internals.tables[tableName].columns[columnName] === "undefined") {
+              internals.tables[tableName].columns[columnName] = {
+                isDefaultAnExpression: true
+              };
+            } else {
+              internals.tables[tableName].columns[columnName].isDefaultAnExpression = true;
+            }
+          }
+        }
         if (!table4) {
           result[tableName] = {
             name: tableName,
@@ -11784,8 +11827,9 @@ The unique index ${source_default.underline.blue(
   LEFT JOIN information_schema.key_column_usage k
   USING(constraint_name,table_schema,table_name)
   WHERE t.constraint_type='PRIMARY KEY'
-      AND t.table_schema='${inputSchema}'`,
-        []
+      and table_name != '__drizzle_migrations'
+      AND t.table_schema = ?`,
+        [inputSchema]
       );
       const tableToPk = {};
       const tableToPkRows = tablePks[0];
@@ -11903,14 +11947,16 @@ The unique index ${source_default.underline.blue(
             };
           }
         } else {
-          if (typeof tableInResult.indexes[constraintName] !== "undefined") {
-            tableInResult.indexes[constraintName].columns.push(columnName);
-          } else {
-            tableInResult.indexes[constraintName] = {
-              name: constraintName,
-              columns: [columnName],
-              isUnique
-            };
+          if (typeof tableInResult.foreignKeys[constraintName] === "undefined") {
+            if (typeof tableInResult.indexes[constraintName] !== "undefined") {
+              tableInResult.indexes[constraintName].columns.push(columnName);
+            } else {
+              tableInResult.indexes[constraintName] = {
+                name: constraintName,
+                columns: [columnName],
+                isUnique
+              };
+            }
           }
         }
       }
@@ -11928,7 +11974,8 @@ The unique index ${source_default.underline.blue(
           schemas: {},
           tables: {},
           columns: {}
-        }
+        },
+        internal: internals
       };
     };
   }
@@ -35797,8 +35844,8 @@ var init_mysql_introspect = __esm({
 `;
       }).join();
       const tableStatements = Object.values(schema4.tables).map((table4) => {
-        const schema5 = schemas[table4.schema];
-        const func = schema5 ? schema5 : "mysqlTable";
+        const tableSchema = schemas[table4.schema];
+        const func = tableSchema ? tableSchema : "mysqlTable";
         let statement = "";
         if (imports.mysql.includes(withCasing(table4.name, casing))) {
           statement = `// Table name is in conflict with ${withCasing(
@@ -35813,7 +35860,9 @@ var init_mysql_introspect = __esm({
         statement += createTableColumns(
           Object.values(table4.columns),
           Object.values(table4.foreignKeys),
-          casing
+          casing,
+          table4.name,
+          schema4
         );
         statement += "}";
         const filteredFKs = Object.values(table4.foreignKeys).filter((it) => {
@@ -35868,8 +35917,8 @@ import { sql } from "drizzle-orm"
     isSelf = (fk4) => {
       return fk4.tableFrom === fk4.tableTo;
     };
-    mapColumnDefault = (defaultValue) => {
-      if (typeof defaultValue === "string" && defaultValue.startsWith("(") && defaultValue.endsWith(")")) {
+    mapColumnDefault = (defaultValue, isExpression) => {
+      if (isExpression) {
         return `sql\`${defaultValue}\``;
       }
       return defaultValue;
@@ -35880,7 +35929,7 @@ import { sql } from "drizzle-orm"
       }
       return defaultValue;
     };
-    column4 = (type, name, defaultValue, autoincrement, onUpdate, casing) => {
+    column4 = (type, name, defaultValue, autoincrement, onUpdate, casing, isExpression) => {
       let lowered = type;
       if (!type.startsWith("enum(")) {
         lowered = type.toLowerCase();
@@ -35891,25 +35940,25 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("int")) {
         let out = `${withCasing(name, casing)}: int("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("tinyint")) {
         let out = `${withCasing(name, casing)}: tinyint("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         let out = `${withCasing(name, casing)}: smallint("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("mediumint")) {
         let out = `${withCasing(name, casing)}: mediumint("${name}")`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("bigint")) {
@@ -35918,12 +35967,12 @@ import { sql } from "drizzle-orm"
           casing
         )}: bigint("${name}", { mode: "number" })`;
         out += autoincrement ? `.autoincrement()` : "";
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "boolean") {
         let out = `${withCasing(name, casing)}: boolean("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("double")) {
@@ -35933,17 +35982,17 @@ import { sql } from "drizzle-orm"
           params = { precision, scale };
         }
         let out = params ? `${withCasing(name, casing)}: double("${name}", ${timeConfig(params)})` : `${withCasing(name, casing)}: double("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "float") {
         let out = `${withCasing(name, casing)}: float("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "real") {
         let out = `${withCasing(name, casing)}: real("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("timestamp")) {
@@ -35952,7 +36001,7 @@ import { sql } from "drizzle-orm"
         fsp = fsp ? fsp : null;
         const params = timeConfig({ fsp, mode: "'string'" });
         let out = params ? `${withCasing(name, casing)}: timestamp("${name}", ${params})` : `${withCasing(name, casing)}: timestamp("${name}")`;
-        defaultValue = defaultValue === "now()" || defaultValue === "(CURRENT_TIMESTAMP)" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue === "now()" || defaultValue === "(CURRENT_TIMESTAMP)" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         let onUpdateNow = onUpdate ? ".onUpdateNow()" : "";
         out += onUpdateNow;
@@ -35964,7 +36013,7 @@ import { sql } from "drizzle-orm"
         fsp = fsp ? fsp : null;
         const params = timeConfig({ fsp });
         let out = params ? `${withCasing(name, casing)}: time("${name}", ${params})` : `${withCasing(name, casing)}: time("${name}")`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -35974,33 +36023,33 @@ import { sql } from "drizzle-orm"
           name,
           casing
         )}: date("${name}", { mode: 'string' })`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered === "text") {
         let out = `${withCasing(name, casing)}: text("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "tinytext") {
         let out = `${withCasing(name, casing)}: tinytext("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "mediumtext") {
         let out = `${withCasing(name, casing)}: mediumtext("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "longtext") {
         let out = `${withCasing(name, casing)}: longtext("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "year") {
         let out = `${withCasing(name, casing)}: year("${name}")`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "json") {
@@ -36016,7 +36065,7 @@ import { sql } from "drizzle-orm"
           "varchar".length + 1,
           lowered.length - 1
         )} })`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("char")) {
@@ -36027,7 +36076,7 @@ import { sql } from "drizzle-orm"
           "char".length + 1,
           lowered.length - 1
         )} })`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("datetime")) {
@@ -36041,7 +36090,7 @@ import { sql } from "drizzle-orm"
           "datetime".length + 1,
           lowered.length - 1
         )} })` : `${withCasing(name, casing)}: datetime("${name}", { mode: 'string'})`;
-        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -36052,7 +36101,7 @@ import { sql } from "drizzle-orm"
           params = { precision, scale };
         }
         let out = params ? `${withCasing(name, casing)}: decimal("${name}", ${timeConfig(params)})` : `${withCasing(name, casing)}: decimal("${name}")`;
-        defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -36062,14 +36111,14 @@ import { sql } from "drizzle-orm"
         length = length ? length : null;
         const params = binaryConfig({ length });
         let out = params ? `${withCasing(name, casing)}: binary("${name}", ${params})` : `${withCasing(name, casing)}: binary("${name}")`;
-        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered.startsWith("enum")) {
         const values = lowered.substring("enum".length + 1, lowered.length - 1);
         let out = `${withCasing(name, casing)}: mysqlEnum("${name}", [${values}])`;
-        out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        out += defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("varbinary")) {
@@ -36078,7 +36127,7 @@ import { sql } from "drizzle-orm"
         length = length ? length : null;
         const params = binaryConfig({ length });
         let out = params ? `${withCasing(name, casing)}: varbinary("${name}", ${params})` : `${withCasing(name, casing)}: varbinary("${name}")`;
-        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
+        defaultValue = defaultValue ? `.default(${mapColumnDefault(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
@@ -36086,7 +36135,7 @@ import { sql } from "drizzle-orm"
       return `// Warning: Can't parse ${type} from database
 	// ${type}Type: ${type}("${name}")`;
     };
-    createTableColumns = (columns, fks, casing) => {
+    createTableColumns = (columns, fks, casing, tableName, schema4) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
         return !isSelf(it);
@@ -36098,6 +36147,7 @@ import { sql } from "drizzle-orm"
         return res;
       }, {});
       columns.forEach((it) => {
+        var _a, _b, _c;
         statement += "	";
         statement += column4(
           it.type,
@@ -36105,7 +36155,8 @@ import { sql } from "drizzle-orm"
           it.default,
           it.autoincrement,
           it.onUpdate,
-          casing
+          casing,
+          ((_c = (_b = (_a = schema4.internal) == null ? void 0 : _a.tables[tableName]) == null ? void 0 : _b.columns[it.name]) == null ? void 0 : _c.isDefaultAnExpression) ?? false
         );
         statement += it.primaryKey ? ".primaryKey()" : "";
         statement += it.notNull ? ".notNull()" : "";
@@ -37542,18 +37593,14 @@ var init_mysqlIntrospect = __esm({
       const progress = new IntrospectProgress();
       const res = await (0, import_hanji6.renderWithTask)(
         progress,
-        fromDatabase(
-          client,
-          databaseName,
-          filter2,
-          (stage, count, status) => {
-            progress.update(stage, count, status);
-          }
-        )
+        fromDatabase(client, databaseName, filter2, (stage, count, status) => {
+          progress.update(stage, count, status);
+        })
       );
       const schema4 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript(schema4, config.introspect.casing);
-      return { schema: schema4, ts };
+      const { internal, ...schemaWithoutInternals } = schema4;
+      return { schema: schemaWithoutInternals, ts };
     };
     mysqlPushIntrospect = async (connection, filters) => {
       const { client, databaseName } = connection;
@@ -37572,7 +37619,8 @@ var init_mysqlIntrospect = __esm({
       };
       const res = await fromDatabase(client, databaseName, filter2);
       const schema4 = { id: originUUID, prevId: "", ...res };
-      return { schema: schema4 };
+      const { internal, ...schemaWithoutInternals } = schema4;
+      return { schema: schemaWithoutInternals };
     };
   }
 });
@@ -52250,7 +52298,7 @@ var logSuggestionsAndReturn = async ({
         shouldAskForApprove = true;
       }
     } else if (statement.type === "alter_table_add_column") {
-      if (statement.column.notNull && !statement.column.default) {
+      if (statement.column.notNull && typeof statement.column.default === "undefined") {
         const res = await connection.query(
           `select count(*) as count from \`${statement.tableName}\``
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.19.6-8c1d0e5",
+  "version": "0.19.6-e96052c",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Drizzle Team",
   "license": "MIT",

package/utils.js

@@ -12795,6 +12795,17 @@ var schemaInternalV4 = objectType({
   tables: recordType(stringType(), tableV4),
   schemas: recordType(stringType(), stringType())
 }).strict();
+var kitInternals = objectType({
+  tables: recordType(
+    stringType(),
+    objectType({
+      columns: recordType(
+        stringType(),
+        objectType({ isDefaultAnExpression: booleanType().optional() }).optional()
+      )
+    }).optional()
+  )
+}).optional();
 var schemaInternal = objectType({
   version: literalType("5"),
   dialect,
@@ -12804,7 +12815,8 @@ var schemaInternal = objectType({
     schemas: recordType(stringType(), stringType()),
     tables: recordType(stringType(), stringType()),
     columns: recordType(stringType(), stringType())
-  })
+  }),
+  internal: kitInternals
 }).strict();
 var schemaV3 = schemaInternalV3.merge(schemaHash);
 var schemaV4 = schemaInternalV4.merge(schemaHash);