drizzle-kit 0.25.0-cd0b1a2 → 0.25.0-d1da3b8

package/bin.cjs

@@ -78956,11 +78956,13 @@ var init_pgIntrospect = __esm({
 });
 
 // src/introspect-sqlite.ts
-var sqliteImportsList, indexName3, objToStatement2, relations, escapeColumnKey, withCasing, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
+var import_casing, sqliteImportsList, indexName3, objToStatement2, relations, escapeColumnKey, withCasing, dbColumnName, schemaToTypeScript, isCyclic, isSelf, mapColumnDefault, column4, createTableColumns, createTableIndexes, createTableUniques, createTablePKs, createTableFKs;
 var init_introspect_sqlite = __esm({
   "src/introspect-sqlite.ts"() {
     "use strict";
+    import_casing = require("drizzle-orm/casing");
     init_utils3();
+    init_global();
     sqliteImportsList = /* @__PURE__ */ new Set([
       "sqliteTable",
       "integer",
@@ -78998,6 +79000,15 @@ var init_introspect_sqlite = __esm({
       }
       return value;
     };
+    dbColumnName = ({ name, casing: casing2, withMode = false }) => {
+      if (casing2 === "preserve") {
+        return "";
+      }
+      if (casing2 === "camel") {
+        return (0, import_casing.toCamelCase)(name) === name ? "" : withMode ? `"${name}", ` : `"${name}"`;
+      }
+      assertUnreachable(casing2);
+    };
     schemaToTypeScript = (schema5, casing2) => {
       Object.values(schema5.tables).forEach((table4) => {
         Object.values(table4.foreignKeys).forEach((fk4) => {
@@ -79117,13 +79128,14 @@ var init_introspect_sqlite = __esm({
     };
     column4 = (type, name, defaultValue, autoincrement, casing2) => {
       let lowered = type;
+      casing2 = casing2;
       if (lowered === "integer") {
-        let out = `${withCasing(name, casing2)}: integer("${name}")`;
+        let out = `${withCasing(name, casing2)}: integer(${dbColumnName({ name, casing: casing2 })})`;
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered === "real") {
-        let out = `${withCasing(name, casing2)}: real("${name}")`;
+        let out = `${withCasing(name, casing2)}: real(${dbColumnName({ name, casing: casing2 })})`;
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
@@ -79131,20 +79143,20 @@ var init_introspect_sqlite = __esm({
         const match2 = lowered.match(/\d+/);
         let out;
         if (match2) {
-          out = `${withCasing(name, casing2)}: text("${name}", { length: ${match2[0]} })`;
+          out = `${withCasing(name, casing2)}: text(${dbColumnName({ name, casing: casing2, withMode: true })}{ length: ${match2[0]} })`;
         } else {
-          out = `${withCasing(name, casing2)}: text("${name}")`;
+          out = `${withCasing(name, casing2)}: text(${dbColumnName({ name, casing: casing2 })})`;
         }
         out += defaultValue ? `.default("${mapColumnDefault(defaultValue)}")` : "";
         return out;
       }
       if (lowered === "blob") {
-        let out = `${withCasing(name, casing2)}: blob("${name}")`;
+        let out = `${withCasing(name, casing2)}: blob(${dbColumnName({ name, casing: casing2 })})`;
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
       if (lowered === "numeric") {
-        let out = `${withCasing(name, casing2)}: numeric("${name}")`;
+        let out = `${withCasing(name, casing2)}: numeric(${dbColumnName({ name, casing: casing2 })})`;
         out += defaultValue ? `.default(${mapColumnDefault(defaultValue)})` : "";
         return out;
       }
@@ -80067,11 +80079,13 @@ var require_pluralize = __commonJS({
 });
 
 // src/introspect-mysql.ts
-var mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, escapeColumnKey2, prepareCasing, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
+var import_casing2, mysqlImportsList, objToStatement22, timeConfig, binaryConfig, importsPatch, relations2, escapeColumnKey2, prepareCasing, dbColumnName2, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault2, mapColumnDefaultForJson, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
 var init_introspect_mysql = __esm({
   "src/introspect-mysql.ts"() {
     "use strict";
+    import_casing2 = require("drizzle-orm/casing");
     init_utils3();
+    init_global();
     init_mysqlSerializer();
     mysqlImportsList = /* @__PURE__ */ new Set([
       "mysqlTable",
@@ -80151,7 +80165,16 @@ var init_introspect_mysql = __esm({
       if (casing2 === "camel") {
         return escapeColumnKey2(value.camelCase());
       }
-      return escapeColumnKey2(value);
+      assertUnreachable(casing2);
+    };
+    dbColumnName2 = ({ name, casing: casing2, withMode = false }) => {
+      if (casing2 === "preserve") {
+        return "";
+      }
+      if (casing2 === "camel") {
+        return (0, import_casing2.toCamelCase)(name) === name ? "" : withMode ? `"${name}", ` : `"${name}"`;
+      }
+      assertUnreachable(casing2);
     };
     schemaToTypeScript2 = (schema5, casing2) => {
       const withCasing4 = prepareCasing(casing2);
@@ -80212,6 +80235,7 @@ var init_introspect_mysql = __esm({
           Object.values(table4.columns),
           Object.values(table4.foreignKeys),
           withCasing4,
+          casing2,
           table4.name,
           schema5
         );
@@ -80291,51 +80315,51 @@ import { sql } from "drizzle-orm"
       }
       return defaultValue;
     };
-    column5 = (type, name, casing2, defaultValue, autoincrement, onUpdate, isExpression) => {
+    column5 = (type, name, casing2, rawCasing, defaultValue, autoincrement, onUpdate, isExpression) => {
       let lowered = type;
       if (!type.startsWith("enum(")) {
         lowered = type.toLowerCase();
       }
       if (lowered === "serial") {
-        return `${casing2(name)}: serial("${name}")`;
+        return `${casing2(name)}: serial(${dbColumnName2({ name, casing: rawCasing })})`;
       }
       if (lowered.startsWith("int")) {
         const isUnsigned = lowered.startsWith("int unsigned");
-        let out = `${casing2(name)}: int("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing2(name)}: int(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? "{ unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("tinyint")) {
         const isUnsigned = lowered.startsWith("tinyint unsigned");
-        let out = `${casing2(name)}: tinyint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing2(name)}: tinyint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("smallint")) {
         const isUnsigned = lowered.startsWith("smallint unsigned");
-        let out = `${casing2(name)}: smallint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing2(name)}: smallint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("mediumint")) {
         const isUnsigned = lowered.startsWith("mediumint unsigned");
-        let out = `${casing2(name)}: mediumint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing2(name)}: mediumint(${dbColumnName2({ name, casing: rawCasing, withMode: isUnsigned })}${isUnsigned ? ", { unsigned: true }" : ""})`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered.startsWith("bigint")) {
         const isUnsigned = lowered.startsWith("bigint unsigned");
-        let out = `${casing2(name)}: bigint("${name}", { mode: "number"${isUnsigned ? ", unsigned: true" : ""} })`;
+        let out = `${casing2(name)}: bigint(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ mode: "number"${isUnsigned ? ", unsigned: true" : ""} })`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "boolean") {
-        let out = `${casing2(name)}: boolean("${name}")`;
+        let out = `${casing2(name)}: boolean(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -80345,17 +80369,18 @@ import { sql } from "drizzle-orm"
           const [precision, scale] = lowered.slice(7, lowered.length - 1).split(",");
           params = { precision, scale };
         }
-        let out = params ? `${casing2(name)}: double("${name}", ${timeConfig(params)})` : `${casing2(name)}: double("${name}")`;
+        const timeConfigParams = params ? timeConfig(params) : void 0;
+        let out = params ? `${casing2(name)}: double(${dbColumnName2({ name, casing: rawCasing, withMode: timeConfigParams !== void 0 })}${timeConfig(params)})` : `${casing2(name)}: double(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "float") {
-        let out = `${casing2(name)}: float("${name}")`;
+        let out = `${casing2(name)}: float(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "real") {
-        let out = `${casing2(name)}: real("${name}")`;
+        let out = `${casing2(name)}: real(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -80364,7 +80389,7 @@ import { sql } from "drizzle-orm"
         let fsp = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         fsp = fsp ? fsp : null;
         const params = timeConfig({ fsp, mode: "'string'" });
-        let out = params ? `${casing2(name)}: timestamp("${name}", ${params})` : `${casing2(name)}: timestamp("${name}")`;
+        let out = params ? `${casing2(name)}: timestamp(${dbColumnName2({ name, casing: rawCasing, withMode: params !== void 0 })}${params})` : `${casing2(name)}: timestamp(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = defaultValue === "now()" || defaultValue === "(CURRENT_TIMESTAMP)" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         let onUpdateNow = onUpdate ? ".onUpdateNow()" : "";
@@ -80376,7 +80401,7 @@ import { sql } from "drizzle-orm"
         let fsp = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         fsp = fsp ? fsp : null;
         const params = timeConfig({ fsp });
-        let out = params ? `${casing2(name)}: time("${name}", ${params})` : `${casing2(name)}: time("${name}")`;
+        let out = params ? `${casing2(name)}: time(${dbColumnName2({ name, casing: rawCasing, withMode: params !== void 0 })}${params})` : `${casing2(name)}: time(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -80385,45 +80410,45 @@ import { sql } from "drizzle-orm"
         let out = `// you can use { mode: 'date' }, if you want to have Date as type for this column
 	${casing2(
           name
-        )}: date("${name}", { mode: 'string' })`;
+        )}: date(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ mode: 'string' })`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered === "text") {
-        let out = `${casing2(name)}: text("${name}")`;
+        let out = `${casing2(name)}: text(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "tinytext") {
-        let out = `${casing2(name)}: tinytext("${name}")`;
+        let out = `${casing2(name)}: tinytext(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "mediumtext") {
-        let out = `${casing2(name)}: mediumtext("${name}")`;
+        let out = `${casing2(name)}: mediumtext(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "longtext") {
-        let out = `${casing2(name)}: longtext("${name}")`;
+        let out = `${casing2(name)}: longtext(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "year") {
-        let out = `${casing2(name)}: year("${name}")`;
+        let out = `${casing2(name)}: year(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "json") {
-        let out = `${casing2(name)}: json("${name}")`;
+        let out = `${casing2(name)}: json(${dbColumnName2({ name, casing: rawCasing })})`;
         out += defaultValue ? `.default(${mapColumnDefaultForJson(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("varchar")) {
         let out = `${casing2(
           name
-        )}: varchar("${name}", { length: ${lowered.substring(
+        )}: varchar(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ length: ${lowered.substring(
           "varchar".length + 1,
           lowered.length - 1
         )} })`;
@@ -80433,7 +80458,7 @@ import { sql } from "drizzle-orm"
       if (lowered.startsWith("char")) {
         let out = `${casing2(
           name
-        )}: char("${name}", { length: ${lowered.substring(
+        )}: char(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ length: ${lowered.substring(
           "char".length + 1,
           lowered.length - 1
         )} })`;
@@ -80446,10 +80471,10 @@ import { sql } from "drizzle-orm"
         const fsp = lowered.startsWith("datetime(") ? lowered.substring("datetime".length + 1, lowered.length - 1) : void 0;
         out = fsp ? `${casing2(
           name
-        )}: datetime("${name}", { mode: 'string', fsp: ${lowered.substring(
+        )}: datetime(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ mode: 'string', fsp: ${lowered.substring(
           "datetime".length + 1,
           lowered.length - 1
-        )} })` : `${casing2(name)}: datetime("${name}", { mode: 'string'})`;
+        )} })` : `${casing2(name)}: datetime(${dbColumnName2({ name, casing: rawCasing, withMode: true })}{ mode: 'string'})`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -80460,7 +80485,8 @@ import { sql } from "drizzle-orm"
           const [precision, scale] = lowered.slice(8, lowered.length - 1).split(",");
           params = { precision, scale };
         }
-        let out = params ? `${casing2(name)}: decimal("${name}", ${timeConfig(params)})` : `${casing2(name)}: decimal("${name}")`;
+        const timeConfigParams = params ? timeConfig(params) : void 0;
+        let out = params ? `${casing2(name)}: decimal(${dbColumnName2({ name, casing: rawCasing, withMode: timeConfigParams !== void 0 })}${timeConfigParams})` : `${casing2(name)}: decimal(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -80470,14 +80496,14 @@ import { sql } from "drizzle-orm"
         let length = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         length = length ? length : null;
         const params = binaryConfig({ length });
-        let out = params ? `${casing2(name)}: binary("${name}", ${params})` : `${casing2(name)}: binary("${name}")`;
+        let out = params ? `${casing2(name)}: binary(${dbColumnName2({ name, casing: rawCasing, withMode: params !== void 0 })}${params})` : `${casing2(name)}: binary(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered.startsWith("enum")) {
         const values = lowered.substring("enum".length + 1, lowered.length - 1);
-        let out = `${casing2(name)}: mysqlEnum("${name}", [${values}])`;
+        let out = `${casing2(name)}: mysqlEnum(${dbColumnName2({ name, casing: rawCasing, withMode: true })}[${values}])`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -80486,7 +80512,7 @@ import { sql } from "drizzle-orm"
         let length = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         length = length ? length : null;
         const params = binaryConfig({ length });
-        let out = params ? `${casing2(name)}: varbinary("${name}", ${params})` : `${casing2(name)}: varbinary("${name}")`;
+        let out = params ? `${casing2(name)}: varbinary(${dbColumnName2({ name, casing: rawCasing, withMode: params !== void 0 })}${params})` : `${casing2(name)}: varbinary(${dbColumnName2({ name, casing: rawCasing })})`;
         defaultValue = defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -80495,7 +80521,7 @@ import { sql } from "drizzle-orm"
       return `// Warning: Can't parse ${type} from database
 	// ${type}Type: ${type}("${name}")`;
     };
-    createTableColumns2 = (columns, fks, casing2, tableName, schema5) => {
+    createTableColumns2 = (columns, fks, casing2, rawCasing, tableName, schema5) => {
       let statement = "";
       const oneColumnsFKs = Object.values(fks).filter((it) => {
         return !isSelf2(it);
@@ -80513,6 +80539,7 @@ import { sql } from "drizzle-orm"
           it.type,
           it.name,
           casing2,
+          rawCasing,
           it.default,
           it.autoincrement,
           it.onUpdate,
@@ -80643,13 +80670,14 @@ function generateIdentityParams(identity) {
   }
   return `.generatedByDefaultAsIdentity(${paramsObj})`;
 }
-var import_drizzle_orm9, import_relations, pgImportsList, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, mapColumnDefault3, importsPatch2, relations3, escapeColumnKey3, withCasing2, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, buildArrayDefault, mapDefault, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
+var import_drizzle_orm9, import_relations, import_casing3, pgImportsList, timeConfig2, possibleIntervals, intervalStrToObj, intervalConfig, mapColumnDefault3, importsPatch2, relations3, escapeColumnKey3, withCasing2, dbColumnName3, paramNameFor, schemaToTypeScript3, isCyclic3, isSelf3, buildArrayDefault, mapDefault, column6, dimensionsInArray, createTableColumns3, createTableIndexes3, createTablePKs3, createTableUniques3, createTableFKs3;
 var init_introspect_pg = __esm({
   "src/introspect-pg.ts"() {
     "use strict";
     import_drizzle_orm9 = require("drizzle-orm");
     import_relations = require("drizzle-orm/relations");
     init_utils3();
+    import_casing3 = require("drizzle-orm/casing");
     init_vector();
     init_global();
     init_pgSerializer();
@@ -80775,6 +80803,15 @@ var init_introspect_pg = __esm({
       }
       assertUnreachable(casing2);
     };
+    dbColumnName3 = ({ name, casing: casing2, withMode = false }) => {
+      if (casing2 === "preserve") {
+        return "";
+      }
+      if (casing2 === "camel") {
+        return (0, import_casing3.toCamelCase)(name) === name ? "" : withMode ? `"${name}", ` : `"${name}"`;
+      }
+      assertUnreachable(casing2);
+    };
     paramNameFor = (name, schema5) => {
       const schemaSuffix = schema5 && schema5 !== "public" ? `In${schema5.capitalise()}` : "";
       return `${name}${schemaSuffix}`;
@@ -81070,49 +81107,49 @@ var init_introspect_pg = __esm({
         let out = `${withCasing2(name, casing2)}: ${withCasing2(
           paramNameFor(type.replace("[]", ""), typeSchema),
           casing2
-        )}("${name}")`;
+        )}(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("serial")) {
-        return `${withCasing2(name, casing2)}: serial("${name}")`;
+        return `${withCasing2(name, casing2)}: serial(${dbColumnName3({ name, casing: casing2 })})`;
       }
       if (lowered.startsWith("smallserial")) {
-        return `${withCasing2(name, casing2)}: smallserial("${name}")`;
+        return `${withCasing2(name, casing2)}: smallserial(${dbColumnName3({ name, casing: casing2 })})`;
       }
       if (lowered.startsWith("bigserial")) {
         return `${withCasing2(
           name,
           casing2
-        )}: bigserial("${name}", { mode: "bigint" })`;
+        )}: bigserial(${dbColumnName3({ name, casing: casing2, withMode: true })}{ mode: "bigint" })`;
       }
       if (lowered.startsWith("integer")) {
-        let out = `${withCasing2(name, casing2)}: integer("${name}")`;
+        let out = `${withCasing2(name, casing2)}: integer(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("smallint")) {
-        let out = `${withCasing2(name, casing2)}: smallint("${name}")`;
+        let out = `${withCasing2(name, casing2)}: smallint(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("bigint")) {
         let out = `// You can use { mode: "bigint" } if numbers are exceeding js number limitations
 	`;
-        out += `${withCasing2(name, casing2)}: bigint("${name}", { mode: "number" })`;
+        out += `${withCasing2(name, casing2)}: bigint(${dbColumnName3({ name, casing: casing2, withMode: true })}{ mode: "number" })`;
         return out;
       }
       if (lowered.startsWith("boolean")) {
-        let out = `${withCasing2(name, casing2)}: boolean("${name}")`;
+        let out = `${withCasing2(name, casing2)}: boolean(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("double precision")) {
-        let out = `${withCasing2(name, casing2)}: doublePrecision("${name}")`;
+        let out = `${withCasing2(name, casing2)}: doublePrecision(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("real")) {
-        let out = `${withCasing2(name, casing2)}: real("${name}")`;
+        let out = `${withCasing2(name, casing2)}: real(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("uuid")) {
-        let out = `${withCasing2(name, casing2)}: uuid("${name}")`;
+        let out = `${withCasing2(name, casing2)}: uuid(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("numeric")) {
@@ -81121,7 +81158,7 @@ var init_introspect_pg = __esm({
           const [precision, scale] = lowered.slice(8, lowered.length - 1).split(",");
           params = { precision, scale };
         }
-        let out = params ? `${withCasing2(name, casing2)}: numeric("${name}", ${timeConfig2(params)})` : `${withCasing2(name, casing2)}: numeric("${name}")`;
+        let out = params ? `${withCasing2(name, casing2)}: numeric(${dbColumnName3({ name, casing: casing2, withMode: true })}${timeConfig2(params)})` : `${withCasing2(name, casing2)}: numeric(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("timestamp")) {
@@ -81135,7 +81172,7 @@ var init_introspect_pg = __esm({
           withTimezone,
           mode: "'string'"
         });
-        let out = params ? `${withCasing2(name, casing2)}: timestamp("${name}", ${params})` : `${withCasing2(name, casing2)}: timestamp("${name}")`;
+        let out = params ? `${withCasing2(name, casing2)}: timestamp(${dbColumnName3({ name, casing: casing2, withMode: true })}${params})` : `${withCasing2(name, casing2)}: timestamp(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("time")) {
@@ -81145,44 +81182,44 @@ var init_introspect_pg = __esm({
         ) : null;
         precision = precision ? precision : null;
         const params = timeConfig2({ precision, withTimezone });
-        let out = params ? `${withCasing2(name, casing2)}: time("${name}", ${params})` : `${withCasing2(name, casing2)}: time("${name}")`;
+        let out = params ? `${withCasing2(name, casing2)}: time(${dbColumnName3({ name, casing: casing2, withMode: true })}${params})` : `${withCasing2(name, casing2)}: time(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("interval")) {
         const params = intervalConfig(lowered);
-        let out = params ? `${withCasing2(name, casing2)}: interval("${name}", ${params})` : `${withCasing2(name, casing2)}: interval("${name}")`;
+        let out = params ? `${withCasing2(name, casing2)}: interval(${dbColumnName3({ name, casing: casing2, withMode: true })}${params})` : `${withCasing2(name, casing2)}: interval(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered === "date") {
-        let out = `${withCasing2(name, casing2)}: date("${name}")`;
+        let out = `${withCasing2(name, casing2)}: date(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("text")) {
-        let out = `${withCasing2(name, casing2)}: text("${name}")`;
+        let out = `${withCasing2(name, casing2)}: text(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("jsonb")) {
-        let out = `${withCasing2(name, casing2)}: jsonb("${name}")`;
+        let out = `${withCasing2(name, casing2)}: jsonb(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("json")) {
-        let out = `${withCasing2(name, casing2)}: json("${name}")`;
+        let out = `${withCasing2(name, casing2)}: json(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("inet")) {
-        let out = `${withCasing2(name, casing2)}: inet("${name}")`;
+        let out = `${withCasing2(name, casing2)}: inet(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("cidr")) {
-        let out = `${withCasing2(name, casing2)}: cidr("${name}")`;
+        let out = `${withCasing2(name, casing2)}: cidr(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("macaddr8")) {
-        let out = `${withCasing2(name, casing2)}: macaddr8("${name}")`;
+        let out = `${withCasing2(name, casing2)}: macaddr8(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("macaddr")) {
-        let out = `${withCasing2(name, casing2)}: macaddr("${name}")`;
+        let out = `${withCasing2(name, casing2)}: macaddr(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("varchar")) {
@@ -81191,21 +81228,21 @@ var init_introspect_pg = __esm({
           out = `${withCasing2(
             name,
             casing2
-          )}: varchar("${name}", { length: ${lowered.substring(
+          )}: varchar(${dbColumnName3({ name, casing: casing2, withMode: true })}{ length: ${lowered.substring(
             8,
             lowered.length - 1
           )} })`;
         } else {
-          out = `${withCasing2(name, casing2)}: varchar("${name}")`;
+          out = `${withCasing2(name, casing2)}: varchar(${dbColumnName3({ name, casing: casing2 })})`;
         }
         return out;
       }
       if (lowered.startsWith("point")) {
-        let out = `${withCasing2(name, casing2)}: point("${name}")`;
+        let out = `${withCasing2(name, casing2)}: point(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("line")) {
-        let out = `${withCasing2(name, casing2)}: point("${name}")`;
+        let out = `${withCasing2(name, casing2)}: point(${dbColumnName3({ name, casing: casing2 })})`;
         return out;
       }
       if (lowered.startsWith("geometry")) {
@@ -81214,14 +81251,14 @@ var init_introspect_pg = __esm({
         if (lowered.length !== 8) {
           const geometryOptions = lowered.slice(9, -1).split(",");
           if (geometryOptions.length === 1 && geometryOptions[0] !== "") {
-            out = `${withCasing2(name, casing2)}: geometry("${name}", { type: "${geometryOptions[0]}" })`;
+            out = `${withCasing2(name, casing2)}: geometry(${dbColumnName3({ name, casing: casing2, withMode: true })}{ type: "${geometryOptions[0]}" })`;
           } else if (geometryOptions.length === 2) {
-            out = `${withCasing2(name, casing2)}: geometry("${name}", { type: "${geometryOptions[0]}", srid: ${geometryOptions[1]} })`;
+            out = `${withCasing2(name, casing2)}: geometry(${dbColumnName3({ name, casing: casing2, withMode: true })}{ type: "${geometryOptions[0]}", srid: ${geometryOptions[1]} })`;
           } else {
             isGeoUnknown = true;
           }
         } else {
-          out = `${withCasing2(name, casing2)}: geometry("${name}")`;
+          out = `${withCasing2(name, casing2)}: geometry(${dbColumnName3({ name, casing: casing2 })})`;
         }
         if (isGeoUnknown) {
           let unknown2 = `// TODO: failed to parse geometry type because found more than 2 options inside geometry function '${type}'
@@ -81238,12 +81275,12 @@ var init_introspect_pg = __esm({
           out = `${withCasing2(
             name,
             casing2
-          )}: vector("${name}", { dimensions: ${lowered.substring(
+          )}: vector(${dbColumnName3({ name, casing: casing2, withMode: true })}{ dimensions: ${lowered.substring(
             7,
             lowered.length - 1
           )} })`;
         } else {
-          out = `${withCasing2(name, casing2)}: vector("${name}")`;
+          out = `${withCasing2(name, casing2)}: vector(${dbColumnName3({ name, casing: casing2 })})`;
         }
         return out;
       }
@@ -81253,12 +81290,12 @@ var init_introspect_pg = __esm({
           out = `${withCasing2(
             name,
             casing2
-          )}: char("${name}", { length: ${lowered.substring(
+          )}: char(${dbColumnName3({ name, casing: casing2, withMode: true })}{ length: ${lowered.substring(
             5,
             lowered.length - 1
           )} })`;
         } else {
-          out = `${withCasing2(name, casing2)}: char("${name}")`;
+          out = `${withCasing2(name, casing2)}: char(${dbColumnName3({ name, casing: casing2 })})`;
         }
         return out;
       }
@@ -85222,7 +85259,7 @@ init_utils2();
 var version2 = async () => {
   const { npmVersion } = await ormCoreVersions();
   const ormVersion = npmVersion ? `drizzle-orm: v${npmVersion}` : "";
-  const envVersion = "0.25.0-cd0b1a2";
+  const envVersion = "0.25.0-d1da3b8";
   const kitVersion = envVersion ? `v${envVersion}` : "--";
   const versions = `drizzle-kit: ${kitVersion}
 ${ormVersion}`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-kit",
-	"version": "0.25.0-cd0b1a2",
+	"version": "0.25.0-d1da3b8",
 	"homepage": "https://orm.drizzle.team",
 	"keywords": [
 		"drizzle",