drizzle-kit 0.20.0-78ed9a3 → 0.20.0-a6a840b

package/index.cjs

@@ -4542,6 +4542,9 @@ Is ${source_default.bold.blue(
 });
 
 // src/global.ts
+function assertUnreachable(x) {
+  throw new Error("Didn't expect to get here");
+}
 var originUUID, snapshotVersion;
 var init_global = __esm({
   "src/global.ts"() {
@@ -4555,7 +4558,7 @@ var index, fk, column, tableV3, compositePK, uniqueConstraint, tableV4, table, d
 var init_mysqlSchema = __esm({
   "src/serializer/mysqlSchema.ts"() {
     init_global();
-    init_utils4();
+    init_utils5();
     init_lib();
     index = objectType({
       name: stringType(),
@@ -4835,7 +4838,7 @@ var indexV2, columnV2, tableV2, enumSchema, pgSchemaV2, references, columnV1, ta
 var init_pgSchema = __esm({
   "src/serializer/pgSchema.ts"() {
     init_global();
-    init_utils4();
+    init_utils5();
     init_lib();
     indexV2 = objectType({
       name: stringType(),
@@ -5193,7 +5196,7 @@ var index3, fk3, compositePK3, column3, tableV33, uniqueConstraint3, table3, dia
 var init_sqliteSchema = __esm({
   "src/serializer/sqliteSchema.ts"() {
     init_global();
-    init_utils4();
+    init_utils5();
     init_lib();
     index3 = objectType({
       name: stringType(),
@@ -11376,9 +11379,6 @@ var init_utils = __esm({
     readDrizzleConfig = async (configPath) => {
       const defaultTsConfigExists = (0, import_fs.existsSync)((0, import_path.join)((0, import_path.resolve)("drizzle.config.ts")));
       const defaultJsConfigExists = (0, import_fs.existsSync)((0, import_path.join)((0, import_path.resolve)("drizzle.config.js")));
-      const defaultJsonConfigExists = (0, import_fs.existsSync)(
-        (0, import_path.join)((0, import_path.resolve)("drizzle.config.json"))
-      );
       const defaultConfigPath = defaultTsConfigExists ? "drizzle.config.ts" : defaultJsConfigExists ? "drizzle.config.js" : "drizzle.config.json";
       if (configPath) {
         console.log(
@@ -11483,7 +11483,7 @@ var init_outputs = __esm({
         connection: {
           driver: () => withStyle.error(`Only "mysql2" is available options for "--driver"`),
           required: () => withStyle.error(
-            `Either "connectionString" or "host", "database" are required for database connection`
+            `Either "uri" or "host", "database" are required for database connection`
           )
         }
       },
@@ -12701,7 +12701,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
         }
       }
     };
-    toDrizzle = (schema4) => {
+    toDrizzle = (schema4, schemaName) => {
       const tables = {};
       Object.values(schema4.tables).forEach((t) => {
         const columns = {};
@@ -12775,17 +12775,31 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           }
           columns[columnName] = columnBuilder;
         });
-        tables[t.name] = (0, import_pg_core2.pgTable)(t.name, columns, (cb) => {
-          const res = {};
-          Object.values(t.compositePrimaryKeys).forEach((cpk) => {
-            const gh = cpk.columns.map((c) => cb[c]);
-            res[cpk.name] = new import_pg_core2.PrimaryKeyBuilder(
-              gh,
-              cpk.name
-            );
+        if (schemaName === "public") {
+          tables[t.name] = (0, import_pg_core2.pgTable)(t.name, columns, (cb) => {
+            const res = {};
+            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
+              const gh = cpk.columns.map((c) => cb[c]);
+              res[cpk.name] = new import_pg_core2.PrimaryKeyBuilder(
+                gh,
+                cpk.name
+              );
+            });
+            return res;
           });
-          return res;
-        });
+        } else {
+          tables[t.name] = (0, import_pg_core2.pgSchema)(schemaName).table(t.name, columns, (cb) => {
+            const res = {};
+            Object.values(t.compositePrimaryKeys).forEach((cpk) => {
+              const gh = cpk.columns.map((c) => cb[c]);
+              res[cpk.name] = new import_pg_core2.PrimaryKeyBuilder(
+                gh,
+                cpk.name
+              );
+            });
+            return res;
+          });
+        }
       });
       return tables;
     };
@@ -14801,7 +14815,7 @@ var init_migrate = __esm({
     init_pgSchema();
     init_sqliteSchema();
     init_mysqlSchema();
-    init_utils4();
+    init_utils5();
     init_words();
     init_outputs();
     prepareAndMigratePg = async (config) => {
@@ -17175,7 +17189,7 @@ var init_snapshotsDiffer = __esm({
     init_lib();
     init_jsonDiffer();
     init_jsonStatements();
-    init_utils4();
+    init_utils5();
     init_sqliteSchema();
     init_mysqlSchema();
     makeChanged = (schema4) => {
@@ -17797,7 +17811,7 @@ var init_pgUp = __esm({
     import_fs5 = require("fs");
     init_global();
     init_pgSchema();
-    init_utils4();
+    init_utils5();
     upPgHandlerV4toV5 = (obj) => {
       const mappedTables = {};
       for (const [key, table4] of Object.entries(obj.tables)) {
@@ -18034,7 +18048,7 @@ var init_mysqlUp = __esm({
     init_source();
     import_fs6 = __toESM(require("fs"));
     init_mysqlSchema();
-    init_utils4();
+    init_utils5();
     upMysqlHandler = (out) => {
     };
     upMySqlHandlerV4toV5 = (obj) => {
@@ -18147,7 +18161,7 @@ var init_upFolders = __esm({
     init_mysqlSchema();
     init_sqliteSchema();
     init_snapshotsDiffer();
-    init_utils4();
+    init_utils5();
     init_words();
     init_pgUp();
     init_pgSchema();
@@ -21582,9 +21596,9 @@ var require_pg_types = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/defaults.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/defaults.js
 var require_defaults = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/defaults.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/defaults.js"(exports, module2) {
     "use strict";
     module2.exports = {
       // database host. defaults to localhost
@@ -21644,11 +21658,10 @@ var require_defaults = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/utils.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/utils.js
 var require_utils2 = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/utils.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/utils.js"(exports, module2) {
     "use strict";
-    var crypto = require("crypto");
     var defaults3 = require_defaults();
     function escapeElement(elementRepresentation) {
       var escaped = elementRepresentation.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
@@ -21763,30 +21776,138 @@ var require_utils2 = __commonJS({
       }
       return config;
     }
-    var md5 = function(string) {
-      return crypto.createHash("md5").update(string, "utf-8").digest("hex");
+    var escapeIdentifier = function(str) {
+      return '"' + str.replace(/"/g, '""') + '"';
     };
-    var postgresMd5PasswordHash = function(user, password, salt) {
-      var inner = md5(password + user);
-      var outer = md5(Buffer.concat([Buffer.from(inner), salt]));
-      return "md5" + outer;
+    var escapeLiteral = function(str) {
+      var hasBackslash = false;
+      var escaped = "'";
+      for (var i = 0; i < str.length; i++) {
+        var c = str[i];
+        if (c === "'") {
+          escaped += c + c;
+        } else if (c === "\\") {
+          escaped += c + c;
+          hasBackslash = true;
+        } else {
+          escaped += c;
+        }
+      }
+      escaped += "'";
+      if (hasBackslash === true) {
+        escaped = " E" + escaped;
+      }
+      return escaped;
     };
     module2.exports = {
       prepareValue: function prepareValueWrapper(value) {
         return prepareValue(value);
       },
       normalizeQueryConfig,
+      escapeIdentifier,
+      escapeLiteral
+    };
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils-legacy.js
+var require_utils_legacy = __commonJS({
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils-legacy.js"(exports, module2) {
+    "use strict";
+    var nodeCrypto = require("crypto");
+    function md5(string) {
+      return nodeCrypto.createHash("md5").update(string, "utf-8").digest("hex");
+    }
+    function postgresMd5PasswordHash(user, password, salt) {
+      var inner = md5(password + user);
+      var outer = md5(Buffer.concat([Buffer.from(inner), salt]));
+      return "md5" + outer;
+    }
+    function sha256(text) {
+      return nodeCrypto.createHash("sha256").update(text).digest();
+    }
+    function hmacSha256(key, msg) {
+      return nodeCrypto.createHmac("sha256", key).update(msg).digest();
+    }
+    async function deriveKey(password, salt, iterations) {
+      return nodeCrypto.pbkdf2Sync(password, salt, iterations, 32, "sha256");
+    }
+    module2.exports = {
       postgresMd5PasswordHash,
+      randomBytes: nodeCrypto.randomBytes,
+      deriveKey,
+      sha256,
+      hmacSha256,
       md5
     };
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/sasl.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils-webcrypto.js
+var require_utils_webcrypto = __commonJS({
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils-webcrypto.js"(exports, module2) {
+    var nodeCrypto = require("crypto");
+    module2.exports = {
+      postgresMd5PasswordHash,
+      randomBytes,
+      deriveKey,
+      sha256,
+      hmacSha256,
+      md5
+    };
+    var webCrypto = nodeCrypto.webcrypto || globalThis.crypto;
+    var subtleCrypto = webCrypto.subtle;
+    var textEncoder = new TextEncoder();
+    function randomBytes(length) {
+      return webCrypto.getRandomValues(Buffer.alloc(length));
+    }
+    async function md5(string) {
+      try {
+        return nodeCrypto.createHash("md5").update(string, "utf-8").digest("hex");
+      } catch (e) {
+        const data = typeof string === "string" ? textEncoder.encode(string) : string;
+        const hash = await subtleCrypto.digest("MD5", data);
+        return Array.from(new Uint8Array(hash)).map((b) => b.toString(16).padStart(2, "0")).join("");
+      }
+    }
+    async function postgresMd5PasswordHash(user, password, salt) {
+      var inner = await md5(password + user);
+      var outer = await md5(Buffer.concat([Buffer.from(inner), salt]));
+      return "md5" + outer;
+    }
+    async function sha256(text) {
+      return await subtleCrypto.digest("SHA-256", text);
+    }
+    async function hmacSha256(keyBuffer, msg) {
+      const key = await subtleCrypto.importKey("raw", keyBuffer, { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+      return await subtleCrypto.sign("HMAC", key, textEncoder.encode(msg));
+    }
+    async function deriveKey(password, salt, iterations) {
+      const key = await subtleCrypto.importKey("raw", textEncoder.encode(password), "PBKDF2", false, ["deriveBits"]);
+      const params = { name: "PBKDF2", hash: "SHA-256", salt, iterations };
+      return await subtleCrypto.deriveBits(params, key, 32 * 8, ["deriveBits"]);
+    }
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils.js
+var require_utils3 = __commonJS({
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/utils.js"(exports, module2) {
+    "use strict";
+    var useLegacyCrypto = parseInt(process.versions && process.versions.node && process.versions.node.split(".")[0]) < 15;
+    if (useLegacyCrypto) {
+      module2.exports = require_utils_legacy();
+    } else {
+      module2.exports = require_utils_webcrypto();
+    }
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/sasl.js
 var require_sasl = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/sasl.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/crypto/sasl.js"(exports, module2) {
     "use strict";
-    var crypto = require("crypto");
+    var crypto = require_utils3();
     function startSession(mechanisms) {
       if (mechanisms.indexOf("SCRAM-SHA-256") === -1) {
         throw new Error("SASL: Only mechanism SCRAM-SHA-256 is currently supported");
@@ -21799,13 +21920,16 @@ var require_sasl = __commonJS({
         message: "SASLInitialResponse"
       };
     }
-    function continueSession(session, password, serverData) {
+    async function continueSession(session, password, serverData) {
       if (session.message !== "SASLInitialResponse") {
         throw new Error("SASL: Last message was not SASLInitialResponse");
       }
       if (typeof password !== "string") {
         throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: client password must be a string");
       }
+      if (password === "") {
+        throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: client password must be a non-empty string");
+      }
       if (typeof serverData !== "string") {
         throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: serverData must be a string");
       }
@@ -21815,21 +21939,20 @@ var require_sasl = __commonJS({
       } else if (sv.nonce.length === session.clientNonce.length) {
         throw new Error("SASL: SCRAM-SERVER-FIRST-MESSAGE: server nonce is too short");
       }
-      var saltBytes = Buffer.from(sv.salt, "base64");
-      var saltedPassword = Hi(password, saltBytes, sv.iteration);
-      var clientKey = hmacSha256(saltedPassword, "Client Key");
-      var storedKey = sha256(clientKey);
       var clientFirstMessageBare = "n=*,r=" + session.clientNonce;
       var serverFirstMessage = "r=" + sv.nonce + ",s=" + sv.salt + ",i=" + sv.iteration;
       var clientFinalMessageWithoutProof = "c=biws,r=" + sv.nonce;
       var authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
-      var clientSignature = hmacSha256(storedKey, authMessage);
-      var clientProofBytes = xorBuffers(clientKey, clientSignature);
-      var clientProof = clientProofBytes.toString("base64");
-      var serverKey = hmacSha256(saltedPassword, "Server Key");
-      var serverSignatureBytes = hmacSha256(serverKey, authMessage);
+      var saltBytes = Buffer.from(sv.salt, "base64");
+      var saltedPassword = await crypto.deriveKey(password, saltBytes, sv.iteration);
+      var clientKey = await crypto.hmacSha256(saltedPassword, "Client Key");
+      var storedKey = await crypto.sha256(clientKey);
+      var clientSignature = await crypto.hmacSha256(storedKey, authMessage);
+      var clientProof = xorBuffers(Buffer.from(clientKey), Buffer.from(clientSignature)).toString("base64");
+      var serverKey = await crypto.hmacSha256(saltedPassword, "Server Key");
+      var serverSignatureBytes = await crypto.hmacSha256(serverKey, authMessage);
       session.message = "SASLResponse";
-      session.serverSignature = serverSignatureBytes.toString("base64");
+      session.serverSignature = Buffer.from(serverSignatureBytes).toString("base64");
       session.response = clientFinalMessageWithoutProof + ",p=" + clientProof;
     }
     function finalizeSession(session, serverData) {
@@ -21922,21 +22045,6 @@ var require_sasl = __commonJS({
       }
       return Buffer.from(a.map((_, i) => a[i] ^ b[i]));
     }
-    function sha256(text) {
-      return crypto.createHash("sha256").update(text).digest();
-    }
-    function hmacSha256(key, msg) {
-      return crypto.createHmac("sha256", key).update(msg).digest();
-    }
-    function Hi(password, saltBytes, iterations) {
-      var ui1 = hmacSha256(password, Buffer.concat([saltBytes, Buffer.from([0, 0, 0, 1])]));
-      var ui = ui1;
-      for (var i = 0; i < iterations - 1; i++) {
-        ui1 = hmacSha256(password, ui1);
-        ui = xorBuffers(ui, ui1);
-      }
-      return ui;
-    }
     module2.exports = {
       startSession,
       continueSession,
@@ -21945,303 +22053,9 @@ var require_sasl = __commonJS({
   }
 });
 
-// node_modules/.pnpm/split2@4.2.0/node_modules/split2/index.js
-var require_split2 = __commonJS({
-  "node_modules/.pnpm/split2@4.2.0/node_modules/split2/index.js"(exports, module2) {
-    "use strict";
-    var { Transform: Transform2 } = require("stream");
-    var { StringDecoder } = require("string_decoder");
-    var kLast = Symbol("last");
-    var kDecoder = Symbol("decoder");
-    function transform(chunk, enc, cb) {
-      let list;
-      if (this.overflow) {
-        const buf = this[kDecoder].write(chunk);
-        list = buf.split(this.matcher);
-        if (list.length === 1)
-          return cb();
-        list.shift();
-        this.overflow = false;
-      } else {
-        this[kLast] += this[kDecoder].write(chunk);
-        list = this[kLast].split(this.matcher);
-      }
-      this[kLast] = list.pop();
-      for (let i = 0; i < list.length; i++) {
-        try {
-          push(this, this.mapper(list[i]));
-        } catch (error2) {
-          return cb(error2);
-        }
-      }
-      this.overflow = this[kLast].length > this.maxLength;
-      if (this.overflow && !this.skipOverflow) {
-        cb(new Error("maximum buffer reached"));
-        return;
-      }
-      cb();
-    }
-    function flush(cb) {
-      this[kLast] += this[kDecoder].end();
-      if (this[kLast]) {
-        try {
-          push(this, this.mapper(this[kLast]));
-        } catch (error2) {
-          return cb(error2);
-        }
-      }
-      cb();
-    }
-    function push(self2, val) {
-      if (val !== void 0) {
-        self2.push(val);
-      }
-    }
-    function noop2(incoming) {
-      return incoming;
-    }
-    function split(matcher, mapper, options) {
-      matcher = matcher || /\r?\n/;
-      mapper = mapper || noop2;
-      options = options || {};
-      switch (arguments.length) {
-        case 1:
-          if (typeof matcher === "function") {
-            mapper = matcher;
-            matcher = /\r?\n/;
-          } else if (typeof matcher === "object" && !(matcher instanceof RegExp) && !matcher[Symbol.split]) {
-            options = matcher;
-            matcher = /\r?\n/;
-          }
-          break;
-        case 2:
-          if (typeof matcher === "function") {
-            options = mapper;
-            mapper = matcher;
-            matcher = /\r?\n/;
-          } else if (typeof mapper === "object") {
-            options = mapper;
-            mapper = noop2;
-          }
-      }
-      options = Object.assign({}, options);
-      options.autoDestroy = true;
-      options.transform = transform;
-      options.flush = flush;
-      options.readableObjectMode = true;
-      const stream = new Transform2(options);
-      stream[kLast] = "";
-      stream[kDecoder] = new StringDecoder("utf8");
-      stream.matcher = matcher;
-      stream.mapper = mapper;
-      stream.maxLength = options.maxLength;
-      stream.skipOverflow = options.skipOverflow || false;
-      stream.overflow = false;
-      stream._destroy = function(err2, cb) {
-        this._writableState.errorEmitted = false;
-        cb(err2);
-      };
-      return stream;
-    }
-    module2.exports = split;
-  }
-});
-
-// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js
-var require_helper = __commonJS({
-  "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js"(exports, module2) {
-    "use strict";
-    var path4 = require("path");
-    var Stream = require("stream").Stream;
-    var split = require_split2();
-    var util2 = require("util");
-    var defaultPort = 5432;
-    var isWin = process.platform === "win32";
-    var warnStream = process.stderr;
-    var S_IRWXG = 56;
-    var S_IRWXO = 7;
-    var S_IFMT = 61440;
-    var S_IFREG = 32768;
-    function isRegFile(mode) {
-      return (mode & S_IFMT) == S_IFREG;
-    }
-    var fieldNames = ["host", "port", "database", "user", "password"];
-    var nrOfFields = fieldNames.length;
-    var passKey = fieldNames[nrOfFields - 1];
-    function warn() {
-      var isWritable = warnStream instanceof Stream && true === warnStream.writable;
-      if (isWritable) {
-        var args = Array.prototype.slice.call(arguments).concat("\n");
-        warnStream.write(util2.format.apply(util2, args));
-      }
-    }
-    Object.defineProperty(module2.exports, "isWin", {
-      get: function() {
-        return isWin;
-      },
-      set: function(val) {
-        isWin = val;
-      }
-    });
-    module2.exports.warnTo = function(stream) {
-      var old = warnStream;
-      warnStream = stream;
-      return old;
-    };
-    module2.exports.getFileName = function(rawEnv) {
-      var env2 = rawEnv || process.env;
-      var file = env2.PGPASSFILE || (isWin ? path4.join(env2.APPDATA || "./", "postgresql", "pgpass.conf") : path4.join(env2.HOME || "./", ".pgpass"));
-      return file;
-    };
-    module2.exports.usePgPass = function(stats, fname) {
-      if (Object.prototype.hasOwnProperty.call(process.env, "PGPASSWORD")) {
-        return false;
-      }
-      if (isWin) {
-        return true;
-      }
-      fname = fname || "<unkn>";
-      if (!isRegFile(stats.mode)) {
-        warn('WARNING: password file "%s" is not a plain file', fname);
-        return false;
-      }
-      if (stats.mode & (S_IRWXG | S_IRWXO)) {
-        warn('WARNING: password file "%s" has group or world access; permissions should be u=rw (0600) or less', fname);
-        return false;
-      }
-      return true;
-    };
-    var matcher = module2.exports.match = function(connInfo, entry) {
-      return fieldNames.slice(0, -1).reduce(function(prev, field, idx) {
-        if (idx == 1) {
-          if (Number(connInfo[field] || defaultPort) === Number(entry[field])) {
-            return prev && true;
-          }
-        }
-        return prev && (entry[field] === "*" || entry[field] === connInfo[field]);
-      }, true);
-    };
-    module2.exports.getPassword = function(connInfo, stream, cb) {
-      var pass;
-      var lineStream = stream.pipe(split());
-      function onLine(line) {
-        var entry = parseLine(line);
-        if (entry && isValidEntry(entry) && matcher(connInfo, entry)) {
-          pass = entry[passKey];
-          lineStream.end();
-        }
-      }
-      var onEnd = function() {
-        stream.destroy();
-        cb(pass);
-      };
-      var onErr = function(err2) {
-        stream.destroy();
-        warn("WARNING: error on reading file: %s", err2);
-        cb(void 0);
-      };
-      stream.on("error", onErr);
-      lineStream.on("data", onLine).on("end", onEnd).on("error", onErr);
-    };
-    var parseLine = module2.exports.parseLine = function(line) {
-      if (line.length < 11 || line.match(/^\s+#/)) {
-        return null;
-      }
-      var curChar = "";
-      var prevChar = "";
-      var fieldIdx = 0;
-      var startIdx = 0;
-      var endIdx = 0;
-      var obj = {};
-      var isLastField = false;
-      var addToObj = function(idx, i0, i1) {
-        var field = line.substring(i0, i1);
-        if (!Object.hasOwnProperty.call(process.env, "PGPASS_NO_DEESCAPE")) {
-          field = field.replace(/\\([:\\])/g, "$1");
-        }
-        obj[fieldNames[idx]] = field;
-      };
-      for (var i = 0; i < line.length - 1; i += 1) {
-        curChar = line.charAt(i + 1);
-        prevChar = line.charAt(i);
-        isLastField = fieldIdx == nrOfFields - 1;
-        if (isLastField) {
-          addToObj(fieldIdx, startIdx);
-          break;
-        }
-        if (i >= 0 && curChar == ":" && prevChar !== "\\") {
-          addToObj(fieldIdx, startIdx, i + 1);
-          startIdx = i + 2;
-          fieldIdx += 1;
-        }
-      }
-      obj = Object.keys(obj).length === nrOfFields ? obj : null;
-      return obj;
-    };
-    var isValidEntry = module2.exports.isValidEntry = function(entry) {
-      var rules = {
-        // host
-        0: function(x) {
-          return x.length > 0;
-        },
-        // port
-        1: function(x) {
-          if (x === "*") {
-            return true;
-          }
-          x = Number(x);
-          return isFinite(x) && x > 0 && x < 9007199254740992 && Math.floor(x) === x;
-        },
-        // database
-        2: function(x) {
-          return x.length > 0;
-        },
-        // username
-        3: function(x) {
-          return x.length > 0;
-        },
-        // password
-        4: function(x) {
-          return x.length > 0;
-        }
-      };
-      for (var idx = 0; idx < fieldNames.length; idx += 1) {
-        var rule = rules[idx];
-        var value = entry[fieldNames[idx]] || "";
-        var res = rule(value);
-        if (!res) {
-          return false;
-        }
-      }
-      return true;
-    };
-  }
-});
-
-// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js
-var require_lib = __commonJS({
-  "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js"(exports, module2) {
-    "use strict";
-    var path4 = require("path");
-    var fs8 = require("fs");
-    var helper = require_helper();
-    module2.exports = function(connInfo, cb) {
-      var file = helper.getFileName();
-      fs8.stat(file, function(err2, stat) {
-        if (err2 || !helper.usePgPass(stat, file)) {
-          return cb(void 0);
-        }
-        var st = fs8.createReadStream(file);
-        helper.getPassword(connInfo, st, cb);
-      });
-    };
-    module2.exports.warnTo = helper.warnTo;
-  }
-});
-
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/type-overrides.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/type-overrides.js
 var require_type_overrides = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/type-overrides.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/type-overrides.js"(exports, module2) {
     "use strict";
     var types = require_pg_types();
     function TypeOverrides(userTypes) {
@@ -22359,9 +22173,9 @@ var require_pg_connection_string = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/connection-parameters.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/connection-parameters.js
 var require_connection_parameters = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/connection-parameters.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/connection-parameters.js"(exports, module2) {
     "use strict";
     var dns = require("dns");
     var defaults3 = require_defaults();
@@ -22498,9 +22312,9 @@ var require_connection_parameters = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/result.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/result.js
 var require_result = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/result.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/result.js"(exports, module2) {
     "use strict";
     var types = require_pg_types();
     var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/;
@@ -22518,6 +22332,7 @@ var require_result = __commonJS({
         if (this.rowAsArray) {
           this.parseRow = this._parseRowAsArray;
         }
+        this._prebuiltEmptyResultObject = null;
       }
       // adds a command complete message
       addCommandComplete(msg) {
@@ -22550,14 +22365,12 @@ var require_result = __commonJS({
         return row;
       }
       parseRow(rowData) {
-        var row = {};
+        var row = { ...this._prebuiltEmptyResultObject };
         for (var i = 0, len = rowData.length; i < len; i++) {
           var rawValue = rowData[i];
           var field = this.fields[i].name;
           if (rawValue !== null) {
             row[field] = this._parsers[i](rawValue);
-          } else {
-            row[field] = null;
           }
         }
         return row;
@@ -22578,15 +22391,23 @@ var require_result = __commonJS({
             this._parsers[i] = types.getTypeParser(desc.dataTypeID, desc.format || "text");
           }
         }
+        this._createPrebuiltEmptyResultObject();
+      }
+      _createPrebuiltEmptyResultObject() {
+        var row = {};
+        for (var i = 0; i < this.fields.length; i++) {
+          row[this.fields[i].name] = null;
+        }
+        this._prebuiltEmptyResultObject = { ...row };
       }
     };
     module2.exports = Result;
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/query.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/query.js
 var require_query = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/query.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/query.js"(exports, module2) {
     "use strict";
     var { EventEmitter } = require("events");
     var Result = require_result();
@@ -23612,13 +23433,50 @@ var require_dist = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/connection.js
+// node_modules/.pnpm/pg-cloudflare@1.1.1/node_modules/pg-cloudflare/dist/empty.js
+var empty_exports = {};
+__export(empty_exports, {
+  default: () => empty_default
+});
+var empty_default;
+var init_empty = __esm({
+  "node_modules/.pnpm/pg-cloudflare@1.1.1/node_modules/pg-cloudflare/dist/empty.js"() {
+    empty_default = {};
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/stream.js
+var require_stream = __commonJS({
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/stream.js"(exports, module2) {
+    module2.exports.getStream = function getStream(ssl) {
+      const net = require("net");
+      if (typeof net.Socket === "function") {
+        return new net.Socket();
+      } else {
+        const { CloudflareSocket } = (init_empty(), __toCommonJS(empty_exports));
+        return new CloudflareSocket(ssl);
+      }
+    };
+    module2.exports.getSecureStream = function getSecureStream(options) {
+      var tls = require("tls");
+      if (tls.connect) {
+        return tls.connect(options);
+      } else {
+        options.socket.startTls(options);
+        return options.socket;
+      }
+    };
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/connection.js
 var require_connection = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/connection.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/connection.js"(exports, module2) {
     "use strict";
     var net = require("net");
     var EventEmitter = require("events").EventEmitter;
     var { parse, serialize } = require_dist();
+    var { getStream, getSecureStream } = require_stream();
     var flushBuffer = serialize.flush();
     var syncBuffer = serialize.sync();
     var endBuffer = serialize.end();
@@ -23626,7 +23484,10 @@ var require_connection = __commonJS({
       constructor(config) {
         super();
         config = config || {};
-        this.stream = config.stream || new net.Socket();
+        this.stream = config.stream || getStream(config.ssl);
+        if (typeof this.stream === "function") {
+          this.stream = this.stream(config);
+        }
         this._keepAlive = config.keepAlive;
         this._keepAliveInitialDelayMillis = config.keepAliveInitialDelayMillis;
         this.lastBuffer = false;
@@ -23677,7 +23538,6 @@ var require_connection = __commonJS({
               self2.stream.end();
               return self2.emit("error", new Error("There was an error establishing an SSL connection"));
           }
-          var tls = require("tls");
           const options = {
             socket: self2.stream
           };
@@ -23687,11 +23547,12 @@ var require_connection = __commonJS({
               options.key = self2.ssl.key;
             }
           }
-          if (net.isIP(host) === 0) {
+          var net2 = require("net");
+          if (net2.isIP && net2.isIP(host) === 0) {
             options.servername = host;
           }
           try {
-            self2.stream = tls.connect(options);
+            self2.stream = getSecureStream(options);
           } catch (err2) {
             return self2.emit("error", err2);
           }
@@ -23701,9 +23562,6 @@ var require_connection = __commonJS({
         });
       }
       attachListeners(stream) {
-        stream.on("end", () => {
-          this.emit("end");
-        });
         parse(stream, (msg) => {
           var eventName = msg.name === "error" ? "errorMessage" : msg.name;
           if (this._emitMessage) {
@@ -23758,7 +23616,6 @@ var require_connection = __commonJS({
       }
       sync() {
         this._ending = true;
-        this._send(flushBuffer);
         this._send(syncBuffer);
       }
       ref() {
@@ -23797,20 +23654,313 @@ var require_connection = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/client.js
+// node_modules/.pnpm/split2@4.2.0/node_modules/split2/index.js
+var require_split2 = __commonJS({
+  "node_modules/.pnpm/split2@4.2.0/node_modules/split2/index.js"(exports, module2) {
+    "use strict";
+    var { Transform: Transform2 } = require("stream");
+    var { StringDecoder } = require("string_decoder");
+    var kLast = Symbol("last");
+    var kDecoder = Symbol("decoder");
+    function transform(chunk, enc, cb) {
+      let list;
+      if (this.overflow) {
+        const buf = this[kDecoder].write(chunk);
+        list = buf.split(this.matcher);
+        if (list.length === 1)
+          return cb();
+        list.shift();
+        this.overflow = false;
+      } else {
+        this[kLast] += this[kDecoder].write(chunk);
+        list = this[kLast].split(this.matcher);
+      }
+      this[kLast] = list.pop();
+      for (let i = 0; i < list.length; i++) {
+        try {
+          push(this, this.mapper(list[i]));
+        } catch (error2) {
+          return cb(error2);
+        }
+      }
+      this.overflow = this[kLast].length > this.maxLength;
+      if (this.overflow && !this.skipOverflow) {
+        cb(new Error("maximum buffer reached"));
+        return;
+      }
+      cb();
+    }
+    function flush(cb) {
+      this[kLast] += this[kDecoder].end();
+      if (this[kLast]) {
+        try {
+          push(this, this.mapper(this[kLast]));
+        } catch (error2) {
+          return cb(error2);
+        }
+      }
+      cb();
+    }
+    function push(self2, val) {
+      if (val !== void 0) {
+        self2.push(val);
+      }
+    }
+    function noop2(incoming) {
+      return incoming;
+    }
+    function split(matcher, mapper, options) {
+      matcher = matcher || /\r?\n/;
+      mapper = mapper || noop2;
+      options = options || {};
+      switch (arguments.length) {
+        case 1:
+          if (typeof matcher === "function") {
+            mapper = matcher;
+            matcher = /\r?\n/;
+          } else if (typeof matcher === "object" && !(matcher instanceof RegExp) && !matcher[Symbol.split]) {
+            options = matcher;
+            matcher = /\r?\n/;
+          }
+          break;
+        case 2:
+          if (typeof matcher === "function") {
+            options = mapper;
+            mapper = matcher;
+            matcher = /\r?\n/;
+          } else if (typeof mapper === "object") {
+            options = mapper;
+            mapper = noop2;
+          }
+      }
+      options = Object.assign({}, options);
+      options.autoDestroy = true;
+      options.transform = transform;
+      options.flush = flush;
+      options.readableObjectMode = true;
+      const stream = new Transform2(options);
+      stream[kLast] = "";
+      stream[kDecoder] = new StringDecoder("utf8");
+      stream.matcher = matcher;
+      stream.mapper = mapper;
+      stream.maxLength = options.maxLength;
+      stream.skipOverflow = options.skipOverflow || false;
+      stream.overflow = false;
+      stream._destroy = function(err2, cb) {
+        this._writableState.errorEmitted = false;
+        cb(err2);
+      };
+      return stream;
+    }
+    module2.exports = split;
+  }
+});
+
+// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js
+var require_helper = __commonJS({
+  "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/helper.js"(exports, module2) {
+    "use strict";
+    var path4 = require("path");
+    var Stream = require("stream").Stream;
+    var split = require_split2();
+    var util2 = require("util");
+    var defaultPort = 5432;
+    var isWin = process.platform === "win32";
+    var warnStream = process.stderr;
+    var S_IRWXG = 56;
+    var S_IRWXO = 7;
+    var S_IFMT = 61440;
+    var S_IFREG = 32768;
+    function isRegFile(mode) {
+      return (mode & S_IFMT) == S_IFREG;
+    }
+    var fieldNames = ["host", "port", "database", "user", "password"];
+    var nrOfFields = fieldNames.length;
+    var passKey = fieldNames[nrOfFields - 1];
+    function warn() {
+      var isWritable = warnStream instanceof Stream && true === warnStream.writable;
+      if (isWritable) {
+        var args = Array.prototype.slice.call(arguments).concat("\n");
+        warnStream.write(util2.format.apply(util2, args));
+      }
+    }
+    Object.defineProperty(module2.exports, "isWin", {
+      get: function() {
+        return isWin;
+      },
+      set: function(val) {
+        isWin = val;
+      }
+    });
+    module2.exports.warnTo = function(stream) {
+      var old = warnStream;
+      warnStream = stream;
+      return old;
+    };
+    module2.exports.getFileName = function(rawEnv) {
+      var env2 = rawEnv || process.env;
+      var file = env2.PGPASSFILE || (isWin ? path4.join(env2.APPDATA || "./", "postgresql", "pgpass.conf") : path4.join(env2.HOME || "./", ".pgpass"));
+      return file;
+    };
+    module2.exports.usePgPass = function(stats, fname) {
+      if (Object.prototype.hasOwnProperty.call(process.env, "PGPASSWORD")) {
+        return false;
+      }
+      if (isWin) {
+        return true;
+      }
+      fname = fname || "<unkn>";
+      if (!isRegFile(stats.mode)) {
+        warn('WARNING: password file "%s" is not a plain file', fname);
+        return false;
+      }
+      if (stats.mode & (S_IRWXG | S_IRWXO)) {
+        warn('WARNING: password file "%s" has group or world access; permissions should be u=rw (0600) or less', fname);
+        return false;
+      }
+      return true;
+    };
+    var matcher = module2.exports.match = function(connInfo, entry) {
+      return fieldNames.slice(0, -1).reduce(function(prev, field, idx) {
+        if (idx == 1) {
+          if (Number(connInfo[field] || defaultPort) === Number(entry[field])) {
+            return prev && true;
+          }
+        }
+        return prev && (entry[field] === "*" || entry[field] === connInfo[field]);
+      }, true);
+    };
+    module2.exports.getPassword = function(connInfo, stream, cb) {
+      var pass;
+      var lineStream = stream.pipe(split());
+      function onLine(line) {
+        var entry = parseLine(line);
+        if (entry && isValidEntry(entry) && matcher(connInfo, entry)) {
+          pass = entry[passKey];
+          lineStream.end();
+        }
+      }
+      var onEnd = function() {
+        stream.destroy();
+        cb(pass);
+      };
+      var onErr = function(err2) {
+        stream.destroy();
+        warn("WARNING: error on reading file: %s", err2);
+        cb(void 0);
+      };
+      stream.on("error", onErr);
+      lineStream.on("data", onLine).on("end", onEnd).on("error", onErr);
+    };
+    var parseLine = module2.exports.parseLine = function(line) {
+      if (line.length < 11 || line.match(/^\s+#/)) {
+        return null;
+      }
+      var curChar = "";
+      var prevChar = "";
+      var fieldIdx = 0;
+      var startIdx = 0;
+      var endIdx = 0;
+      var obj = {};
+      var isLastField = false;
+      var addToObj = function(idx, i0, i1) {
+        var field = line.substring(i0, i1);
+        if (!Object.hasOwnProperty.call(process.env, "PGPASS_NO_DEESCAPE")) {
+          field = field.replace(/\\([:\\])/g, "$1");
+        }
+        obj[fieldNames[idx]] = field;
+      };
+      for (var i = 0; i < line.length - 1; i += 1) {
+        curChar = line.charAt(i + 1);
+        prevChar = line.charAt(i);
+        isLastField = fieldIdx == nrOfFields - 1;
+        if (isLastField) {
+          addToObj(fieldIdx, startIdx);
+          break;
+        }
+        if (i >= 0 && curChar == ":" && prevChar !== "\\") {
+          addToObj(fieldIdx, startIdx, i + 1);
+          startIdx = i + 2;
+          fieldIdx += 1;
+        }
+      }
+      obj = Object.keys(obj).length === nrOfFields ? obj : null;
+      return obj;
+    };
+    var isValidEntry = module2.exports.isValidEntry = function(entry) {
+      var rules = {
+        // host
+        0: function(x) {
+          return x.length > 0;
+        },
+        // port
+        1: function(x) {
+          if (x === "*") {
+            return true;
+          }
+          x = Number(x);
+          return isFinite(x) && x > 0 && x < 9007199254740992 && Math.floor(x) === x;
+        },
+        // database
+        2: function(x) {
+          return x.length > 0;
+        },
+        // username
+        3: function(x) {
+          return x.length > 0;
+        },
+        // password
+        4: function(x) {
+          return x.length > 0;
+        }
+      };
+      for (var idx = 0; idx < fieldNames.length; idx += 1) {
+        var rule = rules[idx];
+        var value = entry[fieldNames[idx]] || "";
+        var res = rule(value);
+        if (!res) {
+          return false;
+        }
+      }
+      return true;
+    };
+  }
+});
+
+// node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js
+var require_lib = __commonJS({
+  "node_modules/.pnpm/pgpass@1.0.5/node_modules/pgpass/lib/index.js"(exports, module2) {
+    "use strict";
+    var path4 = require("path");
+    var fs8 = require("fs");
+    var helper = require_helper();
+    module2.exports = function(connInfo, cb) {
+      var file = helper.getFileName();
+      fs8.stat(file, function(err2, stat) {
+        if (err2 || !helper.usePgPass(stat, file)) {
+          return cb(void 0);
+        }
+        var st = fs8.createReadStream(file);
+        helper.getPassword(connInfo, st, cb);
+      });
+    };
+    module2.exports.warnTo = helper.warnTo;
+  }
+});
+
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/client.js
 var require_client = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/client.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/client.js"(exports, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
-    var util2 = require("util");
     var utils = require_utils2();
     var sasl = require_sasl();
-    var pgPass = require_lib();
     var TypeOverrides = require_type_overrides();
     var ConnectionParameters = require_connection_parameters();
     var Query = require_query();
     var defaults3 = require_defaults();
     var Connection2 = require_connection();
+    var crypto = require_utils3();
     var Client2 = class extends EventEmitter {
       constructor(config) {
         super();
@@ -23830,6 +23980,7 @@ var require_client = __commonJS({
         this._Promise = c.Promise || global.Promise;
         this._types = new TypeOverrides(c.types);
         this._ending = false;
+        this._ended = false;
         this._connecting = false;
         this._connected = false;
         this._connectionError = false;
@@ -23905,6 +24056,7 @@ var require_client = __commonJS({
           const error2 = this._ending ? new Error("Connection terminated") : new Error("Connection terminated unexpectedly");
           clearTimeout(this.connectionTimeoutHandle);
           this._errorAllQueries(error2);
+          this._ended = true;
           if (!this._ending) {
             if (this._connecting && !this._connectionError) {
               if (this._connectionCallback) {
@@ -23979,12 +24131,17 @@ var require_client = __commonJS({
         } else if (this.password !== null) {
           cb();
         } else {
-          pgPass(this.connectionParameters, (pass) => {
-            if (void 0 !== pass) {
-              this.connectionParameters.password = this.password = pass;
-            }
-            cb();
-          });
+          try {
+            const pgPass = require_lib();
+            pgPass(this.connectionParameters, (pass) => {
+              if (void 0 !== pass) {
+                this.connectionParameters.password = this.password = pass;
+              }
+              cb();
+            });
+          } catch (e) {
+            this.emit("error", e);
+          }
         }
       }
       _handleAuthCleartextPassword(msg) {
@@ -23993,24 +24150,40 @@ var require_client = __commonJS({
         });
       }
       _handleAuthMD5Password(msg) {
-        this._checkPgPass(() => {
-          const hashedPassword = utils.postgresMd5PasswordHash(this.user, this.password, msg.salt);
-          this.connection.password(hashedPassword);
+        this._checkPgPass(async () => {
+          try {
+            const hashedPassword = await crypto.postgresMd5PasswordHash(this.user, this.password, msg.salt);
+            this.connection.password(hashedPassword);
+          } catch (e) {
+            this.emit("error", e);
+          }
         });
       }
       _handleAuthSASL(msg) {
         this._checkPgPass(() => {
-          this.saslSession = sasl.startSession(msg.mechanisms);
-          this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response);
+          try {
+            this.saslSession = sasl.startSession(msg.mechanisms);
+            this.connection.sendSASLInitialResponseMessage(this.saslSession.mechanism, this.saslSession.response);
+          } catch (err2) {
+            this.connection.emit("error", err2);
+          }
         });
       }
-      _handleAuthSASLContinue(msg) {
-        sasl.continueSession(this.saslSession, this.password, msg.data);
-        this.connection.sendSCRAMClientFinalMessage(this.saslSession.response);
+      async _handleAuthSASLContinue(msg) {
+        try {
+          await sasl.continueSession(this.saslSession, this.password, msg.data);
+          this.connection.sendSCRAMClientFinalMessage(this.saslSession.response);
+        } catch (err2) {
+          this.connection.emit("error", err2);
+        }
       }
       _handleAuthSASLFinal(msg) {
-        sasl.finalizeSession(this.saslSession, msg.data);
-        this.saslSession = null;
+        try {
+          sasl.finalizeSession(this.saslSession, msg.data);
+          this.saslSession = null;
+        } catch (err2) {
+          this.connection.emit("error", err2);
+        }
       }
       _handleBackendKeyData(msg) {
         this.processID = msg.processID;
@@ -24152,30 +24325,14 @@ var require_client = __commonJS({
       getTypeParser(oid, format) {
         return this._types.getTypeParser(oid, format);
       }
-      // Ported from PostgreSQL 9.2.4 source code in src/interfaces/libpq/fe-exec.c
+      // escapeIdentifier and escapeLiteral moved to utility functions & exported
+      // on PG
+      // re-exported here for backwards compatibility
       escapeIdentifier(str) {
-        return '"' + str.replace(/"/g, '""') + '"';
+        return utils.escapeIdentifier(str);
       }
-      // Ported from PostgreSQL 9.2.4 source code in src/interfaces/libpq/fe-exec.c
       escapeLiteral(str) {
-        var hasBackslash = false;
-        var escaped = "'";
-        for (var i = 0; i < str.length; i++) {
-          var c = str[i];
-          if (c === "'") {
-            escaped += c + c;
-          } else if (c === "\\") {
-            escaped += c + c;
-            hasBackslash = true;
-          } else {
-            escaped += c;
-          }
-        }
-        escaped += "'";
-        if (hasBackslash === true) {
-          escaped = " E" + escaped;
-        }
-        return escaped;
+        return utils.escapeLiteral(str);
       }
       _pulseQueryQueue() {
         if (this.readyForQuery === true) {
@@ -24217,6 +24374,9 @@ var require_client = __commonJS({
           if (!query.callback) {
             result = new this._Promise((resolve2, reject) => {
               query.callback = (err2, res) => err2 ? reject(err2) : resolve2(res);
+            }).catch((err2) => {
+              Error.captureStackTrace(err2);
+              throw err2;
             });
           }
         }
@@ -24271,7 +24431,7 @@ var require_client = __commonJS({
       }
       end(cb) {
         this._ending = true;
-        if (!this.connection._connecting) {
+        if (!this.connection._connecting || this._ended) {
           if (cb) {
             cb();
           } else {
@@ -24297,9 +24457,9 @@ var require_client = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-pool@3.6.1_pg@8.8.0/node_modules/pg-pool/index.js
+// node_modules/.pnpm/pg-pool@3.6.1_pg@8.11.3/node_modules/pg-pool/index.js
 var require_pg_pool = __commonJS({
-  "node_modules/.pnpm/pg-pool@3.6.1_pg@8.8.0/node_modules/pg-pool/index.js"(exports, module2) {
+  "node_modules/.pnpm/pg-pool@3.6.1_pg@8.11.3/node_modules/pg-pool/index.js"(exports, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var NOOP = function() {
@@ -24680,72 +24840,9 @@ var require_pg_pool = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/package.json
-var require_package = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/package.json"(exports, module2) {
-    module2.exports = {
-      name: "pg",
-      version: "8.8.0",
-      description: "PostgreSQL client - pure javascript & libpq with the same API",
-      keywords: [
-        "database",
-        "libpq",
-        "pg",
-        "postgre",
-        "postgres",
-        "postgresql",
-        "rdbms"
-      ],
-      homepage: "https://github.com/brianc/node-postgres",
-      repository: {
-        type: "git",
-        url: "git://github.com/brianc/node-postgres.git",
-        directory: "packages/pg"
-      },
-      author: "Brian Carlson <brian.m.carlson@gmail.com>",
-      main: "./lib",
-      dependencies: {
-        "buffer-writer": "2.0.0",
-        "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.5.0",
-        "pg-pool": "^3.5.2",
-        "pg-protocol": "^1.5.0",
-        "pg-types": "^2.1.0",
-        pgpass: "1.x"
-      },
-      devDependencies: {
-        async: "2.6.4",
-        bluebird: "3.5.2",
-        co: "4.6.0",
-        "pg-copy-streams": "0.3.0"
-      },
-      peerDependencies: {
-        "pg-native": ">=3.0.1"
-      },
-      peerDependenciesMeta: {
-        "pg-native": {
-          optional: true
-        }
-      },
-      scripts: {
-        test: "make test-all"
-      },
-      files: [
-        "lib",
-        "SPONSORS.md"
-      ],
-      license: "MIT",
-      engines: {
-        node: ">= 8.0.0"
-      },
-      gitHead: "c99fb2c127ddf8d712500db2c7b9a5491a178655"
-    };
-  }
-});
-
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/query.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/query.js
 var require_query2 = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/query.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/query.js"(exports, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var util2 = require("util");
@@ -24885,13 +24982,17 @@ var require_query2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/client.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/client.js
 var require_client2 = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/client.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/client.js"(exports, module2) {
     "use strict";
-    var Native = require("pg-native");
+    var Native;
+    try {
+      Native = require("pg-native");
+    } catch (e) {
+      throw e;
+    }
     var TypeOverrides = require_type_overrides();
-    var pkg = require_package();
     var EventEmitter = require("events").EventEmitter;
     var util2 = require("util");
     var ConnectionParameters = require_connection_parameters();
@@ -24910,6 +25011,8 @@ var require_client2 = __commonJS({
       this._connected = false;
       this._queryable = true;
       var cp = this.connectionParameters = new ConnectionParameters(config);
+      if (config.nativeConnectionString)
+        cp.nativeConnectionString = config.nativeConnectionString;
       this.user = cp.user;
       Object.defineProperty(this, "password", {
         configurable: true,
@@ -24946,6 +25049,8 @@ var require_client2 = __commonJS({
       }
       this._connecting = true;
       this.connectionParameters.getLibpqConnectionString(function(err2, conString) {
+        if (self2.connectionParameters.nativeConnectionString)
+          conString = self2.connectionParameters.nativeConnectionString;
         if (err2)
           return cb(err2);
         self2.native.connect(conString, function(err3) {
@@ -25008,6 +25113,9 @@ var require_client2 = __commonJS({
           result = new this._Promise((resolve2, reject) => {
             resolveOut = resolve2;
             rejectOut = reject;
+          }).catch((err2) => {
+            Error.captureStackTrace(err2);
+            throw err2;
           });
           query.callback = (err2, res) => err2 ? rejectOut(err2) : resolveOut(res);
         }
@@ -25118,23 +25226,24 @@ var require_client2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/index.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/index.js
 var require_native = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/index.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/native/index.js"(exports, module2) {
     "use strict";
     module2.exports = require_client2();
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/index.js
+// node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/index.js
 var require_lib2 = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/index.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.11.3/node_modules/pg/lib/index.js"(exports, module2) {
     "use strict";
     var Client2 = require_client();
     var defaults3 = require_defaults();
     var Connection2 = require_connection();
     var Pool = require_pg_pool();
     var { DatabaseError } = require_dist();
+    var { escapeIdentifier, escapeLiteral } = require_utils2();
     var poolFactory = (Client3) => {
       return class BoundPool extends Pool {
         constructor(options) {
@@ -25151,6 +25260,8 @@ var require_lib2 = __commonJS({
       this.Connection = Connection2;
       this.types = require_pg_types();
       this.DatabaseError = DatabaseError;
+      this.escapeIdentifier = escapeIdentifier;
+      this.escapeLiteral = escapeLiteral;
     };
     if (typeof process.env.NODE_PG_FORCE_NATIVE !== "undefined") {
       module2.exports = new PG(require_native());
@@ -25262,9 +25373,10 @@ var init_pgConnect = __esm({
 var pgIntrospect_exports = {};
 __export(pgIntrospect_exports, {
   pgIntrospect: () => pgIntrospect,
-  pgPushIntrospect: () => pgPushIntrospect
+  pgPushIntrospect: () => pgPushIntrospect,
+  pgSchemas: () => pgSchemas
 });
-var import_hanji4, pgPushIntrospect, pgIntrospect;
+var import_hanji4, pgSchemas, pgPushIntrospect, pgIntrospect;
 var init_pgIntrospect = __esm({
   "src/cli/commands/pgIntrospect.ts"() {
     import_hanji4 = __toESM(require_hanji());
@@ -25273,6 +25385,18 @@ var init_pgIntrospect = __esm({
     init_introspect();
     init_global();
     init_mjs();
+    pgSchemas = async (client) => {
+      const res = await client.query(`select s.nspname as table_schema,
+                s.oid as schema_id,
+                u.usename as owner
+              from pg_catalog.pg_namespace s
+              join pg_catalog.pg_user u on u.usesysid = s.nspowner
+              where nspname not in ('information_schema', 'pg_catalog')
+               and nspname not like 'pg_toast%'
+               and nspname not like 'pg_temp_%'
+              order by table_schema;`);
+      return res.map((it) => it["table_schema"]);
+    };
     pgPushIntrospect = async (connection, filters, schemaFilters) => {
       const { client } = connection;
       const matchers = filters.map((it) => {
@@ -25967,6 +26091,55 @@ var init_sqliteIntrospect = __esm({
   }
 });
 
+// src/cli/utils.ts
+var assertPackages, requiredApiVersion, assertOrmCoreVersion, ormCoreVersions;
+var init_utils3 = __esm({
+  "src/cli/utils.ts"() {
+    init_views();
+    assertPackages = async (...pkgs) => {
+      try {
+        for (let i = 0; i < pkgs.length; i++) {
+          const it = pkgs[i];
+          await import(it);
+        }
+      } catch (e) {
+        err(
+          `please install required packages: ${pkgs.map((it) => `'${it}'`).join(" ")}`
+        );
+        process.exit(1);
+      }
+    };
+    requiredApiVersion = 6;
+    assertOrmCoreVersion = async () => {
+      try {
+        const { compatibilityVersion } = await import("drizzle-orm/version");
+        if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
+          return;
+        if (!compatibilityVersion || compatibilityVersion < requiredApiVersion) {
+          console.log(
+            "This version of drizzle-kit requires newer version of drizzle-orm\nPlease update drizzle-orm package to the latest version \u{1F44D}"
+          );
+        } else {
+          console.log(
+            "This version of drizzle-kit is outdated\nPlease update drizzle-kit package to the latest version \u{1F44D}"
+          );
+        }
+      } catch (e) {
+        console.log("Please install latest version of drizzle-orm");
+      }
+      process.exit(1);
+    };
+    ormCoreVersions = async () => {
+      try {
+        const { compatibilityVersion, npmVersion } = await import("drizzle-orm/version");
+        return { compatibilityVersion, npmVersion };
+      } catch (e) {
+        return {};
+      }
+    };
+  }
+});
+
 // node_modules/.pnpm/sqlstring@2.3.3/node_modules/sqlstring/lib/SqlString.js
 var require_SqlString = __commonJS({
   "node_modules/.pnpm/sqlstring@2.3.3/node_modules/sqlstring/lib/SqlString.js"(exports) {
@@ -41941,7 +42114,7 @@ var require_server = __commonJS({
     var EventEmitter = require("events").EventEmitter;
     var Connection2 = require_connection2();
     var ConnectionConfig = require_connection_config();
-    var Server = class extends EventEmitter {
+    var Server2 = class extends EventEmitter {
       constructor() {
         super();
         this.connections = [];
@@ -41964,7 +42137,7 @@ var require_server = __commonJS({
         this._server.close(cb);
       }
     };
-    module2.exports = Server;
+    module2.exports = Server2;
   }
 });
 
@@ -41995,8 +42168,8 @@ var require_mysql2 = __commonJS({
     exports.Pool = Pool;
     exports.PoolCluster = PoolCluster;
     exports.createServer = function(handler) {
-      const Server = require_server();
-      const s = new Server();
+      const Server2 = require_server();
+      const s = new Server2();
       if (handler) {
         s.on("connection", handler);
       }
@@ -42559,9 +42732,12 @@ var init_session = __esm({
     };
     _a = import_drizzle_orm9.entityKind;
     SQLiteWranglerD1Session[_a] = "SQLiteD1Session";
-    PreparedQuery = class extends import_sqlite_core3.PreparedQuery {
+    PreparedQuery = class extends import_sqlite_core3.SQLitePreparedQuery {
       constructor(stmt, configPath, dbName, queryString, params, logger, fields, executeMethod, customResultMapper) {
-        super("async", executeMethod);
+        super("async", executeMethod, {
+          sql: queryString,
+          params
+        });
         this.stmt = stmt;
         this.configPath = configPath;
         this.dbName = dbName;
@@ -42620,7 +42796,11 @@ var init_session = __esm({
       async values(placeholderValues) {
         const params = (0, import_drizzle_orm11.fillPlaceholders)(this.params, placeholderValues ?? {});
         this.logger.logQuery(this.queryString, params);
-        const wranglerRes = await this.stmt(this.queryString, this.configPath, this.dbName);
+        const wranglerRes = await this.stmt(
+          this.queryString,
+          this.configPath,
+          this.dbName
+        );
         return this.d1ToRawMapping(wranglerRes.results);
       }
     };
@@ -44733,7 +44913,7 @@ var require_glob_parent = __commonJS({
 });
 
 // node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js
-var require_utils3 = __commonJS({
+var require_utils4 = __commonJS({
   "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/utils.js"(exports) {
     "use strict";
     exports.isInteger = (num) => {
@@ -44820,7 +45000,7 @@ var require_utils3 = __commonJS({
 var require_stringify = __commonJS({
   "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/stringify.js"(exports, module2) {
     "use strict";
-    var utils = require_utils3();
+    var utils = require_utils4();
     module2.exports = (ast, options = {}) => {
       let stringify = (node, parent = {}) => {
         let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
@@ -45286,7 +45466,7 @@ var require_compile = __commonJS({
   "node_modules/.pnpm/braces@3.0.2/node_modules/braces/lib/compile.js"(exports, module2) {
     "use strict";
     var fill = require_fill_range();
-    var utils = require_utils3();
+    var utils = require_utils4();
     var compile = (ast, options = {}) => {
       let walk = (node, parent = {}) => {
         let invalidBlock = utils.isInvalidBrace(parent);
@@ -45338,7 +45518,7 @@ var require_expand = __commonJS({
     "use strict";
     var fill = require_fill_range();
     var stringify = require_stringify();
-    var utils = require_utils3();
+    var utils = require_utils4();
     var append = (queue = "", stash = "", enclose = false) => {
       let result = [];
       queue = [].concat(queue);
@@ -46035,7 +46215,7 @@ var require_constants2 = __commonJS({
 });
 
 // node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/utils.js
-var require_utils4 = __commonJS({
+var require_utils5 = __commonJS({
   "node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/utils.js"(exports) {
     "use strict";
     var path4 = require("path");
@@ -46101,7 +46281,7 @@ var require_utils4 = __commonJS({
 var require_scan = __commonJS({
   "node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/scan.js"(exports, module2) {
     "use strict";
-    var utils = require_utils4();
+    var utils = require_utils5();
     var {
       CHAR_ASTERISK,
       /* * */
@@ -46435,7 +46615,7 @@ var require_parse2 = __commonJS({
   "node_modules/.pnpm/picomatch@2.3.1/node_modules/picomatch/lib/parse.js"(exports, module2) {
     "use strict";
     var constants = require_constants2();
-    var utils = require_utils4();
+    var utils = require_utils5();
     var {
       MAX_LENGTH,
       POSIX_REGEX_SOURCE,
@@ -47218,7 +47398,7 @@ var require_picomatch = __commonJS({
     var path4 = require("path");
     var scan = require_scan();
     var parse = require_parse2();
-    var utils = require_utils4();
+    var utils = require_utils5();
     var constants = require_constants2();
     var isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
     var picomatch = (glob2, options, returnState = false) => {
@@ -47370,7 +47550,7 @@ var require_micromatch = __commonJS({
     var util2 = require("util");
     var braces = require_braces();
     var picomatch = require_picomatch2();
-    var utils = require_utils4();
+    var utils = require_utils5();
     var isEmptyString = (val) => val === "" || val === "./";
     var micromatch = (list, patterns, options) => {
       patterns = [].concat(patterns);
@@ -47674,7 +47854,7 @@ var require_pattern = __commonJS({
 });
 
 // node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/utils/stream.js
-var require_stream = __commonJS({
+var require_stream2 = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/utils/stream.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -47714,7 +47894,7 @@ var require_string2 = __commonJS({
 });
 
 // node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/utils/index.js
-var require_utils5 = __commonJS({
+var require_utils6 = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/utils/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -47729,7 +47909,7 @@ var require_utils5 = __commonJS({
     exports.path = path4;
     var pattern = require_pattern();
     exports.pattern = pattern;
-    var stream = require_stream();
+    var stream = require_stream2();
     exports.stream = stream;
     var string = require_string2();
     exports.string = string;
@@ -47742,7 +47922,7 @@ var require_tasks = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.convertPatternGroupToTask = exports.convertPatternGroupsToTasks = exports.groupPatternsByBaseDirectory = exports.getNegativePatternsAsPositive = exports.getPositivePatterns = exports.convertPatternsToTasks = exports.generate = void 0;
-    var utils = require_utils5();
+    var utils = require_utils6();
     function generate(input, settings) {
       const patterns = processPatterns(input, settings);
       const ignore = processPatterns(settings.ignore, settings);
@@ -48088,7 +48268,7 @@ var require_fs3 = __commonJS({
 });
 
 // node_modules/.pnpm/@nodelib+fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/utils/index.js
-var require_utils6 = __commonJS({
+var require_utils7 = __commonJS({
   "node_modules/.pnpm/@nodelib+fs.scandir@2.1.5/node_modules/@nodelib/fs.scandir/out/utils/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -48123,7 +48303,7 @@ var require_async2 = __commonJS({
     var fsStat = require_out();
     var rpl = require_run_parallel();
     var constants_1 = require_constants3();
-    var utils = require_utils6();
+    var utils = require_utils7();
     var common = require_common2();
     function read(directory, settings, callback) {
       if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
@@ -48232,7 +48412,7 @@ var require_sync2 = __commonJS({
     exports.readdir = exports.readdirWithFileTypes = exports.read = void 0;
     var fsStat = require_out();
     var constants_1 = require_constants3();
-    var utils = require_utils6();
+    var utils = require_utils7();
     var common = require_common2();
     function read(directory, settings) {
       if (!settings.stats && constants_1.IS_SUPPORT_READDIR_WITH_FILE_TYPES) {
@@ -48833,7 +49013,7 @@ var require_async4 = __commonJS({
 });
 
 // node_modules/.pnpm/@nodelib+fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/providers/stream.js
-var require_stream2 = __commonJS({
+var require_stream3 = __commonJS({
   "node_modules/.pnpm/@nodelib+fs.walk@1.2.8/node_modules/@nodelib/fs.walk/out/providers/stream.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -48996,7 +49176,7 @@ var require_out3 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Settings = exports.walkStream = exports.walkSync = exports.walk = void 0;
     var async_1 = require_async4();
-    var stream_1 = require_stream2();
+    var stream_1 = require_stream3();
     var sync_1 = require_sync4();
     var settings_1 = require_settings3();
     exports.Settings = settings_1.default;
@@ -49036,7 +49216,7 @@ var require_reader2 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var path4 = require("path");
     var fsStat = require_out();
-    var utils = require_utils5();
+    var utils = require_utils6();
     var Reader = class {
       constructor(_settings) {
         this._settings = _settings;
@@ -49069,7 +49249,7 @@ var require_reader2 = __commonJS({
 });
 
 // node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/readers/stream.js
-var require_stream3 = __commonJS({
+var require_stream4 = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/readers/stream.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -49132,7 +49312,7 @@ var require_async5 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var fsWalk = require_out3();
     var reader_1 = require_reader2();
-    var stream_1 = require_stream3();
+    var stream_1 = require_stream4();
     var ReaderAsync = class extends reader_1.default {
       constructor() {
         super(...arguments);
@@ -49169,7 +49349,7 @@ var require_matcher = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/matchers/matcher.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var utils = require_utils5();
+    var utils = require_utils6();
     var Matcher = class {
       constructor(_patterns, _settings, _micromatchOptions) {
         this._patterns = _patterns;
@@ -49257,7 +49437,7 @@ var require_deep = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/filters/deep.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var utils = require_utils5();
+    var utils = require_utils6();
     var partial_1 = require_partial();
     var DeepFilter = class {
       constructor(_settings, _micromatchOptions) {
@@ -49322,7 +49502,7 @@ var require_entry = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/filters/entry.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var utils = require_utils5();
+    var utils = require_utils6();
     var EntryFilter = class {
       constructor(_settings, _micromatchOptions) {
         this._settings = _settings;
@@ -49388,7 +49568,7 @@ var require_error = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/filters/error.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var utils = require_utils5();
+    var utils = require_utils6();
     var ErrorFilter = class {
       constructor(_settings) {
         this._settings = _settings;
@@ -49409,7 +49589,7 @@ var require_entry2 = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/transformers/entry.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var utils = require_utils5();
+    var utils = require_utils6();
     var EntryTransformer = class {
       constructor(_settings) {
         this._settings = _settings;
@@ -49520,12 +49700,12 @@ var require_async6 = __commonJS({
 });
 
 // node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/stream.js
-var require_stream4 = __commonJS({
+var require_stream5 = __commonJS({
   "node_modules/.pnpm/fast-glob@3.3.1/node_modules/fast-glob/out/providers/stream.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var stream_1 = require("stream");
-    var stream_2 = require_stream3();
+    var stream_2 = require_stream4();
     var provider_1 = require_provider();
     var ProviderStream = class extends provider_1.default {
       constructor() {
@@ -49696,10 +49876,10 @@ var require_out4 = __commonJS({
     "use strict";
     var taskManager = require_tasks();
     var async_1 = require_async6();
-    var stream_1 = require_stream4();
+    var stream_1 = require_stream5();
     var sync_1 = require_sync6();
     var settings_1 = require_settings4();
-    var utils = require_utils5();
+    var utils = require_utils6();
     async function FastGlob(source, options) {
       assertPatternsInput2(source);
       const works = getWorks(source, async_1.default, options);
@@ -57932,7 +58112,7 @@ var require_dist2 = __commonJS({
 });
 
 // node_modules/.pnpm/webpod@0.0.2/node_modules/webpod/dist/utils.js
-var init_utils3 = __esm({
+var init_utils4 = __esm({
   "node_modules/.pnpm/webpod@0.0.2/node_modules/webpod/dist/utils.js"() {
   }
 });
@@ -57940,7 +58120,7 @@ var init_utils3 = __esm({
 // node_modules/.pnpm/webpod@0.0.2/node_modules/webpod/dist/ssh.js
 var init_ssh = __esm({
   "node_modules/.pnpm/webpod@0.0.2/node_modules/webpod/dist/ssh.js"() {
-    init_utils3();
+    init_utils4();
   }
 });
 
@@ -57986,8 +58166,17 @@ __export(wrangler_client_exports, {
   execute: () => execute
 });
 async function execute(query, configPath, dbName) {
-  const response = await $`NO_D1_WARNING=true wrangler d1 execute ${dbName} --config=${configPath} --command=${query} --json`;
-  return { results: JSON.parse(response.stdout)[0].results };
+  try {
+    const response = await $`NO_D1_WARNING=true wrangler d1 execute ${dbName} --config=${configPath} --command=${query} --json`;
+    return { results: JSON.parse(response.stdout)[0].results };
+  } catch (e) {
+    try {
+      await $`NO_D1_WARNING=true wrangler d1 execute ${dbName} --config=${configPath} --command=${query}`;
+    } catch (e1) {
+      throw new Error(e1.stdout);
+    }
+    throw e;
+  }
 }
 var init_wrangler_client = __esm({
   "src/orm-extenstions/d1-driver/wrangler-client.ts"() {
@@ -58000,9 +58189,15 @@ var init_wrangler_client = __esm({
 var studioUtils_exports = {};
 __export(studioUtils_exports, {
   drizzleDb: () => drizzleDb,
-  prepareModels: () => prepareModels
-});
-var import_drizzle_orm14, import_mysql_core4, import_pg_core4, import_sqlite_core5, prepareModels, drizzleDb;
+  drizzleForMySQL: () => drizzleForMySQL,
+  drizzleForPostgres: () => drizzleForPostgres,
+  drizzleForSQLite: () => drizzleForSQLite,
+  prepareModels: () => prepareModels,
+  prepareMySqlSchema: () => prepareMySqlSchema,
+  preparePgSchema: () => preparePgSchema,
+  prepareSQLiteSchema: () => prepareSQLiteSchema
+});
+var import_drizzle_orm14, import_mysql_core4, import_pg_core4, import_sqlite_core5, preparePgSchema, prepareMySqlSchema, prepareSQLiteSchema, prepareModels, drizzleForPostgres, drizzleForMySQL, drizzleForSQLite, drizzleDb;
 var init_studioUtils = __esm({
   "src/serializer/studioUtils.ts"() {
     import_drizzle_orm14 = require("drizzle-orm");
@@ -58010,11 +58205,80 @@ var init_studioUtils = __esm({
     import_pg_core4 = require("drizzle-orm/pg-core");
     import_sqlite_core5 = require("drizzle-orm/sqlite-core");
     init_utils();
+    init_utils3();
+    init_global();
     init_serializer();
+    preparePgSchema = async (path4) => {
+      const imports = prepareFilenames(path4);
+      const pgSchema4 = {};
+      const relations4 = {};
+      const { unregister } = await safeRegister();
+      for (let i = 0; i < imports.length; i++) {
+        const it = imports[i];
+        const i0 = require(`${it}`);
+        const i0values = Object.entries(i0);
+        i0values.forEach(([k, t]) => {
+          if ((0, import_drizzle_orm14.is)(t, import_pg_core4.PgTable)) {
+            const schema4 = (0, import_pg_core4.getTableConfig)(t).schema || "public";
+            pgSchema4[schema4] = pgSchema4[schema4] || {};
+            pgSchema4[schema4][k] = t;
+          }
+          if ((0, import_drizzle_orm14.is)(t, import_drizzle_orm14.Relations)) {
+            relations4[k] = t;
+          }
+        });
+      }
+      unregister();
+      return { schema: pgSchema4, relations: relations4 };
+    };
+    prepareMySqlSchema = async (path4) => {
+      const imports = prepareFilenames(path4);
+      const mysqlSchema4 = {};
+      const relations4 = {};
+      const { unregister } = await safeRegister();
+      for (let i = 0; i < imports.length; i++) {
+        const it = imports[i];
+        const i0 = require(`${it}`);
+        const i0values = Object.entries(i0);
+        i0values.forEach(([k, t]) => {
+          if ((0, import_drizzle_orm14.is)(t, import_mysql_core4.MySqlTable)) {
+            const schema4 = (0, import_mysql_core4.getTableConfig)(t).schema || "public";
+            mysqlSchema4[schema4][k] = t;
+          }
+          if ((0, import_drizzle_orm14.is)(t, import_drizzle_orm14.Relations)) {
+            relations4[k] = t;
+          }
+        });
+      }
+      unregister();
+      return { schema: mysqlSchema4, relations: relations4 };
+    };
+    prepareSQLiteSchema = async (path4) => {
+      const imports = prepareFilenames(path4);
+      const sqliteSchema2 = {};
+      const relations4 = {};
+      const { unregister } = await safeRegister();
+      for (let i = 0; i < imports.length; i++) {
+        const it = imports[i];
+        const i0 = require(`${it}`);
+        const i0values = Object.entries(i0);
+        i0values.forEach(([k, t]) => {
+          if ((0, import_drizzle_orm14.is)(t, import_sqlite_core5.SQLiteTable)) {
+            const schema4 = "public";
+            sqliteSchema2[schema4][k] = t;
+          }
+          if ((0, import_drizzle_orm14.is)(t, import_drizzle_orm14.Relations)) {
+            relations4[k] = t;
+          }
+        });
+      }
+      unregister();
+      return { schema: sqliteSchema2, relations: relations4 };
+    };
     prepareModels = async (path4) => {
       const imports = prepareFilenames(path4);
       const sqliteSchema2 = {};
-      const pgSchema3 = {};
+      const pgSchema4 = {};
       const mysqlSchema4 = {};
       const { unregister } = await safeRegister();
       for (let i = 0; i < imports.length; i++) {
@@ -58023,7 +58287,7 @@ var init_studioUtils = __esm({
         const i0values = Object.entries(i0);
         i0values.forEach(([k, t]) => {
           if ((0, import_drizzle_orm14.is)(t, import_pg_core4.PgTable)) {
-            pgSchema3[k] = t;
+            pgSchema4[k] = t;
           }
           if ((0, import_drizzle_orm14.is)(t, import_mysql_core4.MySqlTable)) {
             mysqlSchema4[k] = t;
@@ -58033,22 +58297,96 @@ var init_studioUtils = __esm({
           }
           if ((0, import_drizzle_orm14.is)(t, import_drizzle_orm14.Relations)) {
             sqliteSchema2[k] = t;
-            pgSchema3[k] = t;
+            pgSchema4[k] = t;
             mysqlSchema4[k] = t;
           }
         });
       }
       unregister();
-      return { pgSchema: pgSchema3, mysqlSchema: mysqlSchema4, sqliteSchema: sqliteSchema2 };
+      return { pgSchema: pgSchema4, mysqlSchema: mysqlSchema4, sqliteSchema: sqliteSchema2 };
+    };
+    drizzleForPostgres = async (connectionConfig, pgSchema4, relations4, 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), {
+        logger: verbose
+      });
+      return {
+        type: "pg",
+        db,
+        schema: pgSchema4,
+        relations: relations4
+      };
+    };
+    drizzleForMySQL = async (config, mysqlSchema4, relations4, 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 });
+      return {
+        type: "mysql",
+        db,
+        schema: mysqlSchema4,
+        relations: relations4
+      };
+    };
+    drizzleForSQLite = async (config, sqliteSchema2, relations4, verbose) => {
+      const { driver, dbCredentials: creds } = config;
+      if (driver === "d1") {
+        const { drizzle: drizzle2 } = await Promise.resolve().then(() => (init_driver(), driver_exports));
+        const { execute: execute2 } = await Promise.resolve().then(() => (init_wrangler_client(), wrangler_client_exports));
+        const db = drizzle2(execute2, creds.wranglerConfigPath, creds.dbName, {
+          logger: verbose
+        });
+        return {
+          type: "sqlite",
+          db,
+          schema: sqliteSchema2,
+          relations: relations4
+        };
+      }
+      if (driver === "better-sqlite") {
+        assertPackages("better-sqlite3");
+        const { drizzle: drizzle2 } = await import("drizzle-orm/better-sqlite3");
+        const Database = await import("better-sqlite3");
+        const client = new Database.default(creds.url);
+        const db = drizzle2(client, { logger: verbose });
+        return {
+          type: "sqlite",
+          db,
+          schema: sqliteSchema2,
+          relations: relations4
+        };
+      }
+      if (driver === "libsql" || driver === "turso") {
+        assertPackages("@libsql/client");
+        const { drizzle: drizzle2 } = await import("drizzle-orm/libsql");
+        const { createClient } = await import("@libsql/client");
+        const client = createClient(creds);
+        const db = drizzle2(
+          client,
+          { logger: verbose }
+        );
+        return {
+          type: "sqlite",
+          db,
+          schema: sqliteSchema2,
+          relations: relations4
+        };
+      }
+      assertUnreachable(driver);
     };
     drizzleDb = async (drizzleConfig, models, logger) => {
       if (drizzleConfig.driver === "pg") {
         const { drizzle: drizzle2 } = await import("drizzle-orm/node-postgres");
-        const { Pool, types } = await Promise.resolve().then(() => __toESM(require_lib2()));
-        const client = new Pool({ ...drizzleConfig.dbCredentials, max: 1 });
-        types.setTypeParser(types.builtins.INTERVAL, (val) => val);
+        const pg = await Promise.resolve().then(() => __toESM(require_lib2()));
+        const db = drizzle2(new pg.default.Pool(drizzleConfig.dbCredentials), {
+          logger
+        });
         return {
-          db: drizzle2(client, { logger }),
+          db,
           type: "pg",
           schema: models.pgSchema
         };
@@ -58056,12 +58394,7 @@ var init_studioUtils = __esm({
         const { drizzle: drizzle2 } = await import("drizzle-orm/mysql2");
         const { createPool } = await Promise.resolve().then(() => __toESM(require_promise()));
         const client = createPool({
-          uri: drizzleConfig.dbCredentials.type === "url" ? drizzleConfig.dbCredentials.connectionString : void 0,
-          host: drizzleConfig.dbCredentials.type === "params" ? drizzleConfig.dbCredentials.host : void 0,
-          port: drizzleConfig.dbCredentials.type === "params" ? drizzleConfig.dbCredentials.port : void 0,
-          user: drizzleConfig.dbCredentials.type === "params" ? drizzleConfig.dbCredentials.user : void 0,
-          database: drizzleConfig.dbCredentials.type === "params" ? drizzleConfig.dbCredentials.database : void 0,
-          password: drizzleConfig.dbCredentials.type === "params" ? drizzleConfig.dbCredentials.password : void 0,
+          ...drizzleConfig.dbCredentials,
           connectionLimit: 1
         });
         return {
@@ -58109,7 +58442,7 @@ var init_studioUtils = __esm({
 
 // src/utils.ts
 var import_fs8, import_path5, assertV1OutFolder, dryJournal, snapshotsPriorV4, prepareOutFolder2, mapValues, validatorForDialect, validateWithReport, prepareMigrationFolder, prepareMigrationMeta, schemaRenameKey, tableRenameKey, columnRenameKey;
-var init_utils4 = __esm({
+var init_utils5 = __esm({
   "src/utils.ts"() {
     import_fs8 = require("fs");
     init_views();
@@ -58701,7 +59034,7 @@ var init_pg = __esm({
 });
 
 // src/cli/validations/mysql.ts
-var mysqlConnectionCli, mysqlConnectionConfig, mysqlConfigIntrospectSchema, mysqlCliIntrospectParams, mysqlCliPushParams, mysqlConfigPushParams, printCliConnectionIssues3, printConfigConnectionIssues3, validateMySqlIntrospect, validateMySqlPush;
+var mysqlConnectionCli, mysql2credentials, mysqlConnectionConfig, mysqlConfigIntrospectSchema, mysqlCliIntrospectParams, mysqlCliPushParams, mysqlConfigPushParams, printCliConnectionIssues3, printConfigConnectionIssues3, validateMySqlIntrospect, validateMySqlPush;
 var init_mysql = __esm({
   "src/cli/validations/mysql.ts"() {
     init_lib();
@@ -58715,35 +59048,31 @@ var init_mysql = __esm({
         port: coerce.number().optional(),
         user: stringType().default("mysql"),
         password: stringType().optional(),
-        database: stringType(),
-        type: literalType("params").default("params")
+        database: stringType()
       }),
       objectType({
         driver: literalType("mysql2"),
-        connectionString: stringType(),
-        type: literalType("url").default("url")
+        uri: stringType()
+        // TODO: change docs
       })
     ]);
-    mysqlConnectionConfig = unionType([
+    mysql2credentials = unionType([
       objectType({
-        driver: literalType("mysql2"),
-        dbCredentials: objectType({
-          host: stringType(),
-          port: coerce.number().optional(),
-          user: stringType().default("mysql"),
-          password: stringType().optional(),
-          database: stringType(),
-          type: literalType("params").default("params")
-        })
+        host: stringType(),
+        port: coerce.number().optional(),
+        user: stringType().default("mysql"),
+        password: stringType().optional(),
+        database: stringType()
       }),
       objectType({
-        driver: literalType("mysql2"),
-        dbCredentials: objectType({
-          connectionString: stringType(),
-          type: literalType("url").default("url")
-        })
+        uri: stringType()
+        // TODO: change docs
       })
     ]);
+    mysqlConnectionConfig = objectType({
+      driver: literalType("mysql2"),
+      dbCredentials: mysql2credentials
+    });
     mysqlConfigIntrospectSchema = intersectionType(
       configIntrospectSchema,
       mysqlConnectionConfig
@@ -58761,22 +59090,22 @@ var init_mysql = __esm({
       mysqlConnectionConfig
     );
     printCliConnectionIssues3 = (options) => {
-      if (options.driver === "mysql2") {
-        if (typeof options.connectionString === "undefined" && (typeof options.host === "undefined" || typeof options.database === "undefined")) {
-          console.log(outputs.mysql.connection.required());
-        }
-      } else {
+      const { driver, uri, host, database } = options || {};
+      if (driver !== "mysql2") {
         console.log(outputs.mysql.connection.driver());
       }
+      if (!uri && (!host || !database)) {
+        console.log(outputs.mysql.connection.required());
+      }
     };
     printConfigConnectionIssues3 = (options) => {
-      if (options.driver === "mysql2") {
-        if (typeof options.dbCredentials.connectionString === "undefined" && (typeof options.dbCredentials.host === "undefined" || typeof options.dbCredentials.database === "undefined")) {
-          console.log(outputs.mysql.connection.required());
-        }
-      } else {
+      if (options.driver !== "mysql2") {
         console.log(outputs.mysql.connection.driver());
       }
+      const { uri, host, database } = options.dbCredentials || {};
+      if (!uri && (!host || !database)) {
+        console.log(outputs.mysql.connection.required());
+      }
     };
     validateMySqlIntrospect = async (options) => {
       const collisionRes = checkCollisions(options, "introspect:mysql");
@@ -58798,28 +59127,25 @@ var init_mysql = __esm({
         printCliConnectionIssues3(options);
         process.exit(1);
       }
-      if (cliRes.data.type === "url") {
-        const { connectionString, introspectCasing: introspectCasing3, type: type2, ...rest2 } = cliRes.data;
-        return {
-          ...rest2,
-          dbCredentials: { connectionString, type: type2 },
-          introspect: { casing: introspectCasing3 }
-        };
-      }
       const {
-        host,
-        password,
-        port,
-        database,
-        user,
-        type,
+        out,
+        schema: schema4,
+        driver,
+        schemaFilter,
+        tablesFilter,
+        breakpoints,
         introspectCasing: introspectCasing2,
         ...rest
       } = cliRes.data;
       return {
-        ...rest,
-        dbCredentials: { host, password, port, database, user, type },
-        introspect: { casing: introspectCasing2 }
+        out,
+        schema: schema4,
+        driver,
+        schemaFilter,
+        tablesFilter,
+        breakpoints,
+        introspect: { casing: introspectCasing2 },
+        dbCredentials: rest
       };
     };
     validateMySqlPush = async (options) => {
@@ -58846,24 +59172,30 @@ var init_mysql = __esm({
         printCliConnectionIssues3(options);
         process.exit(1);
       }
-      if (cliRes.data.type === "url") {
-        const { connectionString, type: type2, ...rest2 } = cliRes.data;
-        return {
-          ...rest2,
-          dbCredentials: { connectionString, type: type2 }
-        };
-      }
-      const { host, password, port, database, user, type, ...rest } = cliRes.data;
+      const {
+        strict,
+        verbose,
+        schema: schema4,
+        driver,
+        schemaFilter,
+        tablesFilter,
+        ...rest
+      } = cliRes.data;
       return {
-        ...rest,
-        dbCredentials: { host, password, port, database, user, type }
+        driver,
+        schema: schema4,
+        strict,
+        verbose,
+        tablesFilter,
+        schemaFilter,
+        dbCredentials: rest
       };
     };
   }
 });
 
 // node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json
-var require_package2 = __commonJS({
+var require_package = __commonJS({
   "node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/package.json"(exports, module2) {
     module2.exports = {
       name: "dotenv",
@@ -58934,7 +59266,7 @@ var require_main = __commonJS({
     var fs8 = require("fs");
     var path4 = require("path");
     var os2 = require("os");
-    var packageJson = require_package2();
+    var packageJson = require_package();
     var version = packageJson.version;
     var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
     function parse(src) {
@@ -59610,12 +59942,10 @@ var init_mysqlIntrospect = __esm({
     init_global();
     init_mjs();
     connectToMySQL = async (config) => {
-      let client;
+      const client = await (0, import_promise.createConnection)(config.dbCredentials);
       let databaseName;
-      if (config.dbCredentials.type === "url") {
-        const connection = config.dbCredentials.connectionString;
-        client = await (0, import_promise.createConnection)(connection);
-        const connectionUrl = new URL(connection);
+      if ("uri" in config.dbCredentials) {
+        const connectionUrl = new URL(config.dbCredentials.uri);
         const pathname = connectionUrl.pathname;
         databaseName = pathname.split("/")[pathname.split("/").length - 1];
         if (!databaseName || databaseName === "") {
@@ -59623,10 +59953,8 @@ var init_mysqlIntrospect = __esm({
             "You should specify a database name in connection string (mysql://USER:PASSWORD@HOST:PORT/DATABASE)"
           );
         }
-      } else if (config.dbCredentials.type === "params") {
-        const { type, ...creds } = config.dbCredentials;
-        client = await (0, import_promise.createConnection)(creds);
-        databaseName = creds.database;
+      } else if ("database" in config.dbCredentials) {
+        databaseName = config.dbCredentials.database;
       } else {
         throw Error(
           "Either `connectionString` or `host, port, etc.` params be provided in config file"
@@ -59691,9 +60019,10 @@ __export(studio_exports, {
   studioConfidConnections: () => studioConfidConnections,
   studioConfigSchema: () => studioConfigSchema,
   studioSpecificConnections: () => studioSpecificConnections,
+  stuioSqliteConnectionConfig: () => stuioSqliteConnectionConfig,
   validateStudio: () => validateStudio
 });
-var studioSpecificConnections, studioConfidConnections, studioConfigSchema, printDriverIssues, validateStudio;
+var studioSpecificConnections, stuioSqliteConnectionConfig, studioConfidConnections, studioConfigSchema, printDriverIssues, validateStudio;
 var init_studio = __esm({
   "src/cli/validations/studio.ts"() {
     init_lib();
@@ -59712,6 +60041,7 @@ var init_studio = __esm({
         dbName: stringType()
       })
     });
+    stuioSqliteConnectionConfig = unionType([sqliteConnectionSchema, studioSpecificConnections]);
     studioConfidConnections = unionType([mysqlConnectionConfig, pgConnectionConfig, sqliteConnectionSchema, studioSpecificConnections]);
     studioConfigSchema = intersectionType(
       objectType({
@@ -59767,7 +60097,7 @@ var import_fs11 = require("fs");
 init_lib();
 
 // src/cli/commands/check.ts
-init_utils4();
+init_utils5();
 var checkHandler = (out, dialect6) => {
   const { snapshots } = prepareOutFolder2(out, dialect6);
   const report = validateWithReport(snapshots, dialect6);
@@ -59806,54 +60136,7 @@ var checkHandler = (out, dialect6) => {
 // src/cli/index.ts
 var import_hanji11 = __toESM(require_hanji());
 var import_path7 = __toESM(require("path"));
-
-// src/cli/utils.ts
-init_views();
-var assertPackages = async (...pkgs) => {
-  try {
-    for (let i = 0; i < pkgs.length; i++) {
-      const it = pkgs[i];
-      await import(it);
-    }
-  } catch (e) {
-    err(
-      `please install required packages: ${pkgs.map((it) => `'${it}'`).join(" ")}`
-    );
-    process.exit(1);
-  }
-};
-var requiredApiVersion = 5;
-var assertOrmCoreVersion = async () => {
-  try {
-    const { compatibilityVersion } = await import("drizzle-orm/version");
-    if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
-      return;
-    if (!compatibilityVersion || compatibilityVersion < requiredApiVersion) {
-      console.log(
-        "This version of drizzle-kit requires newer version of drizzle-orm\nPlease update drizzle-orm package to the latest version \u{1F44D}"
-      );
-    } else {
-      console.log(
-        "This version of drizzle-kit is outdated\nPlease update drizzle-kit package to the latest version \u{1F44D}"
-      );
-    }
-  } catch (e) {
-    console.log(
-      "Please install latest version of drizzle-orm"
-    );
-  }
-  process.exit(1);
-};
-var ormCoreVersions = async () => {
-  try {
-    const { compatibilityVersion, npmVersion } = await import("drizzle-orm/version");
-    return { compatibilityVersion, npmVersion };
-  } catch (e) {
-    return {};
-  }
-};
-
-// src/cli/index.ts
+init_utils3();
 init_source();
 
 // package.json
@@ -59899,7 +60182,8 @@ var package_default = {
     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: "./dist/index.cjs studio --verbose",
+    "studio:dev": "tsx ./src/cli/index.ts studio --verbose"
   },
   ava: {
     files: [
@@ -59913,7 +60197,7 @@ var package_default = {
     ]
   },
   dependencies: {
-    "@drizzle-team/studio": "^0.0.9",
+    "@drizzle-team/studio": "^0.0.27",
     "@esbuild-kit/esm-loader": "^2.5.5",
     camelcase: "^7.0.1",
     chalk: "^5.2.0",
@@ -59935,20 +60219,20 @@ var package_default = {
     "@types/glob": "^8.1.0",
     "@types/minimatch": "^5.1.2",
     "@types/node": "^18.11.15",
-    "@types/pg": "^8.6.5",
+    "@types/pg": "^8.10.7",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^5.1.0",
     "better-sqlite3": "^8.4.0",
     dockerode: "^3.3.4",
     dotenv: "^16.0.3",
-    "drizzle-orm": "0.28.7-4e094f0",
+    "drizzle-orm": "0.29.0-d3b1c58",
     eslint: "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "get-port": "^6.1.2",
     mysql2: "2.3.3",
-    pg: "^8.8.0",
+    pg: "^8.11.3",
     postgres: "^3.3.5",
     prettier: "^2.8.1",
     tsx: "^3.12.1",
@@ -59962,14 +60246,14 @@ var package_default = {
 init_migrate();
 init_utils2();
 init_pgSchema();
-init_utils4();
+init_utils5();
 init_pgUp();
 
 // src/cli/commands/sqliteUp.ts
 init_source();
 var import_fs9 = __toESM(require("fs"));
 init_sqliteSchema();
-init_utils4();
+init_utils5();
 var upSqliteHandler = (out) => {
 };
 var upSqliteHandlerV4 = (out) => {
@@ -60560,7 +60844,7 @@ init_common();
 init_mysql();
 init_pgPushUtils();
 init_outputs();
-var import_studio = require("@drizzle-team/studio");
+var import_server = require("@drizzle-team/studio/server");
 init_sqlgenerator();
 
 // node_modules/.pnpm/dotenv@16.0.3/node_modules/dotenv/config.js
@@ -60576,6 +60860,7 @@ init_sqlgenerator();
 
 // src/cli/index.ts
 init_selector_ui();
+init_global();
 var printVersions = async () => {
   const v = await versions();
   console.log(`${source_default.gray(v)}
@@ -61266,14 +61551,44 @@ var dropCommand = new import_commander.Command("drop").option("--out <out>", `Ou
 var studioCommand = new import_commander.Command("studio").option("--port <port>", "Custom port for drizzle studio [default=4983]").option("--host <host>", "Custom host for drizzle studio [default=0.0.0.0]").option("--verbose", "Print all stataments that are executed by Studio").option("--config <config>", `Config path [default=drizzle.config.ts]`).action(async (options) => {
   const { validateStudio: validateStudio2 } = await Promise.resolve().then(() => (init_studio(), studio_exports));
   const drizzleConfig = await validateStudio2(options);
-  const { prepareModels: prepareModels2, drizzleDb: drizzleDb2 } = await Promise.resolve().then(() => (init_studioUtils(), studioUtils_exports));
-  const models = await prepareModels2(drizzleConfig.schema);
-  const setup = await drizzleDb2(
-    drizzleConfig,
-    models,
-    options.verbose
-  );
-  const server = await (0, import_studio.prepareServer)(setup);
+  const {
+    drizzleForPostgres: drizzleForPostgres2,
+    preparePgSchema: preparePgSchema2,
+    prepareMySqlSchema: prepareMySqlSchema2,
+    drizzleForMySQL: drizzleForMySQL2,
+    prepareSQLiteSchema: prepareSQLiteSchema2,
+    drizzleForSQLite: drizzleForSQLite2
+  } = await Promise.resolve().then(() => (init_studioUtils(), studioUtils_exports));
+  const { driver, schema: schemaPath } = drizzleConfig;
+  let setup;
+  if (driver === "pg") {
+    const { schema: schema4, relations: relations4 } = await preparePgSchema2(schemaPath);
+    setup = await drizzleForPostgres2(
+      drizzleConfig,
+      schema4,
+      relations4,
+      Boolean(options.verbose)
+    );
+  } else if (driver === "mysql2") {
+    const { schema: schema4, relations: relations4 } = await prepareMySqlSchema2(schemaPath);
+    setup = await drizzleForMySQL2(
+      drizzleConfig,
+      schema4,
+      relations4,
+      Boolean(options.verbose)
+    );
+  } else if (driver === "better-sqlite" || driver === "d1" || driver === "libsql" || driver === "turso") {
+    const { schema: schema4, relations: relations4 } = await prepareSQLiteSchema2(schemaPath);
+    setup = await drizzleForSQLite2(
+      drizzleConfig,
+      schema4,
+      relations4,
+      Boolean(options.verbose)
+    );
+  } else {
+    assertUnreachable(driver);
+  }
+  const server = await (0, import_server.prepareServer)(setup);
   const port = options.port ?? 4983;
   const host = options.host ?? "127.0.0.1";
   console.log();
@@ -61282,6 +61597,13 @@ var studioCommand = new import_commander.Command("studio").option("--port <port>
       "Drizzle Studio is currently in Beta. If you find anything that is not working as expected or should be improved, feel free to create an issue on GitHub: https://github.com/drizzle-team/drizzle-kit-mirror/issues/new or write to us on Discord: https://discord.gg/WcRKz2FFxN"
     )
   );
+  if (driver === "d1") {
+    console.log(
+      withStyle.fullWarning(
+        "It seems like you are trying to access your D1 Database. Please make sure to run 'wrangler login' before using Drizzle Studio to ensure it has your token for making requests to the D1 Database. If you encounter an error related to CLOUDFLARE_TOKEN, please run 'wrangler login' and restart the studio"
+      )
+    );
+  }
   server.start({
     host,
     port,