@mikro-orm/mysql 7.0.0-dev.33 → 7.0.0-dev.331

package/MySqlConnection.d.ts

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

package/MySqlConnection.js

@@ -1,6 +1,6 @@
 import { MysqlDialect } from 'kysely';
 import { createPool } from 'mysql2';
-import { Utils, AbstractSqlConnection } from '@mikro-orm/knex';
+import { Utils, AbstractSqlConnection } from '@mikro-orm/sql';
 export class MySqlConnection extends AbstractSqlConnection {
     createKyselyDialect(overrides) {
         const options = this.mapOptions(overrides);
@@ -43,7 +43,7 @@ export class MySqlConnection extends AbstractSqlConnection {
                 await ctx.releaseSavepoint(ctx.savepointName).execute();
             }
             catch (e) {
-                /* v8 ignore next 5 */
+                /* v8 ignore next */
                 // https://github.com/knex/knex/issues/805
                 if (e.errno !== 1305) {
                     throw e;

package/MySqlDriver.d.ts

@@ -1,10 +1,14 @@
-import { type Configuration, type EntityDictionary, type FilterQuery, type NativeInsertUpdateManyOptions, type QueryResult, type UpsertManyOptions } from '@mikro-orm/core';
-import { AbstractSqlDriver, MySqlPlatform } from '@mikro-orm/knex';
+import type { Configuration, Constructor, EntityDictionary, EntityName, FilterQuery, NativeInsertUpdateManyOptions, QueryResult, UpsertManyOptions } from '@mikro-orm/core';
+import { AbstractSqlDriver } from '@mikro-orm/sql';
 import { MySqlConnection } from './MySqlConnection.js';
+import { MySqlMikroORM } from './MySqlMikroORM.js';
+import { MySqlPlatform } from './MySqlPlatform.js';
 export declare class MySqlDriver extends AbstractSqlDriver<MySqlConnection, MySqlPlatform> {
-    protected autoIncrementIncrement?: number;
+    private autoIncrementIncrement?;
     constructor(config: Configuration);
     private getAutoIncrementIncrement;
-    nativeInsertMany<T extends object>(entityName: string, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
-    nativeUpdateMany<T extends object>(entityName: string, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T> & UpsertManyOptions<T>): Promise<QueryResult<T>>;
+    nativeInsertMany<T extends object>(entityName: EntityName<T>, data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T>): Promise<QueryResult<T>>;
+    nativeUpdateMany<T extends object>(entityName: EntityName<T>, where: FilterQuery<T>[], data: EntityDictionary<T>[], options?: NativeInsertUpdateManyOptions<T> & UpsertManyOptions<T>): Promise<QueryResult<T>>;
+    /** @inheritDoc */
+    getORMClass(): Constructor<MySqlMikroORM>;
 }

package/MySqlDriver.js

@@ -1,6 +1,7 @@
-import { Utils, } from '@mikro-orm/core';
-import { AbstractSqlDriver, MySqlPlatform } from '@mikro-orm/knex';
+import { AbstractSqlDriver, Utils } from '@mikro-orm/sql';
 import { MySqlConnection } from './MySqlConnection.js';
+import { MySqlMikroORM } from './MySqlMikroORM.js';
+import { MySqlPlatform } from './MySqlPlatform.js';
 export class MySqlDriver extends AbstractSqlDriver {
     autoIncrementIncrement;
     constructor(config) {
@@ -18,22 +19,24 @@ export class MySqlDriver extends AbstractSqlDriver {
     async nativeInsertMany(entityName, data, options = {}) {
         options.processCollections ??= true;
         const res = await super.nativeInsertMany(entityName, data, options);
-        const pks = this.getPrimaryKeyFields(entityName);
+        const meta = this.metadata.get(entityName);
+        const pks = this.getPrimaryKeyFields(meta);
         const ctx = options.ctx;
         const autoIncrementIncrement = await this.getAutoIncrementIncrement(ctx);
-        data.forEach((item, idx) => res.rows[idx] = { [pks[0]]: item[pks[0]] ?? res.insertId + (idx * autoIncrementIncrement) });
+        data.forEach((item, idx) => (res.rows[idx] = { [pks[0]]: item[pks[0]] ?? res.insertId + idx * autoIncrementIncrement }));
         res.row = res.rows[0];
         return res;
     }
     async nativeUpdateMany(entityName, where, data, options = {}) {
         const res = await super.nativeUpdateMany(entityName, where, data, options);
-        const pks = this.getPrimaryKeyFields(entityName);
+        const meta = this.metadata.get(entityName);
+        const pks = this.getPrimaryKeyFields(meta);
         const ctx = options.ctx;
         const autoIncrementIncrement = await this.getAutoIncrementIncrement(ctx);
         let i = 0;
         const rows = where.map(cond => {
             if (res.insertId != null && Utils.isEmpty(cond)) {
-                return { [pks[0]]: res.insertId + (i++ * autoIncrementIncrement) };
+                return { [pks[0]]: res.insertId + i++ * autoIncrementIncrement };
             }
             if (cond[pks[0]] == null) {
                 return undefined;
@@ -46,4 +49,8 @@ export class MySqlDriver extends AbstractSqlDriver {
         res.row = res.rows[0];
         return res;
     }
+    /** @inheritDoc */
+    getORMClass() {
+        return MySqlMikroORM;
+    }
 }

package/MySqlMikroORM.d.ts

@@ -1,19 +1,18 @@
-import { MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import { type AnyEntity, type EntityClass, type EntitySchema, MikroORM, type Options, type IDatabaseDriver, type EntityManager, type EntityManagerType } from '@mikro-orm/core';
+import type { SqlEntityManager } from '@mikro-orm/sql';
 import { MySqlDriver } from './MySqlDriver.js';
-import type { SqlEntityManager } from '@mikro-orm/knex';
+export type MySqlOptions<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> = Partial<Options<MySqlDriver, EM, Entities>>;
+export declare function defineMySqlConfig<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]>(options: Partial<Options<MySqlDriver, EM, Entities>>): Partial<Options<MySqlDriver, EM, Entities>>;
 /**
  * @inheritDoc
  */
-export declare class MySqlMikroORM<EM extends EntityManager = SqlEntityManager> extends MikroORM<MySqlDriver, EM> {
-    private static DRIVER;
+export declare class MySqlMikroORM<EM extends SqlEntityManager<MySqlDriver> = SqlEntityManager<MySqlDriver>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]> extends MikroORM<MySqlDriver, EM, Entities> {
     /**
      * @inheritDoc
      */
-    static init<D extends IDatabaseDriver = MySqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options?: Options<D, EM>): Promise<MikroORM<D, EM>>;
+    static init<D extends IDatabaseDriver = MySqlDriver, EM extends EntityManager<D> = D[typeof EntityManagerType] & EntityManager<D>, Entities extends (string | EntityClass<AnyEntity> | EntitySchema)[] = (string | EntityClass<AnyEntity> | EntitySchema)[]>(options: Partial<Options<D, EM, Entities>>): Promise<MikroORM<D, EM, Entities>>;
     /**
      * @inheritDoc
      */
-    static initSync<D extends IDatabaseDriver = MySqlDriver, EM extends EntityManager = D[typeof EntityManagerType] & EntityManager>(options: Options<D, EM>): MikroORM<D, EM>;
+    constructor(options: Partial<Options<MySqlDriver, EM, Entities>>);
 }
-export type MySqlOptions = Options<MySqlDriver>;
-export declare function defineMySqlConfig(options: MySqlOptions): Options<MySqlDriver, SqlEntityManager<MySqlDriver> & EntityManager<IDatabaseDriver<import("@mikro-orm/core").Connection>>>;

package/MySqlMikroORM.js

@@ -1,24 +1,22 @@
 import { defineConfig, MikroORM, } from '@mikro-orm/core';
 import { MySqlDriver } from './MySqlDriver.js';
+export function defineMySqlConfig(options) {
+    return defineConfig({ driver: MySqlDriver, ...options });
+}
 /**
  * @inheritDoc
  */
 export class MySqlMikroORM extends MikroORM {
-    static DRIVER = MySqlDriver;
     /**
      * @inheritDoc
      */
     static async init(options) {
-        return super.init(options);
+        return super.init(defineMySqlConfig(options));
     }
     /**
      * @inheritDoc
      */
-    static initSync(options) {
-        return super.initSync(options);
+    constructor(options) {
+        super(defineMySqlConfig(options));
     }
 }
-/* v8 ignore next 3 */
-export function defineMySqlConfig(options) {
-    return defineConfig({ driver: MySqlDriver, ...options });
-}

package/MySqlPlatform.d.ts

@@ -0,0 +1,4 @@
+import { BaseMySqlPlatform } from '@mikro-orm/sql';
+export declare class MySqlPlatform extends BaseMySqlPlatform {
+    escape(value: any): string;
+}

package/MySqlPlatform.js

@@ -0,0 +1,7 @@
+import SqlString from 'sqlstring';
+import { BaseMySqlPlatform } from '@mikro-orm/sql';
+export class MySqlPlatform extends BaseMySqlPlatform {
+    escape(value) {
+        return SqlString.escape(value, true, this.timezone);
+    }
+}

package/README.md

@@ -2,14 +2,14 @@
   <a href="https://mikro-orm.io"><img src="https://raw.githubusercontent.com/mikro-orm/mikro-orm/master/docs/static/img/logo-readme.svg?sanitize=true" alt="MikroORM" /></a>
 </h1>
 
-TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL and SQLite (including libSQL) databases. 
+TypeScript ORM for Node.js based on Data Mapper, [Unit of Work](https://mikro-orm.io/docs/unit-of-work/) and [Identity Map](https://mikro-orm.io/docs/identity-map/) patterns. Supports MongoDB, MySQL, MariaDB, PostgreSQL, SQLite (including libSQL), MSSQL and Oracle databases. 
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Hibernate](https://hibernate.org/).
 
-[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
-[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![NPM version](https://img.shields.io/npm/v/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
+[![NPM dev version](https://img.shields.io/npm/v/@mikro-orm/core/next.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![Chat on discord](https://img.shields.io/discord/1214904142443839538?label=discord&color=blue)](https://discord.gg/w8bjxFHS7X)
-[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://www.npmjs.com/package/@mikro-orm/core)
+[![Downloads](https://img.shields.io/npm/dm/@mikro-orm/core.svg)](https://npmx.dev/package/@mikro-orm/core)
 [![Coverage Status](https://img.shields.io/coveralls/mikro-orm/mikro-orm.svg)](https://coveralls.io/r/mikro-orm/mikro-orm?branch=master)
 [![Build Status](https://github.com/mikro-orm/mikro-orm/workflows/tests/badge.svg?branch=master)](https://github.com/mikro-orm/mikro-orm/actions?workflow=tests)
 
@@ -181,6 +181,7 @@ yarn add @mikro-orm/core @mikro-orm/mysql         # for mysql/mariadb
 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/oracledb      # for oracle
 yarn add @mikro-orm/core @mikro-orm/sqlite        # for sqlite
 yarn add @mikro-orm/core @mikro-orm/libsql        # for libsql
 ```
@@ -381,6 +382,8 @@ See also the list of contributors who [participated](https://github.com/mikro-or
 
 Please ⭐️ this repository if this project helped you!
 
+> If you'd like to support my open-source work, consider sponsoring me directly at [github.com/sponsors/b4nan](https://github.com/sponsors/b4nan).
+
 ## 📝 License
 
 Copyright © 2018 [Martin Adámek](https://github.com/b4nan).

package/index.d.ts

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

package/index.js

@@ -1,4 +1,5 @@
-export * from '@mikro-orm/knex';
+export * from '@mikro-orm/sql';
 export * from './MySqlDriver.js';
+export * from './MySqlPlatform.js';
 export * from './MySqlConnection.js';
 export { MySqlMikroORM as MikroORM, defineMySqlConfig as defineConfig, } from './MySqlMikroORM.js';

package/package.json

@@ -1,64 +1,64 @@
 {
   "name": "@mikro-orm/mysql",
-  "type": "module",
-  "version": "7.0.0-dev.33",
+  "version": "7.0.0-dev.331",
   "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.",
-  "exports": {
-    "./package.json": "./package.json",
-    ".": "./index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
-  },
   "keywords": [
-    "orm",
+    "data-mapper",
+    "ddd",
+    "entity",
+    "identity-map",
+    "javascript",
+    "js",
+    "mariadb",
+    "mikro-orm",
     "mongo",
     "mongodb",
     "mysql",
-    "mariadb",
+    "orm",
     "postgresql",
     "sqlite",
     "sqlite3",
     "ts",
     "typescript",
-    "js",
-    "javascript",
-    "entity",
-    "ddd",
-    "mikro-orm",
-    "unit-of-work",
-    "data-mapper",
-    "identity-map"
+    "unit-of-work"
   ],
-  "author": "Martin Adámek",
-  "license": "MIT",
+  "homepage": "https://mikro-orm.io",
   "bugs": {
     "url": "https://github.com/mikro-orm/mikro-orm/issues"
   },
-  "homepage": "https://mikro-orm.io",
-  "engines": {
-    "node": ">= 22.11.0"
+  "license": "MIT",
+  "author": "Martin Adámek",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/mikro-orm/mikro-orm.git"
+  },
+  "type": "module",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./index.js"
+  },
+  "publishConfig": {
+    "access": "public"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile && yarn copy",
+    "build": "yarn compile && yarn copy",
     "clean": "yarn run -T rimraf ./dist",
     "compile": "yarn run -T tsc -p tsconfig.build.json",
     "copy": "node ../../scripts/copy.mjs"
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
-    "@mikro-orm/knex": "7.0.0-dev.33",
-    "mysql2": "3.15.1"
+    "@mikro-orm/sql": "7.0.0-dev.331",
+    "kysely": "0.28.11",
+    "mysql2": "3.19.1",
+    "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.5.7",
-    "kysely": "0.28.7"
+    "@mikro-orm/core": "^6.6.9"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.33",
-    "kysely": "*"
+    "@mikro-orm/core": "7.0.0-dev.331"
+  },
+  "engines": {
+    "node": ">= 22.17.0"
   }
 }