drizzle-kit 0.20.0-029419a → 0.20.0-13160ca

package/index.cjs

@@ -4555,7 +4555,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 +4835,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 +5193,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 +11376,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(
@@ -12091,13 +12088,12 @@ __export(pgSerializer_exports, {
   indexName: () => indexName2,
   toDrizzle: () => toDrizzle
 });
-var import_pg_core2, import_pg_core3, import_drizzle_orm5, import_drizzle_orm6, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn, toDrizzle;
+var import_pg_core2, import_pg_core3, import_drizzle_orm5, dialect4, indexName2, generatePgSnapshot, trimChar, fromDatabase2, columnToDefault, defaultForColumn, toDrizzle;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
     import_pg_core2 = require("drizzle-orm/pg-core");
     import_pg_core3 = require("drizzle-orm/pg-core");
     import_drizzle_orm5 = require("drizzle-orm");
-    import_drizzle_orm6 = require("drizzle-orm");
     init_serializer();
     init_source();
     init_outputs();
@@ -12228,7 +12224,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const onDelete = fk4.onDelete;
           const onUpdate = fk4.onUpdate;
           const reference = fk4.reference();
-          const tableTo = (0, import_drizzle_orm6.getTableName)(reference.foreignTable);
+          const tableTo = (0, import_drizzle_orm5.getTableName)(reference.foreignTable);
           const columnsFrom = reference.columns.map((it) => it.name);
           const columnsTo = reference.foreignColumns.map((it) => it.name);
           return {
@@ -12702,7 +12698,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 = {};
@@ -12776,17 +12772,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;
     };
@@ -12798,11 +12808,11 @@ var sqliteImports_exports = {};
 __export(sqliteImports_exports, {
   prepareFromSqliteImports: () => prepareFromSqliteImports
 });
-var import_sqlite_core, import_drizzle_orm7, prepareFromSqliteImports;
+var import_sqlite_core, import_drizzle_orm6, prepareFromSqliteImports;
 var init_sqliteImports = __esm({
   "src/serializer/sqliteImports.ts"() {
     import_sqlite_core = require("drizzle-orm/sqlite-core");
-    import_drizzle_orm7 = require("drizzle-orm");
+    import_drizzle_orm6 = require("drizzle-orm");
     init_utils();
     prepareFromSqliteImports = async (imports) => {
       const tables = [];
@@ -12813,7 +12823,7 @@ var init_sqliteImports = __esm({
         const i0 = require(`${it}`);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
-          if ((0, import_drizzle_orm7.is)(t, import_sqlite_core.SQLiteTable)) {
+          if ((0, import_drizzle_orm6.is)(t, import_sqlite_core.SQLiteTable)) {
             tables.push(t);
           }
         });
@@ -12866,11 +12876,10 @@ function mapSqlToSqliteType(sqlType) {
     return "numeric";
   }
 }
-var import_drizzle_orm8, import_drizzle_orm9, import_sqlite_core2, dialect5, generateSqliteSnapshot, fromDatabase3, toDrizzle2;
+var import_drizzle_orm7, import_sqlite_core2, dialect5, generateSqliteSnapshot, fromDatabase3, toDrizzle2;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
-    import_drizzle_orm8 = require("drizzle-orm");
-    import_drizzle_orm9 = require("drizzle-orm");
+    import_drizzle_orm7 = require("drizzle-orm");
     import_sqlite_core2 = require("drizzle-orm/sqlite-core");
     init_serializer();
     init_outputs();
@@ -12900,10 +12909,10 @@ var init_sqliteSerializer = __esm({
             type: column7.getSQLType(),
             primaryKey,
             notNull,
-            autoincrement: (0, import_drizzle_orm8.is)(column7, import_sqlite_core2.SQLiteBaseInteger) ? column7.autoIncrement : false
+            autoincrement: (0, import_drizzle_orm7.is)(column7, import_sqlite_core2.SQLiteBaseInteger) ? column7.autoIncrement : false
           };
           if (column7.default !== void 0) {
-            if ((0, import_drizzle_orm8.is)(column7.default, import_drizzle_orm9.SQL)) {
+            if ((0, import_drizzle_orm7.is)(column7.default, import_drizzle_orm7.SQL)) {
               columnToSet.default = sqlToStr(column7.default);
             } else {
               columnToSet.default = typeof column7.default === "string" ? `'${column7.default}'` : column7.default;
@@ -12943,7 +12952,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const onUpdate = fk4.onUpdate ?? "no action";
           const reference = fk4.reference();
           const referenceFT = reference.foreignTable;
-          const tableTo = (0, import_drizzle_orm8.getTableName)(referenceFT);
+          const tableTo = (0, import_drizzle_orm7.getTableName)(referenceFT);
           const columnsFrom = reference.columns.map((it) => it.name);
           const columnsTo = reference.foreignColumns.map((it) => it.name);
           return {
@@ -12963,7 +12972,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           const columns2 = value.config.columns;
           const name = value.config.name;
           let indexColumns = columns2.map((it) => {
-            if ((0, import_drizzle_orm8.is)(it, import_drizzle_orm9.SQL)) {
+            if ((0, import_drizzle_orm7.is)(it, import_drizzle_orm7.SQL)) {
               return dialect5.sqlToQuery(it).sql;
             } else {
               return it.name;
@@ -12971,7 +12980,7 @@ ${withStyle.errorWarning(`We've found duplicated unique constraint names in ${so
           });
           let where = void 0;
           if (value.config.where !== void 0) {
-            if ((0, import_drizzle_orm8.is)(value.config.where, import_drizzle_orm9.SQL)) {
+            if ((0, import_drizzle_orm7.is)(value.config.where, import_drizzle_orm7.SQL)) {
               where = dialect5.sqlToQuery(value.config.where).sql;
             }
           }
@@ -13269,7 +13278,10 @@ WHERE
           const res = {};
           Object.values(t.compositePrimaryKeys).forEach((cpk) => {
             const gh = cpk.columns.map((c) => cb[c]);
-            res[cpk.name] = new import_sqlite_core2.PrimaryKeyBuilder(gh, cpk.name);
+            res[cpk.name] = new import_sqlite_core2.PrimaryKeyBuilder(
+              gh,
+              cpk.name
+            );
           });
           return res;
         });
@@ -13289,13 +13301,13 @@ var init_serializer = __esm({
     init_source();
     sqlToStr = (sql2) => {
       return sql2.toQuery({
-        escapeName: (name) => {
+        escapeName: () => {
           throw new Error("we don't support params for `sql` default values");
         },
-        escapeParam: (num, value) => {
+        escapeParam: () => {
           throw new Error("we don't support params for `sql` default values");
         },
-        escapeString: (str) => {
+        escapeString: () => {
           throw new Error("we don't support params for `sql` default values");
         }
       }).sql;
@@ -14800,7 +14812,7 @@ var init_migrate = __esm({
     init_pgSchema();
     init_sqliteSchema();
     init_mysqlSchema();
-    init_utils4();
+    init_utils5();
     init_words();
     init_outputs();
     prepareAndMigratePg = async (config) => {
@@ -17174,7 +17186,7 @@ var init_snapshotsDiffer = __esm({
     init_lib();
     init_jsonDiffer();
     init_jsonStatements();
-    init_utils4();
+    init_utils5();
     init_sqliteSchema();
     init_mysqlSchema();
     makeChanged = (schema4) => {
@@ -17796,7 +17808,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)) {
@@ -18033,7 +18045,7 @@ var init_mysqlUp = __esm({
     init_source();
     import_fs6 = __toESM(require("fs"));
     init_mysqlSchema();
-    init_utils4();
+    init_utils5();
     upMysqlHandler = (out) => {
     };
     upMySqlHandlerV4toV5 = (obj) => {
@@ -18146,7 +18158,7 @@ var init_upFolders = __esm({
     init_mysqlSchema();
     init_sqliteSchema();
     init_snapshotsDiffer();
-    init_utils4();
+    init_utils5();
     init_words();
     init_pgUp();
     init_pgSchema();
@@ -25178,15 +25190,33 @@ var require_lib2 = __commonJS({
 });
 
 // src/drivers/index.ts
-var import_drizzle_orm10, DrizzleDbClient, BetterSqlite, TursoSqlite, PgPostgres;
+var drivers_exports = {};
+__export(drivers_exports, {
+  BetterSqlite: () => BetterSqlite,
+  DrizzleDbClient: () => DrizzleDbClient,
+  DrizzleORMPgClient: () => DrizzleORMPgClient,
+  PgPostgres: () => PgPostgres,
+  TursoSqlite: () => TursoSqlite
+});
+var import_drizzle_orm8, DrizzleDbClient, DrizzleORMPgClient, BetterSqlite, TursoSqlite, PgPostgres;
 var init_drivers = __esm({
   "src/drivers/index.ts"() {
-    import_drizzle_orm10 = require("drizzle-orm");
+    import_drizzle_orm8 = require("drizzle-orm");
     DrizzleDbClient = class {
       constructor(db) {
         this.db = db;
       }
     };
+    DrizzleORMPgClient = class extends DrizzleDbClient {
+      async query(query, values) {
+        const res = await this.db.execute(import_drizzle_orm8.sql.raw(query));
+        return res.rows;
+      }
+      async run(query) {
+        const res = await this.db.execute(import_drizzle_orm8.sql.raw(query));
+        return res.rows;
+      }
+    };
     BetterSqlite = class extends DrizzleDbClient {
       async run(query) {
         this.db.prepare(query).run();
@@ -25243,9 +25273,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());
@@ -25254,6 +25285,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) => {
@@ -25871,18 +25914,18 @@ var init_sqliteIntrospect = __esm({
     init_sqlite_introspect();
     init_mjs();
     import_hanji7 = __toESM(require_hanji());
-    init_drivers();
     connectToSQLite = async (config) => {
+      const { BetterSqlite: BetterSqlite2, TursoSqlite: TursoSqlite2 } = await Promise.resolve().then(() => (init_drivers(), drivers_exports));
       if (config.driver === "better-sqlite") {
         const { default: Database } = await import("better-sqlite3");
         return {
-          client: new BetterSqlite(new Database(config.dbCredentials.url))
+          client: new BetterSqlite2(new Database(config.dbCredentials.url))
         };
       }
       if (config.driver === "libsql") {
         const { createClient } = await import("@libsql/client");
         return {
-          client: new TursoSqlite(
+          client: new TursoSqlite2(
             createClient({
               url: config.dbCredentials.url
             })
@@ -25891,7 +25934,7 @@ var init_sqliteIntrospect = __esm({
       } else {
         const { createClient } = await import("@libsql/client");
         return {
-          client: new TursoSqlite(
+          client: new TursoSqlite2(
             createClient({
               url: config.dbCredentials.url,
               authToken: config.dbCredentials.authToken
@@ -25919,13 +25962,9 @@ var init_sqliteIntrospect = __esm({
       const progress = new IntrospectProgress();
       const res = await (0, import_hanji7.renderWithTask)(
         progress,
-        fromDatabase3(
-          client,
-          filter2,
-          (stage, count, status) => {
-            progress.update(stage, count, status);
-          }
-        )
+        fromDatabase3(client, filter2, (stage, count, status) => {
+          progress.update(stage, count, status);
+        })
       );
       const schema4 = { id: originUUID, prevId: "", ...res };
       const ts = schemaToTypeScript2(schema4, config.introspect.casing);
@@ -25952,6 +25991,59 @@ var init_sqliteIntrospect = __esm({
   }
 });
 
+// src/cli/utils.ts
+var assertExists, assertPackages, requiredApiVersion, assertOrmCoreVersion, ormCoreVersions;
+var init_utils3 = __esm({
+  "src/cli/utils.ts"() {
+    init_views();
+    assertExists = (it) => {
+      if (!it)
+        throw new Error();
+    };
+    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 = 5;
+    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) {
@@ -41926,7 +42018,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 = [];
@@ -41949,7 +42041,7 @@ var require_server = __commonJS({
         this._server.close(cb);
       }
     };
-    module2.exports = Server;
+    module2.exports = Server2;
   }
 });
 
@@ -41980,8 +42072,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);
       }
@@ -42507,14 +42599,14 @@ var require_promise = __commonJS({
 });
 
 // src/orm-extenstions/d1-driver/session.ts
-var import_drizzle_orm11, import_drizzle_orm12, import_drizzle_orm13, import_sqlite_core3, import_drizzle_orm14, _a, SQLiteWranglerD1Session, _a2, PreparedQuery;
+var import_drizzle_orm9, import_drizzle_orm10, import_drizzle_orm11, import_sqlite_core3, import_drizzle_orm12, _a, SQLiteWranglerD1Session, _a2, PreparedQuery;
 var init_session = __esm({
   "src/orm-extenstions/d1-driver/session.ts"() {
+    import_drizzle_orm9 = require("drizzle-orm");
+    import_drizzle_orm10 = require("drizzle-orm");
     import_drizzle_orm11 = require("drizzle-orm");
-    import_drizzle_orm12 = require("drizzle-orm");
-    import_drizzle_orm13 = require("drizzle-orm");
     import_sqlite_core3 = require("drizzle-orm/sqlite-core");
-    import_drizzle_orm14 = require("drizzle-orm");
+    import_drizzle_orm12 = require("drizzle-orm");
     SQLiteWranglerD1Session = class extends import_sqlite_core3.SQLiteSession {
       constructor(client, configPath, dbName, dialect6, schema4, options = {}) {
         super(dialect6);
@@ -42523,7 +42615,7 @@ var init_session = __esm({
         this.dbName = dbName;
         this.schema = schema4;
         this.options = options;
-        this.logger = options.logger ?? new import_drizzle_orm12.NoopLogger();
+        this.logger = options.logger ?? new import_drizzle_orm10.NoopLogger();
       }
       prepareQuery(query, fields, executeMethod, customResultMapper) {
         return new PreparedQuery(
@@ -42542,7 +42634,7 @@ var init_session = __esm({
         throw new Error("no transaction support yet");
       }
     };
-    _a = import_drizzle_orm11.entityKind;
+    _a = import_drizzle_orm9.entityKind;
     SQLiteWranglerD1Session[_a] = "SQLiteD1Session";
     PreparedQuery = class extends import_sqlite_core3.PreparedQuery {
       constructor(stmt, configPath, dbName, queryString, params, logger, fields, executeMethod, customResultMapper) {
@@ -42557,14 +42649,14 @@ var init_session = __esm({
         this.customResultMapper = customResultMapper;
       }
       run(placeholderValues) {
-        const params = (0, import_drizzle_orm13.fillPlaceholders)(this.params, placeholderValues ?? {});
+        const params = (0, import_drizzle_orm11.fillPlaceholders)(this.params, placeholderValues ?? {});
         this.logger.logQuery(this.queryString, params);
         return this.stmt(this.queryString, this.configPath, this.dbName);
       }
       async all(placeholderValues) {
         const { fields, queryString, logger, stmt, customResultMapper } = this;
         if (!fields && !customResultMapper) {
-          const params = (0, import_drizzle_orm13.fillPlaceholders)(this.params, placeholderValues ?? {});
+          const params = (0, import_drizzle_orm11.fillPlaceholders)(this.params, placeholderValues ?? {});
           logger.logQuery(queryString, params);
           return stmt(this.queryString, this.configPath, this.dbName).then(
             ({ results }) => results
@@ -42574,12 +42666,12 @@ var init_session = __esm({
         if (customResultMapper) {
           return customResultMapper(rows);
         }
-        return rows.map((row) => (0, import_drizzle_orm14.mapResultRow)(fields, row, void 0));
+        return rows.map((row) => (0, import_drizzle_orm12.mapResultRow)(fields, row, void 0));
       }
       async get(placeholderValues) {
         const { fields, queryString, logger, stmt, customResultMapper } = this;
         if (!fields && !customResultMapper) {
-          const params = (0, import_drizzle_orm13.fillPlaceholders)(this.params, placeholderValues ?? {});
+          const params = (0, import_drizzle_orm11.fillPlaceholders)(this.params, placeholderValues ?? {});
           logger.logQuery(queryString, params);
           return stmt(queryString, this.configPath, this.dbName).then(
             ({ results }) => results[0]
@@ -42603,13 +42695,13 @@ var init_session = __esm({
         return rows;
       }
       async values(placeholderValues) {
-        const params = (0, import_drizzle_orm13.fillPlaceholders)(this.params, 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);
         return this.d1ToRawMapping(wranglerRes.results);
       }
     };
-    _a2 = import_drizzle_orm11.entityKind;
+    _a2 = import_drizzle_orm9.entityKind;
     PreparedQuery[_a2] = "D1PreparedQuery";
   }
 });
@@ -42643,15 +42735,15 @@ function drizzle(client, configPath, dbName, config = {}) {
   const dialect6 = new WranglerDialect();
   let logger;
   if (config.logger === true) {
-    logger = new import_drizzle_orm15.DefaultLogger();
+    logger = new import_drizzle_orm13.DefaultLogger();
   } else if (config.logger !== false) {
     logger = config.logger;
   }
   let schema4;
   if (config.schema) {
-    const tablesConfig = (0, import_drizzle_orm15.extractTablesRelationalConfig)(
+    const tablesConfig = (0, import_drizzle_orm13.extractTablesRelationalConfig)(
       config.schema,
-      import_drizzle_orm15.createTableRelationsHelpers
+      import_drizzle_orm13.createTableRelationsHelpers
     );
     schema4 = {
       fullSchema: config.schema,
@@ -42669,10 +42761,10 @@ function drizzle(client, configPath, dbName, config = {}) {
     schema4
   );
 }
-var import_drizzle_orm15, import_sqlite_core4, WranglerDialect;
+var import_drizzle_orm13, import_sqlite_core4, WranglerDialect;
 var init_driver = __esm({
   "src/orm-extenstions/d1-driver/driver.ts"() {
-    import_drizzle_orm15 = require("drizzle-orm");
+    import_drizzle_orm13 = require("drizzle-orm");
     import_sqlite_core4 = require("drizzle-orm/sqlite-core");
     init_session();
     WranglerDialect = class extends import_sqlite_core4.SQLiteAsyncDialect {
@@ -57917,7 +58009,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"() {
   }
 });
@@ -57925,7 +58017,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();
   }
 });
 
@@ -57985,21 +58077,23 @@ var init_wrangler_client = __esm({
 var studioUtils_exports = {};
 __export(studioUtils_exports, {
   drizzleDb: () => drizzleDb,
+  drizzleForPostgres: () => drizzleForPostgres,
   prepareModels: () => prepareModels
 });
-var import_drizzle_orm16, import_mysql_core4, import_pg_core4, import_sqlite_core5, prepareModels, drizzleDb;
+var import_drizzle_orm14, import_mysql_core4, import_pg_core4, import_sqlite_core5, prepareModels, drizzleForPostgres, drizzleDb;
 var init_studioUtils = __esm({
   "src/serializer/studioUtils.ts"() {
-    import_drizzle_orm16 = require("drizzle-orm");
+    import_drizzle_orm14 = require("drizzle-orm");
     import_mysql_core4 = require("drizzle-orm/mysql-core");
     import_pg_core4 = require("drizzle-orm/pg-core");
     import_sqlite_core5 = require("drizzle-orm/sqlite-core");
     init_utils();
+    init_utils3();
     init_serializer();
     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++) {
@@ -58007,33 +58101,45 @@ var init_studioUtils = __esm({
         const i0 = require(`${it}`);
         const i0values = Object.entries(i0);
         i0values.forEach(([k, t]) => {
-          if ((0, import_drizzle_orm16.is)(t, import_pg_core4.PgTable)) {
-            pgSchema3[k] = t;
+          if ((0, import_drizzle_orm14.is)(t, import_pg_core4.PgTable)) {
+            pgSchema4[k] = t;
           }
-          if ((0, import_drizzle_orm16.is)(t, import_mysql_core4.MySqlTable)) {
+          if ((0, import_drizzle_orm14.is)(t, import_mysql_core4.MySqlTable)) {
             mysqlSchema4[k] = t;
           }
-          if ((0, import_drizzle_orm16.is)(t, import_sqlite_core5.SQLiteTable)) {
+          if ((0, import_drizzle_orm14.is)(t, import_sqlite_core5.SQLiteTable)) {
             sqliteSchema2[k] = t;
           }
-          if ((0, import_drizzle_orm16.is)(t, import_drizzle_orm16.Relations)) {
+          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, verbose) => {
+      assertPackages("pg");
+      const { drizzle: drizzle2 } = await import("drizzle-orm/node-postgres");
+      const { Pool } = await Promise.resolve().then(() => __toESM(require_lib2()));
+      const db = drizzle2(new Pool(connectionConfig.dbCredentials), {
+        logger: verbose
+      });
+      return {
+        type: "pg",
+        db,
+        schema: pgSchema4
+      };
     };
-    drizzleDb = async (drizzleConfig, models, logger) => {
+    drizzleDb = async (drizzleConfig, models, logger, pgClient) => {
       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);
+        if (!pgClient)
+          throw new Error("pg client not provided");
         return {
-          db: drizzle2(client, { logger }),
+          db: drizzle2(pgClient, { logger }),
           type: "pg",
           schema: models.pgSchema
         };
@@ -58094,7 +58200,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();
@@ -59752,7 +59858,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);
@@ -59791,54 +59897,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
@@ -59898,7 +59957,7 @@ var package_default = {
     ]
   },
   dependencies: {
-    "@drizzle-team/studio": "^0.0.9",
+    "@drizzle-team/studio": "^0.0.17",
     "@esbuild-kit/esm-loader": "^2.5.5",
     camelcase: "^7.0.1",
     chalk: "^5.2.0",
@@ -59947,14 +60006,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) => {
@@ -60545,7 +60604,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
@@ -61251,14 +61310,20 @@ 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 { prepareModels: prepareModels2, drizzleDb: drizzleDb2, drizzleForPostgres: drizzleForPostgres2 } = 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);
+  let setup;
+  if (drizzleConfig.driver === "pg") {
+    assertExists(models.pgSchema);
+    setup = await drizzleForPostgres2(drizzleConfig, models.pgSchema, options.verbose);
+  } else {
+    setup = await drizzleDb2(
+      drizzleConfig,
+      models,
+      options.verbose
+    );
+  }
+  const server = await (0, import_server.prepareServer)(setup);
   const port = options.port ?? 4983;
   const host = options.host ?? "127.0.0.1";
   console.log();