drizzle-kit 0.16.5 → 0.16.7-0e43a92

package/index.js

@@ -12501,10 +12501,10 @@ var mysqlImports_exports = {};
 __export(mysqlImports_exports, {
   prepareFromMySqlImports: () => prepareFromMySqlImports
 });
-var import_drizzle_orm_mysql, prepareFromMySqlImports;
+var import_mysql_core, prepareFromMySqlImports;
 var init_mysqlImports = __esm({
   "src/serializer/mysqlImports.ts"() {
-    import_drizzle_orm_mysql = require("drizzle-orm-mysql");
+    import_mysql_core = require("drizzle-orm/mysql-core");
     prepareFromMySqlImports = (imports) => {
       const tables = [];
       const enums = [];
@@ -12513,12 +12513,12 @@ var init_mysqlImports = __esm({
         const i0 = require(it);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
-          if (t instanceof import_drizzle_orm_mysql.MySqlTable) {
+          if (t instanceof import_mysql_core.MySqlTable) {
             tables.push(
               t
             );
           }
-          if ((0, import_drizzle_orm_mysql.isMySqlSchema)(t)) {
+          if ((0, import_mysql_core.isMySqlSchema)(t)) {
             schemas.push(t);
           }
         });
@@ -12533,15 +12533,15 @@ var mysqlSerializer_exports = {};
 __export(mysqlSerializer_exports, {
   generateMySqlSnapshot: () => generateMySqlSnapshot
 });
-var import_drizzle_orm_mysql2, import_table, import_utils5, import_sql, import_common, dialect3, generateMySqlSnapshot;
+var import_mysql_core2, import_table, import_utils5, import_sql, import_common, dialect3, generateMySqlSnapshot;
 var init_mysqlSerializer = __esm({
   "src/serializer/mysqlSerializer.ts"() {
-    import_drizzle_orm_mysql2 = require("drizzle-orm-mysql");
+    import_mysql_core2 = require("drizzle-orm/mysql-core");
     import_table = require("drizzle-orm/table");
-    import_utils5 = require("drizzle-orm-mysql/utils");
+    import_utils5 = require("drizzle-orm/mysql-core/utils");
     import_sql = require("drizzle-orm/sql");
-    import_common = require("drizzle-orm-mysql/columns/common");
-    dialect3 = new import_drizzle_orm_mysql2.MySqlDialect();
+    import_common = require("drizzle-orm/mysql-core/columns/common");
+    dialect3 = new import_mysql_core2.MySqlDialect();
     generateMySqlSnapshot = (tables, enums, mysqlSchemas) => {
       const result = {};
       for (const table4 of tables) {
@@ -12644,10 +12644,10 @@ var pgImports_exports = {};
 __export(pgImports_exports, {
   prepareFromPgImports: () => prepareFromPgImports
 });
-var import_drizzle_orm_pg, prepareFromPgImports;
+var import_pg_core, prepareFromPgImports;
 var init_pgImports = __esm({
   "src/serializer/pgImports.ts"() {
-    import_drizzle_orm_pg = require("drizzle-orm-pg");
+    import_pg_core = require("drizzle-orm/pg-core");
     prepareFromPgImports = (imports) => {
       const tables = [];
       const enums = [];
@@ -12656,16 +12656,16 @@ var init_pgImports = __esm({
         const i0 = require(it);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
-          if ((0, import_drizzle_orm_pg.isPgEnum)(t)) {
+          if ((0, import_pg_core.isPgEnum)(t)) {
             enums.push(t);
             return;
           }
-          if (t instanceof import_drizzle_orm_pg.PgTable) {
+          if (t instanceof import_pg_core.PgTable) {
             tables.push(
               t
             );
           }
-          if ((0, import_drizzle_orm_pg.isPgSchema)(t)) {
+          if ((0, import_pg_core.isPgSchema)(t)) {
             schemas.push(t);
           }
         });
@@ -12682,14 +12682,14 @@ __export(pgSerializer_exports, {
   generatePgSnapshot: () => generatePgSnapshot,
   indexName: () => indexName
 });
-var import_drizzle_orm_pg2, import_utils6, import_sql2, import_table2, dialect4, indexName, generatePgSnapshot, fromDatabase;
+var import_pg_core2, import_utils6, import_sql2, import_table2, dialect4, indexName, generatePgSnapshot, fromDatabase;
 var init_pgSerializer = __esm({
   "src/serializer/pgSerializer.ts"() {
-    import_drizzle_orm_pg2 = require("drizzle-orm-pg");
-    import_utils6 = require("drizzle-orm-pg/utils");
+    import_pg_core2 = require("drizzle-orm/pg-core");
+    import_utils6 = require("drizzle-orm/pg-core/utils");
     import_sql2 = require("drizzle-orm/sql");
     import_table2 = require("drizzle-orm/table");
-    dialect4 = new import_drizzle_orm_pg2.PgDialect();
+    dialect4 = new import_pg_core2.PgDialect();
     indexName = (tableName, columns) => {
       return `${tableName}_${columns.join("_")}_index`;
     };
@@ -13039,10 +13039,10 @@ var sqliteImports_exports = {};
 __export(sqliteImports_exports, {
   prepareFromSqliteImports: () => prepareFromSqliteImports
 });
-var import_drizzle_orm_sqlite, prepareFromSqliteImports;
+var import_sqlite_core, prepareFromSqliteImports;
 var init_sqliteImports = __esm({
   "src/serializer/sqliteImports.ts"() {
-    import_drizzle_orm_sqlite = require("drizzle-orm-sqlite");
+    import_sqlite_core = require("drizzle-orm/sqlite-core");
     prepareFromSqliteImports = (imports) => {
       const tables = [];
       const enums = [];
@@ -13050,7 +13050,7 @@ var init_sqliteImports = __esm({
         const i0 = require(it);
         const i0values = Object.values(i0);
         i0values.forEach((t) => {
-          if (t instanceof import_drizzle_orm_sqlite.SQLiteTable) {
+          if (t instanceof import_sqlite_core.SQLiteTable) {
             tables.push(t);
           }
         });
@@ -13065,14 +13065,14 @@ var sqliteSerializer_exports = {};
 __export(sqliteSerializer_exports, {
   generateSqliteSnapshot: () => generateSqliteSnapshot
 });
-var import_table3, import_sql3, import_drizzle_orm_sqlite2, import_utils7, dialect5, generateSqliteSnapshot;
+var import_table3, import_sql3, import_sqlite_core2, import_utils7, dialect5, generateSqliteSnapshot;
 var init_sqliteSerializer = __esm({
   "src/serializer/sqliteSerializer.ts"() {
     import_table3 = require("drizzle-orm/table");
     import_sql3 = require("drizzle-orm/sql");
-    import_drizzle_orm_sqlite2 = require("drizzle-orm-sqlite");
-    import_utils7 = require("drizzle-orm-sqlite/utils");
-    dialect5 = new import_drizzle_orm_sqlite2.SQLiteSyncDialect();
+    import_sqlite_core2 = require("drizzle-orm/sqlite-core");
+    import_utils7 = require("drizzle-orm/sqlite-core/utils");
+    dialect5 = new import_sqlite_core2.SQLiteSyncDialect();
     generateSqliteSnapshot = (tables, enums) => {
       const result = {};
       for (const table4 of tables) {
@@ -13291,7 +13291,7 @@ var init_migrationPreparator = __esm({
 });
 
 // src/sqlgenerator.ts
-var pgNativeTypes, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, convertors, fromJson;
+var pgNativeTypes, isPgNativeType, Convertor, PgCreateTableConvertor, MySqlCreateTableConvertor, SQLiteCreateTableConvertor, CreateTypeEnumConvertor, AlterTypeAddValueConvertor, DropTableConvertor, PgRenameTableConvertor, SqliteRenameTableConvertor, MySqlRenameTableConvertor, PgAlterTableRenameColumnConvertor, MySqlAlterTableRenameColumnConvertor, SQLiteAlterTableRenameColumnConvertor, PgAlterTableDropColumnConvertor, MySqlAlterTableDropColumnConvertor, SQLiteAlterTableDropColumnConvertor, PgAlterTableAddColumnConvertor, MySqlAlterTableAddColumnConvertor, SQLiteAlterTableAddColumnConvertor, PgAlterTableAlterColumnSetTypeConvertor, SQLiteAlterTableAlterColumnSetTypeConvertor, PgAlterTableAlterColumnSetDefaultConvertor, SqliteAlterTableAlterColumnSetDefaultConvertor, PgAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableAlterColumnDropDefaultConvertor, SqliteAlterTableCreateCompositePrimaryKeyConvertor, SqliteAlterTableDeleteCompositePrimaryKeyConvertor, SqliteAlterTableAlterCompositePrimaryKeyConvertor, PgAlterTableAlterColumnSetNotNullConvertor, SqliteAlterTableAlterColumnSetNotNullConvertor, PgAlterTableAlterColumnDropNotNullConvertor, SqliteAlterTableAlterColumnDropNotNullConvertor, PgCreateForeignKeyConvertor, SqliteCreateForeignKeyConvertor, MySqlCreateForeignKeyConvertor, PgAlterForeignKeyConvertor, SqliteAlterForeignKeyConvertor, PgDeleteForeignKeyConvertor, SqliteDeleteForeignKeyConvertor, MySqlDeleteForeignKeyConvertor, CreatePgIndexConvertor, CreateMySqlIndexConvertor, CreateSqliteIndexConvertor, PgDropIndexConvertor, PgCreateSchemaConvertor, PgRenameSchemaConvertor, PgDropSchemaConvertor, PgAlterTableSetSchemaConvertor, PgAlterTableSetNewSchemaConvertor, PgAlterTableRemoveFromSchemaConvertor, SqliteDropIndexConvertor, MysqlCreateSchemaConvertor, MysqlDropSchemaConvertor, MysqlAlterTableSetSchemaConvertor, MysqlAlterTableSetNewSchemaConvertor, MysqlAlterTableRemoveFromSchemaConvertor, convertors, fromJson;
 var init_sqlgenerator = __esm({
   "src/sqlgenerator.ts"() {
     init_mysqlSchema();
@@ -13325,6 +13325,11 @@ var init_sqlgenerator = __esm({
       "bigserial",
       "double precision"
     ]);
+    isPgNativeType = (it) => {
+      if (pgNativeTypes.has(it))
+        return true;
+      return it.startsWith("varchar(") || it.startsWith("numeric(");
+    };
     Convertor = class {
     };
     PgCreateTableConvertor = class extends Convertor {
@@ -13342,7 +13347,7 @@ var init_sqlgenerator = __esm({
           const primaryKeyStatement = column5.primaryKey ? "PRIMARY KEY" : "";
           const notNullStatement = column5.notNull ? "NOT NULL" : "";
           const defaultStatement = column5.default !== void 0 ? `DEFAULT ${column5.default}` : "";
-          const type = pgNativeTypes.has(column5.type) ? column5.type : `"${column5.type}"`;
+          const type = isPgNativeType(column5.type) ? column5.type : `"${column5.type}"`;
           statement += "	" + `"${column5.name}" ${type} ${primaryKeyStatement} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim();
           statement += (i === columns.length - 1 ? "" : ",") + "\n";
         }
@@ -13561,7 +13566,7 @@ var init_sqlgenerator = __esm({
         const { tableName, column: column5 } = statement;
         const { name, type, notNull } = column5;
         const defaultStatement = `${column5.default !== void 0 ? `DEFAULT ${column5.default}` : ""}`;
-        const fixedType = pgNativeTypes.has(column5.type) ? column5.type : `"${column5.type}"`;
+        const fixedType = isPgNativeType(column5.type) ? column5.type : `"${column5.type}"`;
         const notNullStatement = `${notNull ? "NOT NULL" : ""}`;
         return `ALTER TABLE ${tableName} ADD COLUMN "${name}" ${fixedType} ${defaultStatement} ${notNullStatement}`.replace(/  +/g, " ").trim() + ";";
       }
@@ -21094,9 +21099,9 @@ var init_snapshotsDiffer = __esm({
       jsonStatements.push(...jsonRenameTables);
       jsonStatements.push(...jsonRenameColumnsStatements);
       jsonStatements.push(...jsonTableAlternations.alterColumns);
+      jsonStatements.push(...jsonTableAlternations.createColumns);
       jsonStatements.push(...jsonAlterReferencesForAlteredTables);
       jsonStatements.push(...jsonTableAlternations.dropColumns);
-      jsonStatements.push(...jsonTableAlternations.createColumns);
       if (dialect6 !== "sqlite")
         jsonStatements.push(...jsonCreateReferences);
       jsonStatements.push(...jsonDropIndexesForAllAlteredTables);
@@ -22380,9 +22385,9 @@ var require_pg_types = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/defaults.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/defaults.js"(exports, module2) {
     "use strict";
     module2.exports = {
       host: "localhost",
@@ -22419,9 +22424,9 @@ var require_defaults = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/utils.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/utils.js"(exports, module2) {
     "use strict";
     var crypto = require("crypto");
     var defaults = require_defaults();
@@ -22557,9 +22562,9 @@ var require_utils2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/sasl.js
+// node_modules/.pnpm/pg@8.9.0/node_modules/pg/lib/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.9.0/node_modules/pg/lib/sasl.js"(exports, module2) {
     "use strict";
     var crypto = require("crypto");
     function startSession(mechanisms) {
@@ -22581,6 +22586,9 @@ var require_sasl = __commonJS({
       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");
       }
@@ -22591,7 +22599,7 @@ var require_sasl = __commonJS({
         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 saltedPassword = crypto.pbkdf2Sync(password, saltBytes, sv.iteration, 32, "sha256");
       var clientKey = hmacSha256(saltedPassword, "Client Key");
       var storedKey = sha256(clientKey);
       var clientFirstMessageBare = "n=*,r=" + session.clientNonce;
@@ -22703,15 +22711,6 @@ var require_sasl = __commonJS({
     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,
@@ -23009,9 +23008,9 @@ var require_lib2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/type-overrides.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/type-overrides.js"(exports, module2) {
     "use strict";
     var types = require_pg_types();
     function TypeOverrides(userTypes) {
@@ -23129,9 +23128,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.9.0/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.9.0/node_modules/pg/lib/connection-parameters.js"(exports, module2) {
     "use strict";
     var dns = require("dns");
     var defaults = require_defaults();
@@ -23268,9 +23267,9 @@ var require_connection_parameters = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/result.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/result.js"(exports, module2) {
     "use strict";
     var types = require_pg_types();
     var matchRegexp = /^([A-Za-z]+)(?: (\d+))?(?: (\d+))?/;
@@ -23353,9 +23352,9 @@ var require_result = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/query.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/query.js"(exports, module2) {
     "use strict";
     var { EventEmitter } = require("events");
     var Result = require_result();
@@ -23536,9 +23535,9 @@ var require_query = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/messages.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/messages.js
 var require_messages = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/messages.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/messages.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NoticeMessage = exports.DataRowMessage = exports.CommandCompleteMessage = exports.ReadyForQueryMessage = exports.NotificationResponseMessage = exports.BackendKeyDataMessage = exports.AuthenticationMD5Password = exports.ParameterStatusMessage = exports.ParameterDescriptionMessage = exports.RowDescriptionMessage = exports.Field = exports.CopyResponse = exports.CopyDataMessage = exports.DatabaseError = exports.copyDone = exports.emptyQuery = exports.replicationStart = exports.portalSuspended = exports.noData = exports.closeComplete = exports.bindComplete = exports.parseComplete = void 0;
@@ -23701,9 +23700,9 @@ var require_messages = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/buffer-writer.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/buffer-writer.js
 var require_buffer_writer = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/buffer-writer.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/buffer-writer.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Writer = void 0;
@@ -23782,9 +23781,9 @@ var require_buffer_writer = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/serializer.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/serializer.js
 var require_serializer = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/serializer.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/serializer.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.serialize = void 0;
@@ -23947,9 +23946,9 @@ var require_serializer = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/buffer-reader.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/buffer-reader.js
 var require_buffer_reader = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/buffer-reader.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/buffer-reader.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.BufferReader = void 0;
@@ -24002,9 +24001,9 @@ var require_buffer_reader = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/parser.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/parser.js
 var require_parser = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/parser.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/parser.js"(exports) {
     "use strict";
     var __importDefault = exports && exports.__importDefault || function(mod) {
       return mod && mod.__esModule ? mod : { "default": mod };
@@ -24297,9 +24296,9 @@ var require_parser = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/index.js
+// node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/index.js
 var require_dist = __commonJS({
-  "node_modules/.pnpm/pg-protocol@1.5.0/node_modules/pg-protocol/dist/index.js"(exports) {
+  "node_modules/.pnpm/pg-protocol@1.6.0/node_modules/pg-protocol/dist/index.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.DatabaseError = exports.serialize = exports.parse = void 0;
@@ -24321,9 +24320,9 @@ var require_dist = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/connection.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/connection.js"(exports, module2) {
     "use strict";
     var net = require("net");
     var EventEmitter = require("events").EventEmitter;
@@ -24336,6 +24335,9 @@ var require_connection = __commonJS({
         super();
         config = config || {};
         this.stream = config.stream || new net.Socket();
+        if (typeof this.stream === "function") {
+          this.stream = this.stream(config);
+        }
         this._keepAlive = config.keepAlive;
         this._keepAliveInitialDelayMillis = config.keepAliveInitialDelayMillis;
         this.lastBuffer = false;
@@ -24464,7 +24466,6 @@ var require_connection = __commonJS({
       }
       sync() {
         this._ending = true;
-        this._send(flushBuffer);
         this._send(syncBuffer);
       }
       ref() {
@@ -24503,12 +24504,11 @@ var require_connection = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/client.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/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_lib2();
@@ -24704,17 +24704,29 @@ var require_client = __commonJS({
       }
       _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);
+        try {
+          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;
@@ -24993,9 +25005,9 @@ var require_client = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg-pool@3.5.2_pg@8.8.0/node_modules/pg-pool/index.js
+// node_modules/.pnpm/pg-pool@3.5.2_pg@8.9.0/node_modules/pg-pool/index.js
 var require_pg_pool = __commonJS({
-  "node_modules/.pnpm/pg-pool@3.5.2_pg@8.8.0/node_modules/pg-pool/index.js"(exports, module2) {
+  "node_modules/.pnpm/pg-pool@3.5.2_pg@8.9.0/node_modules/pg-pool/index.js"(exports, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var NOOP = function() {
@@ -25368,72 +25380,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.9.0/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.9.0/node_modules/pg/lib/native/query.js"(exports, module2) {
     "use strict";
     var EventEmitter = require("events").EventEmitter;
     var util2 = require("util");
@@ -25572,13 +25521,12 @@ var require_query2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/client.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/node_modules/pg/lib/native/client.js"(exports, module2) {
     "use strict";
     var Native = require("pg-native");
     var TypeOverrides = require_type_overrides();
-    var pkg = require_package();
     var EventEmitter = require("events").EventEmitter;
     var util2 = require("util");
     var ConnectionParameters = require_connection_parameters();
@@ -25805,17 +25753,17 @@ var require_client2 = __commonJS({
   }
 });
 
-// node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/native/index.js
+// node_modules/.pnpm/pg@8.9.0/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.9.0/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.9.0/node_modules/pg/lib/index.js
 var require_lib3 = __commonJS({
-  "node_modules/.pnpm/pg@8.8.0/node_modules/pg/lib/index.js"(exports, module2) {
+  "node_modules/.pnpm/pg@8.9.0/node_modules/pg/lib/index.js"(exports, module2) {
     "use strict";
     var Client = require_client();
     var defaults = require_defaults();
@@ -26009,7 +25957,7 @@ var init_introspect = __esm({
       ];
       let result = `import { ${uniquePgImports.join(
         ", "
-      )} } from "drizzle-orm-pg"
+      )} } from "drizzle-orm/pg-core"
 
 `;
       result += enumStatements;
@@ -26352,12 +26300,12 @@ var assertPackages = (...pkgs) => {
     process.exit(1);
   }
 };
-var requiredApiVersion = 1;
+var requiredApiVersion = 2;
 var assertPgVersion = () => {
-  const { apiVersion } = require("drizzle-orm/utils");
-  if (apiVersion && apiVersion === requiredApiVersion)
+  const { compatibilityVersion } = require("drizzle-orm/version");
+  if (compatibilityVersion && compatibilityVersion === requiredApiVersion)
     return;
-  if (!apiVersion || apiVersion < requiredApiVersion) {
+  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}"
     );
@@ -26383,7 +26331,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.16.5",
+  version: "0.16.7",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",
@@ -26405,8 +26353,8 @@ var package_default = {
     "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
     test: "ava test",
     build: "esbuild ./src/cli/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:drizzle-orm-pg --external:drizzle-orm-sqlite --external:drizzle-orm-mysql --external:drizzle-orm --external:pg-native",
-    pack: "build && package",
-    tsc: "tsc"
+    tsc: "tsc -p tsconfig.build.json",
+    pub: "cp package.json readme.md dist/ && cd dist && npm publish"
   },
   ava: {
     files: [
@@ -26436,10 +26384,7 @@ var package_default = {
     "@typescript-eslint/parser": "^5.46.1",
     ava: "^5.1.0",
     dockerode: "^3.3.4",
-    "drizzle-orm": "0.15.1-a1b76f5",
-    "drizzle-orm-mysql": "0.15.1-a1b76f5",
-    "drizzle-orm-pg": "0.15.1-a1b76f5",
-    "drizzle-orm-sqlite": "0.15.0-60954a3",
+    "drizzle-orm": "0.17.0-31c94dd",
     esbuild: "^0.15.7",
     "esbuild-register": "^3.3.3",
     eslint: "^8.29.0",
@@ -26785,7 +26730,7 @@ var generatePgCommand = new Command("generate:pg").option("--schema <schema>", "
     console.error(result);
     return;
   }
-  assertPackages("drizzle-orm", "drizzle-orm-pg");
+  assertPackages("drizzle-orm");
   const { prepareAndMigratePg: prepareAndMigratePg2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigratePg2(result);
 });
@@ -26800,7 +26745,7 @@ var generateMysqlCommand = new Command("generate:mysql").option("--schema <schem
     console.error(result);
     return;
   }
-  assertPackages("drizzle-orm", "drizzle-orm-mysql");
+  assertPackages("drizzle-orm");
   const { prepareAndMigrateMySql: prepareAndMigrateMySql2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigrateMySql2(result);
 });
@@ -26815,7 +26760,7 @@ var generateSqliteCommand = new Command("generate:sqlite").option("--schema <sch
     console.error(result);
     return;
   }
-  assertPackages("drizzle-orm", "drizzle-orm-sqlite");
+  assertPackages("drizzle-orm");
   const { prepareAndMigrateSqlite: prepareAndMigrateSqlite2 } = (init_migrate(), __toCommonJS(migrate_exports));
   await prepareAndMigrateSqlite2(result);
 });
@@ -26871,7 +26816,7 @@ var upPgCommand = new Command("up:pg").option("--out <out>", `Output folder`).op
     );
     process.exit(0);
   }
-  assertPackages("drizzle-orm", "drizzle-orm-pg");
+  assertPackages("drizzle-orm");
   upPgHandler(out);
 });
 var upMysqlCommand = new Command("up:mysql").option("--out <out>", `Output folder`).option("--config <config>", `Config path [default=drizzle.config.json]`).action((options) => {
@@ -26907,7 +26852,7 @@ var pt1 = objectType({
 });
 var introspectPgCommand = new Command("introspect:pg").option("--out <out>", `Migrations folder`).option("--connectionString <connectionString>", "Postgres connection string").option("--host <host>", "Postgres host").option("--port <port>", "Postgres port").option("--user <user>", "Postgres user").option("--password <password>", "Postgres password").option("--database <database>", "Postgres database name").option("--ssl <ssl>", "Postgres ssl").action(async (options) => {
   printVersions();
-  assertPackages("drizzle-orm", "drizzle-orm-pg");
+  assertPackages("drizzle-orm");
   assertPgVersion();
   const { pgIntrospect: pgIntrospect2, PgConfig2: PgConfig22, PgConfig1: PgConfig12 } = (init_pgIntrospect(), __toCommonJS(pgIntrospect_exports));
   const pgIntrospectConfig = unionType([

package/package.json

@@ -1,72 +1,69 @@
 {
-  "name": "drizzle-kit",
-  "version": "0.16.5",
-  "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
-  "author": "Alex Blokh <aleksandrblokh@gmail.com>",
-  "license": "MIT",
-  "bin": {
-    "drizzle-kit": "./index.js"
-  },
-  "ava": {
-    "files": [
-      "test/**/*.ts"
-    ],
-    "extensions": {
-      "ts": "module"
-    },
-    "nodeArguments": [
-      "--loader=tsx"
-    ]
-  },
-  "dependencies": {
-    "chalk": "^5.2.0",
-    "commander": "^9.4.1",
-    "esbuild": "^0.15.18",
-    "esbuild-register": "^3.4.2",
-    "hanji": "^0.0.5",
-    "json-diff": "0.9.0",
-    "zod": "^3.20.2"
-  },
-  "devDependencies": {
-    "@types/dockerode": "^3.3.14",
-    "@types/node": "^18.11.15",
-    "@types/pg": "^8.6.5",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "ava": "^5.1.0",
-    "dockerode": "^3.3.4",
-    "drizzle-orm": "0.15.1-a1b76f5",
-    "drizzle-orm-mysql": "0.15.1-a1b76f5",
-    "drizzle-orm-pg": "0.15.1-a1b76f5",
-    "drizzle-orm-sqlite": "0.15.0-60954a3",
-    "esbuild": "^0.15.7",
-    "esbuild-register": "^3.3.3",
-    "eslint": "^8.29.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "get-port": "^6.1.2",
-    "pg": "^8.8.0",
-    "prettier": "^2.8.1",
-    "tsx": "^3.12.1",
-    "typescript": "^4.9.4",
-    "uvu": "^0.5.6"
-  },
-  "scripts": {
-    "start:pg": "node -r esbuild-register ./src/cli/index.ts generate --out ./dev/migrations --dialect pg --schema ./dev/data",
-    "check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
-    "up:pg": "node -r esbuild-register ./src/cli/index.ts up --out ./dev/equedi --dialect pg",
-    "check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
-    "run": "node -r esbuild-register index.ts",
-    "watch": "esbuild ./src/clie/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:pg-native --sourcemap --watch",
-    "diff": "esbuild ./src/clie/index.ts ./dev/diff.ts",
-    "prepare:mysql": "node -r esbuild-register dev/mysql/index.ts",
-    "prepare:pg": "node -r esbuild-register dev/index.ts",
-    "prepare-snapshot": "node -r esbuild-register ./dev/prepare-snapshot prepare ./dev/data",
-    "sim": "node -r esbuild-register ./dev/simulate.ts",
-    "sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
-    "test": "ava test",
-    "build": "esbuild ./src/cli/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:drizzle-orm-pg --external:drizzle-orm-sqlite --external:drizzle-orm-mysql --external:drizzle-orm --external:pg-native",
-    "pack": "build && package",
-    "tsc": "tsc"
-  }
-}
+	"name": "drizzle-kit",
+	"version": "0.16.7-0e43a92",
+	"repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
+	"author": "Alex Blokh <aleksandrblokh@gmail.com>",
+	"license": "MIT",
+	"bin": {
+		"drizzle-kit": "./index.js"
+	},
+	"scripts": {
+		"start:pg": "node -r esbuild-register ./src/cli/index.ts generate --out ./dev/migrations --dialect pg --schema ./dev/data",
+		"check:pg": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/migrations --dialect pg",
+		"up:pg": "node -r esbuild-register ./src/cli/index.ts up --out ./dev/equedi --dialect pg",
+		"check:equedi": "node -r esbuild-register ./src/cli/index.ts check --out ./dev/equedi --dialect pg",
+		"run": "node -r esbuild-register index.ts",
+		"watch": "esbuild ./src/clie/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:pg-native --sourcemap --watch",
+		"diff": "esbuild ./src/clie/index.ts ./dev/diff.ts",
+		"prepare:mysql": "node -r esbuild-register dev/mysql/index.ts",
+		"prepare:pg": "node -r esbuild-register dev/index.ts",
+		"prepare-snapshot": "node -r esbuild-register ./dev/prepare-snapshot prepare ./dev/data",
+		"sim": "node -r esbuild-register ./dev/simulate.ts",
+		"sim:sqlite": "node -r esbuild-register ./dev/sqlite/index.ts",
+		"test": "ava test",
+		"build": "esbuild ./src/cli/index.ts --bundle --platform=node --target=node10.4 --outfile=./dist/index.js --external:esbuild --external:drizzle-orm-pg --external:drizzle-orm-sqlite --external:drizzle-orm-mysql --external:drizzle-orm --external:pg-native",
+		"tsc": "tsc -p tsconfig.build.json",
+		"pub": "cp package.json readme.md dist/ && cd dist && npm publish"
+	},
+	"ava": {
+		"files": [
+			"test/**/*.ts"
+		],
+		"extensions": {
+			"ts": "module"
+		},
+		"nodeArguments": [
+			"--loader=tsx"
+		]
+	},
+	"dependencies": {
+		"chalk": "^5.2.0",
+		"commander": "^9.4.1",
+		"esbuild": "^0.15.18",
+		"esbuild-register": "^3.4.2",
+		"hanji": "^0.0.5",
+		"json-diff": "0.9.0",
+		"zod": "^3.20.2"
+	},
+	"devDependencies": {
+		"@types/dockerode": "^3.3.14",
+		"@types/node": "^18.11.15",
+		"@types/pg": "^8.6.5",
+		"@typescript-eslint/eslint-plugin": "^5.46.1",
+		"@typescript-eslint/parser": "^5.46.1",
+		"ava": "^5.1.0",
+		"dockerode": "^3.3.4",
+		"drizzle-orm": "0.17.0-31c94dd",
+		"esbuild": "^0.15.7",
+		"esbuild-register": "^3.3.3",
+		"eslint": "^8.29.0",
+		"eslint-config-prettier": "^8.5.0",
+		"eslint-plugin-prettier": "^4.2.1",
+		"get-port": "^6.1.2",
+		"pg": "^8.8.0",
+		"prettier": "^2.8.1",
+		"tsx": "^3.12.1",
+		"typescript": "^4.9.4",
+		"uvu": "^0.5.6"
+	}
+}