@mikro-orm/mysql 6.4.7-dev.1 → 7.0.0-dev.1

package/MySqlConnection.d.ts

@@ -0,0 +1,7 @@
+import { MysqlDialect } from 'kysely';
+import { type PoolOptions } from 'mysql2';
+import { AbstractSqlConnection } from '@mikro-orm/knex';
+export declare class MySqlConnection extends AbstractSqlConnection {
+    createKyselyDialect(overrides: PoolOptions): MysqlDialect;
+    mapOptions(overrides: PoolOptions): PoolOptions;
+}

package/MySqlConnection.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MySqlConnection = void 0;
+const kysely_1 = require("kysely");
+const mysql2_1 = require("mysql2");
+const knex_1 = require("@mikro-orm/knex");
+class MySqlConnection extends knex_1.AbstractSqlConnection {
+    createKyselyDialect(overrides) {
+        const options = this.mapOptions(overrides);
+        const password = options.password;
+        if (typeof password === 'function') {
+            return new kysely_1.MysqlDialect({
+                pool: async () => (0, mysql2_1.createPool)({
+                    ...options,
+                    password: await password(),
+                }),
+                onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
+            });
+        }
+        return new kysely_1.MysqlDialect({
+            pool: (0, mysql2_1.createPool)(options),
+            onCreateConnection: this.options.onCreateConnection ?? this.config.get('onCreateConnection'),
+        });
+    }
+    mapOptions(overrides) {
+        const ret = { ...this.getConnectionOptions() };
+        const pool = this.config.get('pool');
+        knex_1.Utils.defaultValue(ret, 'connectionLimit', pool?.max);
+        knex_1.Utils.defaultValue(ret, 'idleTimeout', pool?.idleTimeoutMillis);
+        if (this.config.get('multipleStatements')) {
+            ret.multipleStatements = this.config.get('multipleStatements');
+        }
+        if (this.config.get('forceUtcTimezone')) {
+            ret.timezone = 'Z';
+        }
+        if (this.config.get('timezone')) {
+            ret.timezone = this.config.get('timezone');
+        }
+        ret.supportBigNumbers = true;
+        ret.dateStrings = true;
+        return knex_1.Utils.mergeConfig(ret, overrides);
+    }
+}
+exports.MySqlConnection = MySqlConnection;

package/MySqlDriver.d.ts

@@ -1,5 +1,6 @@
 import { type Configuration, type EntityDictionary, type FilterQuery, type NativeInsertUpdateManyOptions, type QueryResult, type UpsertManyOptions } from '@mikro-orm/core';
-import { AbstractSqlDriver, MySqlConnection, MySqlPlatform } from '@mikro-orm/knex';
+import { AbstractSqlDriver, MySqlPlatform } from '@mikro-orm/knex';
+import { MySqlConnection } from './MySqlConnection';
 export declare class MySqlDriver extends AbstractSqlDriver<MySqlConnection, MySqlPlatform> {
     protected autoIncrementIncrement?: number;
     constructor(config: Configuration);

package/MySqlDriver.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySqlDriver = void 0;
 const core_1 = require("@mikro-orm/core");
 const knex_1 = require("@mikro-orm/knex");
+const MySqlConnection_1 = require("./MySqlConnection");
 class MySqlDriver extends knex_1.AbstractSqlDriver {
     autoIncrementIncrement;
     constructor(config) {
-        super(config, new knex_1.MySqlPlatform(), knex_1.MySqlConnection, ['knex', 'mysql2']);
+        super(config, new knex_1.MySqlPlatform(), MySqlConnection_1.MySqlConnection, ['kysely', 'mysql2']);
     }
     async getAutoIncrementIncrement(ctx) {
         if (this.autoIncrementIncrement == null) {

package/README.md

@@ -183,7 +183,6 @@ yarn add @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 yarn add @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 yarn add @mikro-orm/core @mikro-orm/mssql         # for mssql
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-yarn add @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 
@@ -196,7 +195,6 @@ npm i -s @mikro-orm/core @mikro-orm/mariadb       # for mysql/mariadb
 npm i -s @mikro-orm/core @mikro-orm/postgresql    # for postgresql
 npm i -s @mikro-orm/core @mikro-orm/mssql         # for mssql
 npm i -s @mikro-orm/core @mikro-orm/sqlite        # for sqlite
-npm i -s @mikro-orm/core @mikro-orm/better-sqlite # for better-sqlite
 npm i -s @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
 

package/index.d.ts

@@ -1,3 +1,4 @@
 export * from '@mikro-orm/knex';
 export * from './MySqlDriver';
+export * from './MySqlConnection';
 export { MySqlMikroORM as MikroORM, MySqlOptions as Options, defineMySqlConfig as defineConfig, } from './MySqlMikroORM';

package/index.js

@@ -18,6 +18,7 @@ exports.defineConfig = exports.MikroORM = void 0;
 /* istanbul ignore file */
 __exportStar(require("@mikro-orm/knex"), exports);
 __exportStar(require("./MySqlDriver"), exports);
+__exportStar(require("./MySqlConnection"), exports);
 var MySqlMikroORM_1 = require("./MySqlMikroORM");
 Object.defineProperty(exports, "MikroORM", { enumerable: true, get: function () { return MySqlMikroORM_1.MySqlMikroORM; } });
 Object.defineProperty(exports, "defineConfig", { enumerable: true, get: function () { return MySqlMikroORM_1.defineMySqlConfig; } });

package/index.mjs

@@ -19,12 +19,10 @@ export const ArrayType = mod.ArrayType;
 export const BaseEntity = mod.BaseEntity;
 export const BaseSqliteConnection = mod.BaseSqliteConnection;
 export const BaseSqlitePlatform = mod.BaseSqlitePlatform;
-export const BaseSqliteSchemaHelper = mod.BaseSqliteSchemaHelper;
 export const BeforeCreate = mod.BeforeCreate;
 export const BeforeDelete = mod.BeforeDelete;
 export const BeforeUpdate = mod.BeforeUpdate;
 export const BeforeUpsert = mod.BeforeUpsert;
-export const BetterSqliteKnexDialect = mod.BetterSqliteKnexDialect;
 export const BigIntType = mod.BigIntType;
 export const BlobType = mod.BlobType;
 export const BooleanType = mod.BooleanType;
@@ -112,14 +110,12 @@ export const JSON_KEY_OPERATORS = mod.JSON_KEY_OPERATORS;
 export const JoinType = mod.JoinType;
 export const JsonProperty = mod.JsonProperty;
 export const JsonType = mod.JsonType;
-export const Knex = mod.Knex;
-export const LibSqlKnexDialect = mod.LibSqlKnexDialect;
+export const Kysely = mod.Kysely;
 export const LoadStrategy = mod.LoadStrategy;
 export const LockMode = mod.LockMode;
 export const LockWaitTimeoutException = mod.LockWaitTimeoutException;
 export const ManyToMany = mod.ManyToMany;
 export const ManyToOne = mod.ManyToOne;
-export const MariaDbKnexDialect = mod.MariaDbKnexDialect;
 export const MediumIntType = mod.MediumIntType;
 export const MemoryCacheAdapter = mod.MemoryCacheAdapter;
 export const MetadataDiscovery = mod.MetadataDiscovery;
@@ -129,14 +125,14 @@ export const MetadataStorage = mod.MetadataStorage;
 export const MetadataValidator = mod.MetadataValidator;
 export const MikroORM = mod.MikroORM;
 export const MongoNamingStrategy = mod.MongoNamingStrategy;
-export const MonkeyPatchable = mod.MonkeyPatchable;
-export const MsSqlKnexDialect = mod.MsSqlKnexDialect;
+export const MsSqlNativeQueryBuilder = mod.MsSqlNativeQueryBuilder;
 export const MySqlConnection = mod.MySqlConnection;
 export const MySqlDriver = mod.MySqlDriver;
 export const MySqlExceptionConverter = mod.MySqlExceptionConverter;
-export const MySqlKnexDialect = mod.MySqlKnexDialect;
+export const MySqlNativeQueryBuilder = mod.MySqlNativeQueryBuilder;
 export const MySqlPlatform = mod.MySqlPlatform;
 export const MySqlSchemaHelper = mod.MySqlSchemaHelper;
+export const NativeQueryBuilder = mod.NativeQueryBuilder;
 export const NodeState = mod.NodeState;
 export const NonUniqueFieldNameException = mod.NonUniqueFieldNameException;
 export const NotFoundError = mod.NotFoundError;
@@ -156,7 +152,7 @@ export const PlainObject = mod.PlainObject;
 export const Platform = mod.Platform;
 export const PopulateHint = mod.PopulateHint;
 export const PopulatePath = mod.PopulatePath;
-export const PostgreSqlKnexDialect = mod.PostgreSqlKnexDialect;
+export const PostgreSqlNativeQueryBuilder = mod.PostgreSqlNativeQueryBuilder;
 export const PrimaryKey = mod.PrimaryKey;
 export const PrimaryKeyProp = mod.PrimaryKeyProp;
 export const Property = mod.Property;
@@ -168,6 +164,7 @@ export const QueryOperator = mod.QueryOperator;
 export const QueryOrder = mod.QueryOrder;
 export const QueryOrderNumeric = mod.QueryOrderNumeric;
 export const QueryType = mod.QueryType;
+export const Raw = mod.Raw;
 export const RawQueryFragment = mod.RawQueryFragment;
 export const ReadOnlyException = mod.ReadOnlyException;
 export const Ref = mod.Ref;
@@ -189,8 +186,9 @@ export const SmallIntType = mod.SmallIntType;
 export const SqlEntityManager = mod.SqlEntityManager;
 export const SqlEntityRepository = mod.SqlEntityRepository;
 export const SqlSchemaGenerator = mod.SqlSchemaGenerator;
-export const SqliteKnexDialect = mod.SqliteKnexDialect;
-export const SqliteTableCompiler = mod.SqliteTableCompiler;
+export const SqliteExceptionConverter = mod.SqliteExceptionConverter;
+export const SqliteNativeQueryBuilder = mod.SqliteNativeQueryBuilder;
+export const SqliteSchemaHelper = mod.SqliteSchemaHelper;
 export const StringType = mod.StringType;
 export const SyntaxErrorException = mod.SyntaxErrorException;
 export const TableExistsException = mod.TableExistsException;
@@ -224,7 +222,7 @@ export const equals = mod.equals;
 export const getOnConflictFields = mod.getOnConflictFields;
 export const getOnConflictReturningFields = mod.getOnConflictReturningFields;
 export const helper = mod.helper;
-export const knex = mod.knex;
+export const isRaw = mod.isRaw;
 export const parseJsonSafe = mod.parseJsonSafe;
 export const raw = mod.raw;
 export const ref = mod.ref;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/mysql",
-  "version": "6.4.7-dev.1",
+  "version": "7.0.0-dev.1",
   "description": "TypeScript ORM for Node.js based on Data Mapper, Unit of Work and Identity Map patterns. Supports MongoDB, MySQL, PostgreSQL and SQLite databases as well as usage with vanilla JavaScript.",
   "main": "index.js",
   "module": "index.mjs",
@@ -46,7 +46,7 @@
   },
   "homepage": "https://mikro-orm.io",
   "engines": {
-    "node": ">= 18.12.0"
+    "node": ">= 22.11.0"
   },
   "scripts": {
     "build": "yarn clean && yarn compile && yarn copy && yarn run -T gen-esm-wrapper index.js index.mjs",
@@ -58,13 +58,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@mikro-orm/knex": "6.4.7-dev.1",
+    "@mikro-orm/knex": "7.0.0-dev.1",
     "mysql2": "3.12.0"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.6"
+    "@mikro-orm/core": "^6.4.5",
+    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "6.4.7-dev.1"
+    "@mikro-orm/core": "7.0.0-dev.1",
+    "kysely": "*"
   }
 }