drizzle-kit 0.16.6 → 0.16.8

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() + ";";
       }
@@ -26009,7 +26014,7 @@ var init_introspect = __esm({
       ];
       let result = `import { ${uniquePgImports.join(
         ", "
-      )} } from "drizzle-orm-pg"
+      )} } from "drizzle-orm/pg-core"
 
 `;
       result += enumStatements;
@@ -26352,12 +26357,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 +26388,7 @@ init_source();
 // package.json
 var package_default = {
   name: "drizzle-kit",
-  version: "0.16.6",
+  version: "0.16.8",
   repository: "https://github.com/drizzle-team/drizzle-kit-mirror",
   author: "Alex Blokh <aleksandrblokh@gmail.com>",
   license: "MIT",
@@ -26436,10 +26441,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 +26787,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 +26802,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 +26817,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 +26873,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 +26909,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,6 +1,6 @@
 {
   "name": "drizzle-kit",
-  "version": "0.16.6",
+  "version": "0.16.8",
   "repository": "https://github.com/drizzle-team/drizzle-kit-mirror",
   "author": "Alex Blokh <aleksandrblokh@gmail.com>",
   "license": "MIT",
@@ -35,10 +35,7 @@
     "@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",