drizzle-kit 0.20.2 → 0.20.4-49fcbbb

package/bin.cjs

@@ -6815,11 +6815,11 @@ var require_node2 = __commonJS({
         this._set = hasNativeMap ? /* @__PURE__ */ new Map() : /* @__PURE__ */ Object.create(null);
       }
       ArraySet.fromArray = function ArraySet_fromArray(aArray, aAllowDuplicates) {
-        var set = new ArraySet();
+        var set2 = new ArraySet();
         for (var i = 0, len = aArray.length; i < len; i++) {
-          set.add(aArray[i], aAllowDuplicates);
+          set2.add(aArray[i], aAllowDuplicates);
         }
-        return set;
+        return set2;
       };
       ArraySet.prototype.size = function ArraySet_size() {
         return hasNativeMap ? this._set.size : Object.getOwnPropertyNames(this._set).length;
@@ -13295,6 +13295,14 @@ WHERE
 });
 
 // src/serializer/index.ts
+var serializer_exports = {};
+__export(serializer_exports, {
+  prepareFilenames: () => prepareFilenames,
+  serializeMySql: () => serializeMySql,
+  serializePg: () => serializePg,
+  serializeSQLite: () => serializeSQLite,
+  sqlToStr: () => sqlToStr
+});
 var import_fs2, import_path2, glob, sqlToStr, serializeMySql, serializePg, serializeSQLite, prepareFilenames;
 var init_serializer = __esm({
   "src/serializer/index.ts"() {
@@ -18785,10 +18793,14 @@ var init_utils2 = __esm({
   }
 });
 
-// src/introspect.ts
+// src/introspect-pg.ts
+var introspect_pg_exports = {};
+__export(introspect_pg_exports, {
+  schemaToTypeScript: () => schemaToTypeScript
+});
 var pgImportsList, objToStatement2, timeConfig, possibleIntervals, intervalStrToObj, intervalConfig, importsPatch, relations, withCasing, schemaToTypeScript, isCyclic, isSelf, column4, dimensionsInArray, createTableColumns, createTableIndexes, createTablePKs, createTableUniques, createTableFKs;
-var init_introspect = __esm({
-  "src/introspect.ts"() {
+var init_introspect_pg = __esm({
+  "src/introspect-pg.ts"() {
     init_utils2();
     init_pgSerializer();
     pgImportsList = /* @__PURE__ */ new Set([
@@ -18946,7 +18958,7 @@ var init_introspect = __esm({
             res.pg.push("pgEnum");
           }
           const columnImports = Object.values(it.columns).map((col) => {
-            let patched = importsPatch[col.type] ?? col.type;
+            let patched = importsPatch[col.type] || col.type;
             patched = patched.startsWith("varchar(") ? "varchar" : patched;
             patched = patched.startsWith("char(") ? "char" : patched;
             patched = patched.startsWith("numeric(") ? "numeric" : patched;
@@ -19015,18 +19027,23 @@ var init_introspect = __esm({
         return statement;
       });
       const uniquePgImports = ["pgTable", ...new Set(imports.pg)];
-      let result = `import { ${uniquePgImports.join(
+      const importsTs = `import { ${uniquePgImports.join(
         ", "
       )} } from "drizzle-orm/pg-core"
+  import { sql } from "drizzle-orm"
 
 `;
-      result += `import { sql } from "drizzle-orm"
-`;
-      result += enumStatements;
-      result += schemaStatements;
-      result += "\n";
-      result += tableStatements.join("\n\n");
-      return result;
+      let decalrations = enumStatements;
+      decalrations += schemaStatements;
+      decalrations += "\n";
+      decalrations += tableStatements.join("\n\n");
+      const file = importsTs + decalrations;
+      const schemaEntry = `
+    {
+      ${Object.values(schema4.tables).map((it) => withCasing(it.name, casing)).join(",\n")}
+    }
+  `;
+      return { file, imports: importsTs, decalrations, schemaEntry };
     };
     isCyclic = (fk4) => {
       const key = `${fk4.tableFrom}-${fk4.tableTo}`;
@@ -19803,9 +19820,9 @@ var init_mjs = __esm({
     star = qmark + "*?";
     twoStarDot = "(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?";
     twoStarNoDot = "(?:(?!(?:\\/|^)\\.).)*?";
-    charSet = (s) => s.split("").reduce((set, c) => {
-      set[c] = true;
-      return set;
+    charSet = (s) => s.split("").reduce((set2, c) => {
+      set2[c] = true;
+      return set2;
     }, {});
     reSpecials = charSet("().*{}+?[]^$\\!");
     addPatternStartSet = charSet("[.(");
@@ -19947,7 +19964,7 @@ var init_mjs = __esm({
         const rawGlobParts = this.globSet.map((s) => this.slashSplit(s));
         this.globParts = this.preprocess(rawGlobParts);
         this.debug(this.pattern, this.globParts);
-        let set = this.globParts.map((s, _, __) => {
+        let set2 = this.globParts.map((s, _, __) => {
           if (this.isWindows && this.windowsNoMagicRoot) {
             const isUNC = s[0] === "" && s[1] === "" && (s[2] === "?" || !globMagic.test(s[2])) && !globMagic.test(s[3]);
             const isDrive = /^[a-z]:/i.test(s[0]);
@@ -19959,8 +19976,8 @@ var init_mjs = __esm({
           }
           return s.map((ss) => this.parse(ss));
         });
-        this.debug(this.pattern, set);
-        this.set = set.filter((s) => s.indexOf(false) === -1);
+        this.debug(this.pattern, set2);
+        this.set = set2.filter((s) => s.indexOf(false) === -1);
         if (this.isWindows) {
           for (let i = 0; i < this.set.length; i++) {
             const p = this.set[i];
@@ -20016,19 +20033,19 @@ var init_mjs = __esm({
       // get rid of adjascent ** and resolve .. portions
       levelOneOptimize(globParts) {
         return globParts.map((parts) => {
-          parts = parts.reduce((set, part) => {
-            const prev = set[set.length - 1];
+          parts = parts.reduce((set2, part) => {
+            const prev = set2[set2.length - 1];
             if (part === "**" && prev === "**") {
-              return set;
+              return set2;
             }
             if (part === "..") {
               if (prev && prev !== ".." && prev !== "." && prev !== "**") {
-                set.pop();
-                return set;
+                set2.pop();
+                return set2;
               }
             }
-            set.push(part);
-            return set;
+            set2.push(part);
+            return set2;
           }, []);
           return parts.length === 0 ? [""] : parts;
         });
@@ -20546,15 +20563,15 @@ var init_mjs = __esm({
       makeRe() {
         if (this.regexp || this.regexp === false)
           return this.regexp;
-        const set = this.set;
-        if (!set.length) {
+        const set2 = this.set;
+        if (!set2.length) {
           this.regexp = false;
           return this.regexp;
         }
         const options = this.options;
         const twoStar = options.noglobstar ? star : options.dot ? twoStarDot : twoStarNoDot;
         const flags = options.nocase ? "i" : "";
-        let re = set.map((pattern) => {
+        let re = set2.map((pattern) => {
           const pp = pattern.map((p) => typeof p === "string" ? regExpEscape(p) : p === GLOBSTAR ? GLOBSTAR : p._src);
           pp.forEach((p, i) => {
             const next = pp[i + 1];
@@ -20613,16 +20630,16 @@ var init_mjs = __esm({
         }
         const ff = this.slashSplit(f);
         this.debug(this.pattern, "split", ff);
-        const set = this.set;
-        this.debug(this.pattern, "set", set);
+        const set2 = this.set;
+        this.debug(this.pattern, "set", set2);
         let filename = ff[ff.length - 1];
         if (!filename) {
           for (let i = ff.length - 2; !filename && i >= 0; i--) {
             filename = ff[i];
           }
         }
-        for (let i = 0; i < set.length; i++) {
-          const pattern = set[i];
+        for (let i = 0; i < set2.length; i++) {
+          const pattern = set2[i];
           let file = ff;
           if (options.matchBase && pattern.length === 1) {
             file = [filename];
@@ -25382,7 +25399,7 @@ var init_pgIntrospect = __esm({
     import_hanji4 = __toESM(require_hanji());
     init_views();
     init_pgSerializer();
-    init_introspect();
+    init_introspect_pg();
     init_global();
     init_mjs();
     pgSchemas = async (client) => {
@@ -25709,10 +25726,15 @@ var init_pgPushUtils = __esm({
   }
 });
 
-// src/sqlite-introspect.ts
+// src/introspect-sqlite.ts
+var introspect_sqlite_exports = {};
+__export(introspect_sqlite_exports, {
+  indexName: () => indexName3,
+  schemaToTypeScript: () => schemaToTypeScript2
+});
 var sqliteImportsList, indexName3, objToStatement22, relations2, withCasing2, schemaToTypeScript2, isCyclic2, isSelf2, mapColumnDefault, column5, createTableColumns2, createTableIndexes2, createTableUniques2, createTablePKs2, createTableFKs2;
-var init_sqlite_introspect = __esm({
-  "src/sqlite-introspect.ts"() {
+var init_introspect_sqlite = __esm({
+  "src/introspect-sqlite.ts"() {
     init_utils2();
     sqliteImportsList = /* @__PURE__ */ new Set([
       "sqliteTable",
@@ -25829,15 +25851,20 @@ var init_sqlite_introspect = __esm({
         "AnySQLiteColumn",
         ...new Set(imports.sqlite)
       ];
-      let result = `import { ${uniqueSqliteImports.join(
+      const importsTs = `import { ${uniqueSqliteImports.join(
         ", "
       )} } from "drizzle-orm/sqlite-core"
-import { sql } from "drizzle-orm"
+  import { sql } from "drizzle-orm"
 
 `;
-      result += "\n";
-      result += tableStatements.join("\n\n");
-      return result;
+      const decalrations = tableStatements.join("\n\n");
+      const file = importsTs + decalrations;
+      const schemaEntry = `
+    {
+      ${Object.values(schema4.tables).map((it) => withCasing2(it.name, casing)).join(",")}
+    }
+  `;
+      return { file, imports: importsTs, decalrations, schemaEntry };
     };
     isCyclic2 = (fk4) => {
       const key = `${fk4.tableFrom}-${fk4.tableTo}`;
@@ -26011,7 +26038,7 @@ var init_sqliteIntrospect = __esm({
     init_views();
     init_global();
     init_sqliteSerializer();
-    init_sqlite_introspect();
+    init_introspect_sqlite();
     init_mjs();
     import_hanji7 = __toESM(require_hanji());
     connectToSQLite = async (config) => {
@@ -53900,18 +53927,18 @@ var require_set = __commonJS({
       }
       static from(schema4, iterable, ctx) {
         const { replacer } = ctx;
-        const set2 = new this(schema4);
+        const set3 = new this(schema4);
         if (iterable && Symbol.iterator in Object(iterable))
           for (let value of iterable) {
             if (typeof replacer === "function")
               value = replacer.call(iterable, value, value);
-            set2.items.push(Pair.createPair(value, null, ctx));
+            set3.items.push(Pair.createPair(value, null, ctx));
           }
-        return set2;
+        return set3;
       }
     };
     YAMLSet.tag = "tag:yaml.org,2002:set";
-    var set = {
+    var set2 = {
       collection: "map",
       identify: (value) => value instanceof Set,
       nodeClass: YAMLSet,
@@ -53930,7 +53957,7 @@ var require_set = __commonJS({
       }
     };
     exports.YAMLSet = YAMLSet;
-    exports.set = set;
+    exports.set = set2;
   }
 });
 
@@ -54036,7 +54063,7 @@ var require_schema3 = __commonJS({
     var int = require_int2();
     var omap = require_omap();
     var pairs = require_pairs();
-    var set = require_set();
+    var set2 = require_set();
     var timestamp = require_timestamp();
     var schema4 = [
       map.map,
@@ -54055,7 +54082,7 @@ var require_schema3 = __commonJS({
       binary.binary,
       omap.omap,
       pairs.pairs,
-      set.set,
+      set2.set,
       timestamp.intTime,
       timestamp.floatTime,
       timestamp.timestamp
@@ -54081,7 +54108,7 @@ var require_tags = __commonJS({
     var omap = require_omap();
     var pairs = require_pairs();
     var schema$2 = require_schema3();
-    var set = require_set();
+    var set2 = require_set();
     var timestamp = require_timestamp();
     var schemas = /* @__PURE__ */ new Map([
       ["core", schema4.schema],
@@ -54106,14 +54133,14 @@ var require_tags = __commonJS({
       omap: omap.omap,
       pairs: pairs.pairs,
       seq: seq.seq,
-      set: set.set,
+      set: set2.set,
       timestamp: timestamp.timestamp
     };
     var coreKnownTags = {
       "tag:yaml.org,2002:binary": binary.binary,
       "tag:yaml.org,2002:omap": omap.omap,
       "tag:yaml.org,2002:pairs": pairs.pairs,
-      "tag:yaml.org,2002:set": set.set,
+      "tag:yaml.org,2002:set": set2.set,
       "tag:yaml.org,2002:timestamp": timestamp.timestamp
     };
     function getTags(customTags, schemaName) {
@@ -58233,7 +58260,9 @@ var init_studioUtils = __esm({
     };
     prepareMySqlSchema = async (path4) => {
       const imports = prepareFilenames(path4);
-      const mysqlSchema4 = { public: {} };
+      const mysqlSchema4 = {
+        public: {}
+      };
       const relations4 = {};
       const { unregister } = await safeRegister();
       for (let i = 0; i < imports.length; i++) {
@@ -58255,7 +58284,9 @@ var init_studioUtils = __esm({
     };
     prepareSQLiteSchema = async (path4) => {
       const imports = prepareFilenames(path4);
-      const sqliteSchema2 = { public: {} };
+      const sqliteSchema2 = {
+        public: {}
+      };
       const relations4 = {};
       const { unregister } = await safeRegister();
       for (let i = 0; i < imports.length; i++) {
@@ -58305,34 +58336,55 @@ var init_studioUtils = __esm({
       unregister();
       return { pgSchema: pgSchema4, mysqlSchema: mysqlSchema4, sqliteSchema: sqliteSchema2 };
     };
-    drizzleForPostgres = async (connectionConfig, pgSchema4, relations4, verbose) => {
+    drizzleForPostgres = async (connectionConfig, pgSchema4, relations4, ts, verbose) => {
       assertPackages("pg");
       const { drizzle: drizzle2 } = await import("drizzle-orm/node-postgres");
       const pg = await Promise.resolve().then(() => __toESM(require_lib2()));
-      const db = drizzle2(new pg.default.Pool(connectionConfig.dbCredentials), {
+      const client = new pg.default.Pool(connectionConfig.dbCredentials);
+      const db = drizzle2(client, {
         logger: verbose
       });
+      const proxy = async (params) => {
+        const result = await client.query({
+          text: params.sql,
+          values: params.params,
+          rowMode: "array"
+        });
+        return result.rows;
+      };
       return {
-        type: "pg",
+        dialect: "pg",
         db,
+        proxy,
         schema: pgSchema4,
-        relations: relations4
+        relations: relations4,
+        ts
       };
     };
-    drizzleForMySQL = async (config, mysqlSchema4, relations4, verbose) => {
+    drizzleForMySQL = async (config, mysqlSchema4, relations4, ts, verbose) => {
       assertPackages("mysql2");
       const { drizzle: drizzle2 } = await import("drizzle-orm/mysql2");
       const { createPool } = await Promise.resolve().then(() => __toESM(require_promise()));
       const client = createPool({ ...config.dbCredentials, connectionLimit: 1 });
       const db = drizzle2(client, { logger: verbose });
+      const proxy = async (params) => {
+        const result = await client.query({
+          sql: params.sql,
+          values: params.params,
+          rowsAsArray: true
+        });
+        return result[0];
+      };
       return {
-        type: "mysql",
+        dialect: "mysql",
         db,
+        proxy,
         schema: mysqlSchema4,
-        relations: relations4
+        relations: relations4,
+        ts
       };
     };
-    drizzleForSQLite = async (config, sqliteSchema2, relations4, verbose) => {
+    drizzleForSQLite = async (config, sqliteSchema2, relations4, ts, verbose) => {
       const { driver, dbCredentials: creds } = config;
       if (driver === "d1") {
         const { drizzle: drizzle2 } = await Promise.resolve().then(() => (init_driver(), driver_exports));
@@ -58340,11 +58392,16 @@ var init_studioUtils = __esm({
         const db = drizzle2(execute2, creds.wranglerConfigPath, creds.dbName, {
           logger: verbose
         });
+        const proxy = async (params) => {
+          throw new Error("Proxy is not implemented for D1");
+        };
         return {
-          type: "sqlite",
+          dialect: "sqlite",
           db,
+          proxy,
           schema: sqliteSchema2,
-          relations: relations4
+          relations: relations4,
+          ts
         };
       }
       if (driver === "better-sqlite") {
@@ -58353,11 +58410,17 @@ var init_studioUtils = __esm({
         const Database = await import("better-sqlite3");
         const client = new Database.default(creds.url);
         const db = drizzle2(client, { logger: verbose });
+        const proxy = async (params) => {
+          const sql2 = params.sql;
+          return client.prepare(sql2).raw().all(params.params);
+        };
         return {
-          type: "sqlite",
+          dialect: "sqlite",
           db,
+          proxy,
           schema: sqliteSchema2,
-          relations: relations4
+          relations: relations4,
+          ts
         };
       }
       if (driver === "libsql" || driver === "turso") {
@@ -58369,11 +58432,19 @@ var init_studioUtils = __esm({
           client,
           { logger: verbose }
         );
+        const proxy = async (params) => {
+          return client.execute({
+            sql: params.sql,
+            args: params.params
+          }).then((it) => it.rows.map((row) => Object.values(row)));
+        };
         return {
-          type: "sqlite",
+          dialect: "sqlite",
           db,
+          proxy,
           schema: sqliteSchema2,
-          relations: relations4
+          relations: relations4,
+          ts
         };
       }
       assertUnreachable(driver);
@@ -59379,10 +59450,14 @@ var require_cli_options = __commonJS({
   }
 });
 
-// src/mysql-introspect.ts
-var mysqlImportsList, objToStatement23, timeConfig2, binaryConfig, importsPatch2, relations3, withCasing3, schemaToTypeScript3, isCyclic3, isSelf3, mapColumnDefault2, mapColumnDefaultForJson, column6, createTableColumns3, createTableIndexes3, createTableUniques3, createTablePKs3, createTableFKs3;
-var init_mysql_introspect = __esm({
-  "src/mysql-introspect.ts"() {
+// src/introspect-mysql.ts
+var introspect_mysql_exports = {};
+__export(introspect_mysql_exports, {
+  schemaToTypeScript: () => schemaToTypeScript3
+});
+var mysqlImportsList, objToStatement23, timeConfig2, binaryConfig, importsPatch2, relations3, prepareCasing, schemaToTypeScript3, isCyclic3, isSelf3, mapColumnDefault2, mapColumnDefaultForJson, column6, createTableColumns3, createTableIndexes3, createTableUniques3, createTablePKs3, createTableFKs3;
+var init_introspect_mysql = __esm({
+  "src/introspect-mysql.ts"() {
     init_utils2();
     init_mysqlSerializer();
     mysqlImportsList = /* @__PURE__ */ new Set([
@@ -59450,7 +59525,7 @@ var init_mysql_introspect = __esm({
       "timestamp without time zone": "timestamp"
     };
     relations3 = /* @__PURE__ */ new Set();
-    withCasing3 = (value, casing) => {
+    prepareCasing = (casing) => (value) => {
       if (typeof casing === "undefined") {
         return value;
       }
@@ -59460,6 +59535,7 @@ var init_mysql_introspect = __esm({
       return value;
     };
     schemaToTypeScript3 = (schema4, casing) => {
+      const withCasing3 = prepareCasing(casing);
       Object.values(schema4.tables).forEach((table4) => {
         Object.values(table4.foreignKeys).forEach((fk4) => {
           const relation = `${fk4.tableFrom}-${fk4.tableTo}`;
@@ -59468,7 +59544,7 @@ var init_mysql_introspect = __esm({
       });
       const schemas = Object.fromEntries(
         Object.entries(schema4.schemas).map((it) => {
-          return [it[0], withCasing3(it[1], casing)];
+          return [it[0], withCasing3(it[1])];
         })
       );
       const imports = Object.values(schema4.tables).reduce(
@@ -59515,20 +59591,19 @@ var init_mysql_introspect = __esm({
         const tableSchema = schemas[table4.schema];
         const func = tableSchema ? tableSchema : "mysqlTable";
         let statement = "";
-        if (imports.mysql.includes(withCasing3(table4.name, casing))) {
+        if (imports.mysql.includes(withCasing3(table4.name))) {
           statement = `// Table name is in conflict with ${withCasing3(
-            table4.name,
-            casing
+            table4.name
           )} import.
 // Please change to any other name, that is not in imports list
 `;
         }
-        statement += `export const ${withCasing3(table4.name, casing)} = ${func}("${table4.name}", {
+        statement += `export const ${withCasing3(table4.name)} = ${func}("${table4.name}", {
 `;
         statement += createTableColumns3(
           Object.values(table4.columns),
           Object.values(table4.foreignKeys),
-          casing,
+          withCasing3,
           table4.name,
           schema4
         );
@@ -59543,16 +59618,16 @@ var init_mysql_introspect = __esm({
           statement += createTableIndexes3(
             table4.name,
             Object.values(table4.indexes),
-            casing
+            withCasing3
           );
-          statement += createTableFKs3(Object.values(filteredFKs), casing);
+          statement += createTableFKs3(Object.values(filteredFKs), withCasing3);
           statement += createTablePKs3(
             Object.values(table4.compositePrimaryKeys),
-            casing
+            withCasing3
           );
           statement += createTableUniques3(
             Object.values(table4.uniqueConstraints),
-            casing
+            withCasing3
           );
           statement += "	}\n";
           statement += "}";
@@ -59566,16 +59641,28 @@ var init_mysql_introspect = __esm({
         "AnyMySqlColumn",
         ...new Set(imports.mysql)
       ];
-      let result = `import { ${uniqueMySqlImports.join(
+      const importsTs = `import { ${uniqueMySqlImports.join(
         ", "
       )} } from "drizzle-orm/mysql-core"
 import { sql } from "drizzle-orm"
 
 `;
-      result += schemaStatements;
-      result += "\n";
-      result += tableStatements.join("\n\n");
-      return result;
+      let decalrations = schemaStatements;
+      decalrations += "\n";
+      decalrations += tableStatements.join("\n\n");
+      const file = importsTs + decalrations;
+      const schemaEntry = `
+    {
+      ${Object.values(schema4.tables).map((it) => withCasing3(it.name)).join(",")}
+    }
+  `;
+      return {
+        file,
+        // backward compatible, print to file
+        imports: importsTs,
+        decalrations,
+        schemaEntry
+      };
     };
     isCyclic3 = (fk4) => {
       const key = `${fk4.tableFrom}-${fk4.tableTo}`;
@@ -59597,51 +59684,51 @@ import { sql } from "drizzle-orm"
       }
       return defaultValue;
     };
-    column6 = (type, name, defaultValue, autoincrement, onUpdate, casing, isExpression) => {
+    column6 = (type, name, casing, defaultValue, autoincrement, onUpdate, isExpression) => {
       let lowered = type;
       if (!type.startsWith("enum(")) {
         lowered = type.toLowerCase();
       }
       if (lowered === "serial") {
-        return `${withCasing3(name, casing)}: serial("${name}")`;
+        return `${casing(name)}: serial("${name}")`;
       }
       if (lowered.startsWith("int")) {
         const isUnsigned = lowered.startsWith("int unsigned");
-        let out = `${withCasing3(name, casing)}: int("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing(name)}: int("${name}"${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 = `${withCasing3(name, casing)}: tinyint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing(name)}: tinyint("${name}"${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 = `${withCasing3(name, casing)}: smallint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing(name)}: smallint("${name}"${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 = `${withCasing3(name, casing)}: mediumint("${name}"${isUnsigned ? ", { unsigned: true }" : ""})`;
+        let out = `${casing(name)}: mediumint("${name}"${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 = `${withCasing3(name, casing)}: bigint("${name}", { mode: "number"${isUnsigned ? ", unsigned: true" : ""} })`;
+        let out = `${casing(name)}: bigint("${name}", { mode: "number"${isUnsigned ? ", unsigned: true" : ""} })`;
         out += autoincrement ? `.autoincrement()` : "";
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "boolean") {
-        let out = `${withCasing3(name, casing)}: boolean("${name}")`;
+        let out = `${casing(name)}: boolean("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -59651,17 +59738,17 @@ import { sql } from "drizzle-orm"
           const [precision, scale] = lowered.slice(7, lowered.length - 1).split(",");
           params = { precision, scale };
         }
-        let out = params ? `${withCasing3(name, casing)}: double("${name}", ${timeConfig2(params)})` : `${withCasing3(name, casing)}: double("${name}")`;
+        let out = params ? `${casing(name)}: double("${name}", ${timeConfig2(params)})` : `${casing(name)}: double("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "float") {
-        let out = `${withCasing3(name, casing)}: float("${name}")`;
+        let out = `${casing(name)}: float("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "real") {
-        let out = `${withCasing3(name, casing)}: real("${name}")`;
+        let out = `${casing(name)}: real("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -59670,7 +59757,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 = timeConfig2({ fsp, mode: "'string'" });
-        let out = params ? `${withCasing3(name, casing)}: timestamp("${name}", ${params})` : `${withCasing3(name, casing)}: timestamp("${name}")`;
+        let out = params ? `${casing(name)}: timestamp("${name}", ${params})` : `${casing(name)}: timestamp("${name}")`;
         defaultValue = defaultValue === "now()" || defaultValue === "(CURRENT_TIMESTAMP)" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         let onUpdateNow = onUpdate ? ".onUpdateNow()" : "";
@@ -59682,55 +59769,53 @@ import { sql } from "drizzle-orm"
         let fsp = lowered.length > keyLength ? Number(lowered.substring(keyLength, lowered.length - 1)) : null;
         fsp = fsp ? fsp : null;
         const params = timeConfig2({ fsp });
-        let out = params ? `${withCasing3(name, casing)}: time("${name}", ${params})` : `${withCasing3(name, casing)}: time("${name}")`;
+        let out = params ? `${casing(name)}: time("${name}", ${params})` : `${casing(name)}: time("${name}")`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered === "date") {
         let out = `// you can use { mode: 'date' }, if you want to have Date as type for this column
-	${withCasing3(
-          name,
-          casing
+	${casing(
+          name
         )}: date("${name}", { mode: 'string' })`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
       }
       if (lowered === "text") {
-        let out = `${withCasing3(name, casing)}: text("${name}")`;
+        let out = `${casing(name)}: text("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "tinytext") {
-        let out = `${withCasing3(name, casing)}: tinytext("${name}")`;
+        let out = `${casing(name)}: tinytext("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "mediumtext") {
-        let out = `${withCasing3(name, casing)}: mediumtext("${name}")`;
+        let out = `${casing(name)}: mediumtext("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "longtext") {
-        let out = `${withCasing3(name, casing)}: longtext("${name}")`;
+        let out = `${casing(name)}: longtext("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "year") {
-        let out = `${withCasing3(name, casing)}: year("${name}")`;
+        let out = `${casing(name)}: year("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
       if (lowered === "json") {
-        let out = `${withCasing3(name, casing)}: json("${name}")`;
+        let out = `${casing(name)}: json("${name}")`;
         out += defaultValue ? `.default(${mapColumnDefaultForJson(defaultValue)})` : "";
         return out;
       }
       if (lowered.startsWith("varchar")) {
-        let out = `${withCasing3(
-          name,
-          casing
+        let out = `${casing(
+          name
         )}: varchar("${name}", { length: ${lowered.substring(
           "varchar".length + 1,
           lowered.length - 1
@@ -59739,9 +59824,8 @@ import { sql } from "drizzle-orm"
         return out;
       }
       if (lowered.startsWith("char")) {
-        let out = `${withCasing3(
-          name,
-          casing
+        let out = `${casing(
+          name
         )}: char("${name}", { length: ${lowered.substring(
           "char".length + 1,
           lowered.length - 1
@@ -59753,13 +59837,12 @@ import { sql } from "drizzle-orm"
         let out = `// you can use { mode: 'date' }, if you want to have Date as type for this column
 	`;
         const fsp = lowered.startsWith("datetime(") ? lowered.substring("datetime".length + 1, lowered.length - 1) : void 0;
-        out = fsp ? `${withCasing3(
-          name,
-          casing
+        out = fsp ? `${casing(
+          name
         )}: datetime("${name}", { mode: 'string', fsp: ${lowered.substring(
           "datetime".length + 1,
           lowered.length - 1
-        )} })` : `${withCasing3(name, casing)}: datetime("${name}", { mode: 'string'})`;
+        )} })` : `${casing(name)}: datetime("${name}", { mode: 'string'})`;
         defaultValue = defaultValue === "now()" ? ".defaultNow()" : defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -59770,7 +59853,7 @@ import { sql } from "drizzle-orm"
           const [precision, scale] = lowered.slice(8, lowered.length - 1).split(",");
           params = { precision, scale };
         }
-        let out = params ? `${withCasing3(name, casing)}: decimal("${name}", ${timeConfig2(params)})` : `${withCasing3(name, casing)}: decimal("${name}")`;
+        let out = params ? `${casing(name)}: decimal("${name}", ${timeConfig2(params)})` : `${casing(name)}: decimal("${name}")`;
         defaultValue = typeof defaultValue !== "undefined" ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -59780,14 +59863,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 ? `${withCasing3(name, casing)}: binary("${name}", ${params})` : `${withCasing3(name, casing)}: binary("${name}")`;
+        let out = params ? `${casing(name)}: binary("${name}", ${params})` : `${casing(name)}: binary("${name}")`;
         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 = `${withCasing3(name, casing)}: mysqlEnum("${name}", [${values}])`;
+        let out = `${casing(name)}: mysqlEnum("${name}", [${values}])`;
         out += defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         return out;
       }
@@ -59796,7 +59879,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 ? `${withCasing3(name, casing)}: varbinary("${name}", ${params})` : `${withCasing3(name, casing)}: varbinary("${name}")`;
+        let out = params ? `${casing(name)}: varbinary("${name}", ${params})` : `${casing(name)}: varbinary("${name}")`;
         defaultValue = defaultValue ? `.default(${mapColumnDefault2(defaultValue, isExpression)})` : "";
         out += defaultValue;
         return out;
@@ -59822,10 +59905,10 @@ import { sql } from "drizzle-orm"
         statement += column6(
           it.type,
           it.name,
+          casing,
           it.default,
           it.autoincrement,
           it.onUpdate,
-          casing,
           ((_c = (_b = (_a3 = schema4.internal) == null ? void 0 : _a3.tables[tableName]) == null ? void 0 : _b.columns[it.name]) == null ? void 0 : _c.isDefaultAnExpression) ?? false
         );
         statement += it.primaryKey ? ".primaryKey()" : "";
@@ -59839,15 +59922,13 @@ import { sql } from "drizzle-orm"
             const typeSuffix = isCyclic3(it2) ? ": AnyMySqlColumn" : "";
             const paramsStr = objToStatement23(params);
             if (paramsStr) {
-              return `.references(()${typeSuffix} => ${withCasing3(
-                it2.tableTo,
-                casing
-              )}.${withCasing3(it2.columnsTo[0], casing)}, ${paramsStr} )`;
+              return `.references(()${typeSuffix} => ${casing(
+                it2.tableTo
+              )}.${casing(it2.columnsTo[0])}, ${paramsStr} )`;
             }
-            return `.references(()${typeSuffix} => ${withCasing3(
-              it2.tableTo,
-              casing
-            )}.${withCasing3(it2.columnsTo[0], casing)})`;
+            return `.references(()${typeSuffix} => ${casing(it2.tableTo)}.${casing(
+              it2.columnsTo[0]
+            )})`;
           }).join("");
           statement += fksStatement;
         }
@@ -59860,13 +59941,13 @@ import { sql } from "drizzle-orm"
       idxs.forEach((it) => {
         let idxKey = it.name.startsWith(tableName) && it.name !== tableName ? it.name.slice(tableName.length + 1) : it.name;
         idxKey = idxKey.endsWith("_index") ? idxKey.slice(0, -"_index".length) + "_idx" : idxKey;
-        idxKey = withCasing3(idxKey, casing);
+        idxKey = casing(idxKey);
         const indexGeneratedName = indexName(tableName, it.columns);
         const escapedIndexName = indexGeneratedName === it.name ? "" : `"${it.name}"`;
         statement += `		${idxKey}: `;
         statement += it.isUnique ? "uniqueIndex(" : "index(";
         statement += `${escapedIndexName})`;
-        statement += `.on(${it.columns.map((it2) => `table.${withCasing3(it2, casing)}`).join(", ")}),`;
+        statement += `.on(${it.columns.map((it2) => `table.${casing(it2)}`).join(", ")}),`;
         statement += `
 `;
       });
@@ -59875,11 +59956,11 @@ import { sql } from "drizzle-orm"
     createTableUniques3 = (unqs, casing) => {
       let statement = "";
       unqs.forEach((it) => {
-        const idxKey = withCasing3(it.name, casing);
+        const idxKey = casing(it.name);
         statement += `		${idxKey}: `;
         statement += "unique(";
         statement += `"${it.name}")`;
-        statement += `.on(${it.columns.map((it2) => `table.${withCasing3(it2, casing)}`).join(", ")}),`;
+        statement += `.on(${it.columns.map((it2) => `table.${casing(it2)}`).join(", ")}),`;
         statement += `
 `;
       });
@@ -59888,11 +59969,11 @@ import { sql } from "drizzle-orm"
     createTablePKs3 = (pks, casing) => {
       let statement = "";
       pks.forEach((it) => {
-        let idxKey = withCasing3(it.name, casing);
+        let idxKey = casing(it.name);
         statement += `		${idxKey}: `;
         statement += "primaryKey({ columns: [";
         statement += `${it.columns.map((c) => {
-          return `table.${withCasing3(c, casing)}`;
+          return `table.${casing(c)}`;
         }).join(", ")}]${it.name ? `, name: "${it.name}"` : ""}}`;
         statement += "),";
         statement += `
@@ -59904,12 +59985,12 @@ import { sql } from "drizzle-orm"
       let statement = "";
       fks.forEach((it) => {
         const isSelf4 = it.tableTo === it.tableFrom;
-        const tableTo = isSelf4 ? "table" : `${withCasing3(it.tableTo, casing)}`;
-        statement += `		${withCasing3(it.name, casing)}: foreignKey({
+        const tableTo = isSelf4 ? "table" : `${casing(it.tableTo)}`;
+        statement += `		${casing(it.name)}: foreignKey({
 `;
-        statement += `			columns: [${it.columnsFrom.map((i) => `table.${withCasing3(i, casing)}`).join(", ")}],
+        statement += `			columns: [${it.columnsFrom.map((i) => `table.${casing(i)}`).join(", ")}],
 `;
-        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${tableTo}.${withCasing3(i, casing)}`).join(", ")}],
+        statement += `			foreignColumns: [${it.columnsTo.map((i) => `${tableTo}.${casing(i)}`).join(", ")}],
 `;
         statement += `			name: "${it.name}"
 `;
@@ -59938,7 +60019,7 @@ var init_mysqlIntrospect = __esm({
     init_views();
     import_promise = __toESM(require_promise());
     init_mysqlSerializer();
-    init_mysql_introspect();
+    init_introspect_mysql();
     init_global();
     init_mjs();
     connectToMySQL = async (config) => {
@@ -60141,7 +60222,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.20.2",
+  version: "0.20.4",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Drizzle Team",
   license: "MIT",
@@ -60176,12 +60257,13 @@ var package_default = {
     sim: "node -r esbuild-register ./dev/simulate.ts",
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     test: "ava test --timeout=60s",
-    build: "rm -rf ./dist && tsc -p tsconfig.cli-types.json && cp dist/index.d.ts dist/index.d.mts && tsx build.ts",
+    build: "rm -rf ./dist && tsc -p tsconfig.cli-types.json && pnpm mts && tsx build.ts",
+    mts: "cp dist/index.d.ts dist/index.d.mts && cp dist/utils-studio.d.ts dist/utils-studio.d.mts",
     "build:dev": "rm -rf ./dist && tsx build.dev.ts && tsc -p tsconfig.cli-types.json && chmod +x ./dist/index.cjs",
     packit: "pnpm build && cp package.json dist/ && cd dist && pnpm pack",
     tsc: "tsc -p tsconfig.build.json",
     pub: "cp package.json readme.md dist/ && cd dist && npm publish",
-    studio: "./dist/index.cjs studio --verbose",
+    studio: "tsx ./src/cli/index.ts studio --verbose --port=3000",
     "studio:dev": "tsx ./src/cli/index.ts studio --verbose"
   },
   ava: {
@@ -60196,7 +60278,7 @@ var package_default = {
     ]
   },
   dependencies: {
-    "@drizzle-team/studio": "^0.0.27",
+    "@drizzle-team/studio": "^0.0.32",
     "@esbuild-kit/esm-loader": "^2.5.5",
     camelcase: "^7.0.1",
     chalk: "^5.2.0",
@@ -60252,6 +60334,18 @@ var package_default = {
       },
       types: "./index.d.mts",
       default: "./index.mjs"
+    },
+    "./utils-studio": {
+      import: {
+        types: "./utils-studio.d.mts",
+        default: "./utils-studio.mjs"
+      },
+      require: {
+        types: "./utils-studio.d.ts",
+        default: "./utils-studio.js"
+      },
+      types: "./utils-studio.d.mts",
+      default: "./utils-studio.mjs"
     }
   }
 };
@@ -60874,6 +60968,7 @@ init_sqlgenerator();
 
 // src/cli/index.ts
 init_selector_ui();
+var import_studio = require("@drizzle-team/studio");
 init_global();
 var printVersions = async () => {
   const v = await versions();
@@ -61405,7 +61500,7 @@ var introspectPgCommand = new import_commander.Command("introspect:pg").option("
     schemasFilter
   );
   const schemaFile = import_path7.default.join(validatedConfig.out, "schema.ts");
-  (0, import_fs11.writeFileSync)(schemaFile, ts);
+  (0, import_fs11.writeFileSync)(schemaFile, ts.file);
   console.log();
   if (snapshots.length === 0) {
     const { sqlStatements, _meta } = await prepareSQL(
@@ -61458,7 +61553,7 @@ var introspectMySqlCommand = new import_commander.Command("introspect:mysql").op
   const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
   const { schema: schema4, ts } = await mysqlIntrospect2(res, tablesFilter);
   const schemaFile = import_path7.default.join(out, "schema.ts");
-  (0, import_fs11.writeFileSync)(schemaFile, ts);
+  (0, import_fs11.writeFileSync)(schemaFile, ts.file);
   console.log();
   if (snapshots.length === 0) {
     const { sqlStatements, _meta } = await prepareSQL(
@@ -61511,7 +61606,7 @@ var introspectSQLiteCommand = new import_commander.Command("introspect:sqlite").
   const tablesFilter = filterConfig ? typeof filterConfig === "string" ? [filterConfig] : filterConfig : [];
   const { schema: schema4, ts } = await sqliteIntrospect2(res, tablesFilter);
   const schemaFile = import_path7.default.join(out, "schema.ts");
-  (0, import_fs11.writeFileSync)(schemaFile, ts);
+  (0, import_fs11.writeFileSync)(schemaFile, ts.file);
   console.log();
   if (snapshots.length === 0) {
     const { sqlStatements, _meta } = await prepareSQL(
@@ -61578,33 +61673,63 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
   const { driver, schema: schemaPath } = drizzleConfig;
   let setup;
   if (driver === "pg") {
+    const { schemaToTypeScript: schemaToTypeScript4 } = await Promise.resolve().then(() => (init_introspect_pg(), introspect_pg_exports));
+    const { serializePg: serializePg2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
     const { schema: schema4, relations: relations4 } = await preparePgSchema2(schemaPath);
+    const internalSchema = await serializePg2(schemaPath);
+    const ts = schemaToTypeScript4(internalSchema, { casing: "camel" });
     setup = await drizzleForPostgres2(
       drizzleConfig,
       schema4,
       relations4,
+      {
+        imports: ts.imports,
+        declarations: ts.decalrations,
+        schemaEntry: ts.schemaEntry
+      },
       Boolean(options.verbose)
     );
   } else if (driver === "mysql2") {
+    const { schemaToTypeScript: schemaToTypeScript4 } = await Promise.resolve().then(() => (init_introspect_mysql(), introspect_mysql_exports));
     const { schema: schema4, relations: relations4 } = await prepareMySqlSchema2(schemaPath);
+    const { serializeMySql: serializeMySql2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
+    const internalSchema = await serializeMySql2(schemaPath);
+    const ts = schemaToTypeScript4(internalSchema, "camel");
     setup = await drizzleForMySQL2(
       drizzleConfig,
       schema4,
       relations4,
+      {
+        imports: ts.imports,
+        declarations: ts.decalrations,
+        schemaEntry: ts.schemaEntry
+      },
       Boolean(options.verbose)
     );
   } else if (driver === "better-sqlite" || driver === "d1" || driver === "libsql" || driver === "turso") {
+    const { schemaToTypeScript: schemaToTypeScript4 } = await Promise.resolve().then(() => (init_introspect_sqlite(), introspect_sqlite_exports));
     const { schema: schema4, relations: relations4 } = await prepareSQLiteSchema2(schemaPath);
+    const { serializeSQLite: serializeSQLite2 } = await Promise.resolve().then(() => (init_serializer(), serializer_exports));
+    const internalSchema = await serializeSQLite2(schemaPath);
+    const ts = schemaToTypeScript4(internalSchema, "camel");
     setup = await drizzleForSQLite2(
       drizzleConfig,
       schema4,
       relations4,
+      {
+        imports: ts.imports,
+        declarations: ts.decalrations,
+        schemaEntry: ts.schemaEntry
+      },
       Boolean(options.verbose)
     );
   } else {
     assertUnreachable(driver);
   }
-  const server = await (0, import_server.prepareServer)(setup);
+  const qeueryEngine = (0, import_studio.queryEngineForSetup)(setup);
+  const server = await (0, import_server.prepareServer)((_) => {
+    return qeueryEngine;
+  });
   const port = options.port ?? 4983;
   const host = options.host ?? "127.0.0.1";
   console.log();