@mikro-orm/knex 6.0.0-dev.45 → 6.0.0-dev.47

package/AbstractSqlConnection.js

@@ -77,6 +77,7 @@ class AbstractSqlConnection extends core_1.Connection {
         }
     }
     async execute(queryOrKnex, params = [], method = 'all', ctx) {
+        await this.ensureConnection();
         if (core_1.Utils.isObject(queryOrKnex)) {
             ctx ??= (queryOrKnex.client.transacting ? queryOrKnex : null);
             const q = queryOrKnex.toSQL();
@@ -177,5 +178,5 @@ class AbstractSqlConnection extends core_1.Connection {
         };
     }
 }
-exports.AbstractSqlConnection = AbstractSqlConnection;
 AbstractSqlConnection.__patched = false;
+exports.AbstractSqlConnection = AbstractSqlConnection;

package/AbstractSqlDriver.js

@@ -124,7 +124,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         qb.where(where);
         const kqb = qb.getKnexQuery().clear('select');
         if (type === query_1.QueryType.COUNT) {
-            kqb.select(qb.raw('count(*) as count'));
+            kqb.select(this.connection.getKnex().raw('count(*) as count'));
         }
         else { // select
             kqb.select('*');
@@ -255,8 +255,12 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const set = new Set();
         data.forEach(row => core_1.Utils.keys(row).forEach(k => set.add(k)));
         const props = [...set].map(name => meta?.properties[name] ?? { name, fieldNames: [name] });
-        const fields = core_1.Utils.flatten(props.map(prop => prop.fieldNames));
+        let fields = core_1.Utils.flatten(props.map(prop => prop.fieldNames));
+        const duplicates = core_1.Utils.findDuplicates(fields);
         const params = [];
+        if (duplicates.length) {
+            fields = core_1.Utils.unique(fields);
+        }
         /* istanbul ignore next */
         const tableName = meta ? this.getTableName(meta, options) : this.platform.quoteIdentifier(entityName);
         let sql = `insert into ${tableName} `;
@@ -279,8 +283,16 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 const keys = [];
                 props.forEach(prop => {
                     if (prop.fieldNames.length > 1) {
-                        params.push(...(row[prop.name] ?? prop.fieldNames.map(() => null)));
-                        keys.push(...(row[prop.name] ?? prop.fieldNames).map(() => '?'));
+                        const param = row[prop.name] ?? prop.fieldNames.map(() => null);
+                        const key = (row[prop.name] ?? prop.fieldNames).map(() => '?');
+                        prop.fieldNames.forEach((field, idx) => {
+                            if (duplicates.includes(field)) {
+                                param.splice(idx, 1);
+                                key.splice(idx, 1);
+                            }
+                        });
+                        params.push(...param);
+                        keys.push(...key);
                     }
                     else if (prop.customType && 'convertToDatabaseValueSQL' in prop.customType && !this.platform.isRaw(row[prop.name])) {
                         keys.push(prop.customType.convertToDatabaseValueSQL('?', this.platform));
@@ -294,9 +306,10 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
                 return '(' + (keys.join(', ') || 'default') + ')';
             }).join(', ');
         }
-        if (this.platform.usesReturningStatement()) {
-            /* istanbul ignore next */
-            const returningProps = meta.hydrateProps.filter(prop => prop.persist !== false && (prop.primary || prop.defaultRaw));
+        if (meta && this.platform.usesReturningStatement()) {
+            const returningProps = meta.hydrateProps
+                .filter(prop => prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw))
+                .filter(prop => !(prop.name in data[0]) || core_1.Utils.isRawSql(data[0][prop.name]));
             const returningFields = core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames));
             /* istanbul ignore next */
             sql += returningFields.length > 0 ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}` : '';
@@ -363,7 +376,15 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         }
         const collections = options.processCollections ? data.map(d => this.extractManyToMany(entityName, d)) : [];
         const keys = new Set();
-        data.forEach(row => core_1.Utils.keys(row).forEach(k => keys.add(k)));
+        const returning = new Set();
+        data.forEach(row => {
+            core_1.Utils.keys(row).forEach(k => {
+                keys.add(k);
+                if (core_1.Utils.isRawSql(row[k])) {
+                    returning.add(k);
+                }
+            });
+        });
         const pkCond = core_1.Utils.flatten(meta.primaryKeys.map(pk => meta.properties[pk].fieldNames)).map(pk => `${this.platform.quoteIdentifier(pk)} = ?`).join(' and ');
         const params = [];
         let sql = `update ${this.getTableName(meta, options)} set `;
@@ -423,6 +444,11 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
             return '?';
         });
         sql += ` in (${conds.join(', ')})`;
+        if (this.platform.usesReturningStatement() && returning.size > 0) {
+            const returningFields = core_1.Utils.flatten([...returning].map(prop => meta.properties[prop].fieldNames));
+            /* istanbul ignore next */
+            sql += returningFields.length > 0 ? ` returning ${returningFields.map(field => this.platform.quoteIdentifier(field)).join(', ')}` : '';
+        }
         const res = await this.rethrow(this.execute(sql, params, 'run', options.ctx));
         for (let i = 0; i < collections.length; i++) {
             await this.processManyToMany(meta, where[i], collections[i], false, options);
@@ -612,7 +638,7 @@ class AbstractSqlDriver extends core_1.DatabaseDriver {
         const aliased = qb.ref(tableAlias ? `${tableAlias}__${prop.fieldNames[0]}` : prop.fieldNames[0]).toString();
         if (prop.customType?.convertToJSValueSQL && tableAlias) {
             const prefixed = qb.ref(prop.fieldNames[0]).withSchema(tableAlias).toString();
-            return [qb.raw(prop.customType.convertToJSValueSQL(prefixed, this.platform) + ' as ' + aliased).toString()];
+            return [prop.customType.convertToJSValueSQL(prefixed, this.platform) + ' as ' + aliased];
         }
         if (prop.formula) {
             const alias = qb.ref(tableAlias ?? qb.alias).toString();

package/AbstractSqlPlatform.js

@@ -27,6 +27,9 @@ class AbstractSqlPlatform extends core_1.Platform {
         return new schema_1.SqlSchemaGenerator(em ?? driver);
     }
     quoteValue(value) {
+        if (core_1.Utils.isRawSql(value)) {
+            return this.formatQuery(value.sql, value.params ?? []);
+        }
         if (this.isRaw(value)) {
             return value;
         }

package/README.md

@@ -2,9 +2,7 @@
   <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 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 and SQLite databases. 
 
 > Heavily inspired by [Doctrine](https://www.doctrine-project.org/) and [Nextras Orm](https://nextras.org/orm/).
 
@@ -31,13 +29,9 @@ So what benefits does it bring to us?
 
 ### Implicit Transactions
 
-First and most important implication of having Unit of Work is that it allows handling
-transactions automatically. 
+First and most important implication of having Unit of Work is that it allows handling transactions automatically. 
 
-When you call `em.flush()`, all computed changes are queried inside a database
-transaction (if supported by given driver). This means that you can control the boundaries 
-of transactions simply by calling `em.persistLater()` and once all your changes 
-are ready, calling `flush()` will run them inside a transaction. 
+When you call `em.flush()`, all computed changes are queried inside a database transaction (if supported by given driver). This means that you can control the boundaries of transactions simply by calling `em.persistLater()` and once all your changes are ready, calling `flush()` will run them inside a transaction. 
 
 > You can also control the transaction boundaries manually via `em.transactional(cb)`.
 
@@ -55,9 +49,7 @@ await em.flush();
 
 ### ChangeSet based persistence
 
-MikroORM allows you to implement your domain/business logic directly in the entities. 
-To maintain always valid entities, you can use constructors to mark required properties. 
-Let's define the `User` entity used in previous example:
+MikroORM allows you to implement your domain/business logic directly in the entities. To maintain always valid entities, you can use constructors to mark required properties. Let's define the `User` entity used in previous example:
 
 ```typescript
 @Entity()
@@ -69,10 +61,10 @@ export class User {
   @Property()
   name!: string;
 
-  @OneToOne()
+  @OneToOne(() => Address)
   address?: Address;
 
-  @ManyToMany()
+  @ManyToMany(() => Car)
   cars = new Collection<Car>(this);
 
   constructor(name: string) {
@@ -95,7 +87,9 @@ then call `em.flush()`. This will trigger computing of change sets. Only entitie
 no transaction will be started.
 
 ```typescript
-const user = await em.findOneOrFail(User, 1, ['cars', 'address']);
+const user = await em.findOneOrFail(User, 1, {
+  populate: ['cars', 'address.city'],
+});
 user.title = 'Mr.';
 user.address.street = '10 Downing Street'; // address is 1:1 relation of Address entity
 user.cars.getItems().forEach(car => car.forSale = true); // cars is 1:m collection of Car entities
@@ -110,53 +104,49 @@ await em.flush();
 
 ```sql
 begin;
-update user set title = 'Mr.' where id = 1;
-update user_address set street = '10 Downing Street' where id = 123;
-update car set for_sale = true where id = 1;
-update car set for_sale = true where id = 2;
-update car set for_sale = true where id = 3;
-insert into car (brand, owner) values ('VW', 1);
+update "user" set "title" = 'Mr.' where "id" = 1;
+update "user_address" set "street" = '10 Downing Street' where "id" = 123;
+update "car"
+  set "for_sale" = case
+    when ("id" = 1) then true
+    when ("id" = 2) then true
+    when ("id" = 3) then true
+    else "for_sale" end
+  where "id" in (1, 2, 3)
+insert into "car" ("brand", "owner") values ('VW', 1);
 commit;
 ```
 
-### Only One Instance of Entity
+### Identity Map
 
-Thanks to Identity Map, you will always have only one instance of given entity in one context. 
-This allows for some optimizations (skipping loading of already loaded entities), as well as 
-comparison by identity (`ent1 === ent2`). 
+Thanks to Identity Map, you will always have only one instance of given entity in one context. This allows for some optimizations (skipping loading of already loaded entities), as well as comparison by identity (`ent1 === ent2`). 
 
 ## 📖 Documentation
 
-MikroORM v4 documentation, included in this repo in the root directory, is built with 
-[Jekyll](https://jekyllrb.com/) and publicly hosted on GitHub Pages at https://mikro-orm.io.
-
-There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit messages 
-(via `semantic-release`). 
+MikroORM documentation, included in this repo in the root directory, is built with [Docusaurus](https://docusaurus.io) and publicly hosted on GitHub Pages at https://mikro-orm.io.
 
-> You can browse MikroORM v3 docs at [https://mikro-orm.io/docs/3.6/installation](https://mikro-orm.io/docs/3.6/installation).
-
-> To upgrade to v4, please see the [upgrading guide](https://mikro-orm.io/docs/upgrading-v3-to-v4).
+There is also auto-generated [CHANGELOG.md](CHANGELOG.md) file based on commit messages (via `semantic-release`). 
 
 ## ✨ Core Features
 
-- [Clean and Simple Entity Definition](https://mikro-orm.io/docs/defining-entities/)
-- [Identity Map](https://mikro-orm.io/docs/identity-map/)
-- [Entity References](https://mikro-orm.io/docs/entity-references/)
-- [Using Entity Constructors](https://mikro-orm.io/docs/using-entity-constructors/)
-- [Modelling Relationships](https://mikro-orm.io/docs/relationships/)
-- [Collections](https://mikro-orm.io/docs/collections/)
-- [Unit of Work](https://mikro-orm.io/docs/unit-of-work/)
-- [Transactions](https://mikro-orm.io/docs/transactions/)
-- [Cascading persist and remove](https://mikro-orm.io/docs/cascading/)
-- [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys/)
-- [Filters](https://mikro-orm.io/docs/filters/)
-- [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder/)
-- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate/)
-- [Property Validation](https://mikro-orm.io/docs/property-validation/)
-- [Lifecycle Hooks](https://mikro-orm.io/docs/lifecycle-hooks/)
-- [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js/)
-- [Schema Generator](https://mikro-orm.io/docs/schema-generator/)
-- [Entity Generator](https://mikro-orm.io/docs/entity-generator/)
+- [Clean and Simple Entity Definition](https://mikro-orm.io/docs/defining-entities)
+- [Identity Map](https://mikro-orm.io/docs/identity-map)
+- [Entity References](https://mikro-orm.io/docs/entity-references)
+- [Using Entity Constructors](https://mikro-orm.io/docs/entity-constructors)
+- [Modelling Relationships](https://mikro-orm.io/docs/relationships)
+- [Collections](https://mikro-orm.io/docs/collections)
+- [Unit of Work](https://mikro-orm.io/docs/unit-of-work)
+- [Transactions](https://mikro-orm.io/docs/transactions)
+- [Cascading persist and remove](https://mikro-orm.io/docs/cascading)
+- [Composite and Foreign Keys as Primary Key](https://mikro-orm.io/docs/composite-keys)
+- [Filters](https://mikro-orm.io/docs/filters)
+- [Using `QueryBuilder`](https://mikro-orm.io/docs/query-builder)
+- [Preloading Deeply Nested Structures via populate](https://mikro-orm.io/docs/nested-populate)
+- [Property Validation](https://mikro-orm.io/docs/property-validation)
+- [Lifecycle Hooks](https://mikro-orm.io/docs/lifecycle-hooks)
+- [Vanilla JS Support](https://mikro-orm.io/docs/usage-with-js)
+- [Schema Generator](https://mikro-orm.io/docs/schema-generator)
+- [Entity Generator](https://mikro-orm.io/docs/entity-generator)
 
 ## 📦 Example Integrations
 
@@ -173,27 +163,14 @@ You can find example integrations for some popular frameworks in the [`mikro-orm
 - [NextJS + MySQL](https://github.com/jonahallibone/mikro-orm-nextjs)
 
 ### JavaScript Examples 
-- [Express + MongoDB](https://github.com/mikro-orm/express-js-example-app)
 
-## Articles
-
-- Introducing MikroORM, TypeScript data-mapper ORM with Identity Map
-  - on [medium.com](https://medium.com/dailyjs/introducing-mikro-orm-typescript-data-mapper-orm-with-identity-map-9ba58d049e02)
-  - on [dev.to](https://dev.to/b4nan/introducing-mikroorm-typescript-data-mapper-orm-with-identity-map-pc8)
-- Handling transactions and concurrency in MikroORM
-  - on [medium.com](https://medium.com/dailyjs/handling-transactions-and-concurrency-in-mikro-orm-ba80d0a65805)
-  - on [dev.to](https://dev.to/b4nan/handling-transactions-and-concurrency-in-mikroorm-2cfj)
-- MikroORM 3: Knex.js, CLI, Schema Updates, Entity Generator and more…
-  - on [medium.com](https://medium.com/dailyjs/mikro-orm-3-knex-js-cli-schema-updates-entity-generator-and-more-e51ecbbc508c)
-  - on [dev.to](https://dev.to/b4nan/mikroorm-3-knex-js-cli-schema-updates-entity-generator-and-more-3g56)
+- [Express + MongoDB](https://github.com/mikro-orm/express-js-example-app)
 
 ## 🚀 Quick Start
 
 First install the module via `yarn` or `npm` and do not forget to install the database driver as well:
 
-> Since v4, you should install the driver package, but not the db connector itself,
-> e.g. install `@mikro-orm/sqlite`, but not `sqlite3` as that is already included
-> in the driver package.
+> Since v4, you should install the driver package, but not the db connector itself, e.g. install `@mikro-orm/sqlite`, but not `sqlite3` as that is already included in the driver package.
 
 ```sh
 yarn add @mikro-orm/core @mikro-orm/mongodb     # for mongo
@@ -213,8 +190,7 @@ npm i -s @mikro-orm/core @mikro-orm/postgresql  # for postgresql
 npm i -s @mikro-orm/core @mikro-orm/sqlite      # for sqlite
 ```
 
-Next you will need to enable support for [decorators](https://www.typescriptlang.org/docs/handbook/decorators.html)
-as well as `esModuleInterop` in `tsconfig.json` via:
+Next, if you want to use decorators for your entity definition, you will need to enable support for [decorators](https://www.typescriptlang.org/docs/handbook/decorators.html) as well as `esModuleInterop` in `tsconfig.json` via:
 
 ```json
 "experimentalDecorators": true,
@@ -222,11 +198,11 @@ as well as `esModuleInterop` in `tsconfig.json` via:
 "esModuleInterop": true,
 ```
 
+Alternatively, you can use [`EntitySchema`](https://mikro-orm.io/docs/entity-schema).
+
 Then call `MikroORM.init` as part of bootstrapping your app:
 
-> To access driver specific methods like `em.createQueryBuilder()` we need to specify
-> the driver type when calling `MikroORM.init()`. Alternatively we can cast the 
-> `orm.em` to `EntityManager` exported from the driver package:
+> To access driver specific methods like `em.createQueryBuilder()` we need to specify the driver type when calling `MikroORM.init()`. Alternatively we can cast the `orm.em` to `EntityManager` exported from the driver package:
 > 
 > ```ts
 > import { EntityManager } from '@mikro-orm/postgresql';
@@ -245,14 +221,11 @@ const orm = await MikroORM.init<PostgreSqlDriver>({
 console.log(orm.em); // access EntityManager via `em` property
 ```
 
-There are more ways to configure your entities, take a look at 
-[installation page](https://mikro-orm.io/docs/installation/).
+There are more ways to configure your entities, take a look at [installation page](https://mikro-orm.io/docs/installation/).
 
 > Read more about all the possible configuration options in [Advanced Configuration](https://mikro-orm.io/docs/configuration) section.
 
-Then you will need to fork entity manager for each request so their 
-[identity maps](https://mikro-orm.io/docs/identity-map/) will not collide. 
-To do so, use the `RequestContext` helper:
+Then you will need to fork entity manager for each request so their [identity maps](https://mikro-orm.io/docs/identity-map/) will not collide. To do so, use the `RequestContext` helper:
 
 ```typescript
 const app = express();
@@ -262,15 +235,11 @@ app.use((req, res, next) => {
 });
 ```
 
-> You should register this middleware as the last one just before request handlers and before
-> any of your custom middleware that is using the ORM. There might be issues when you register 
-> it before request processing middleware like `queryParser` or `bodyParser`, so definitely 
-> register the context after them. 
+> You should register this middleware as the last one just before request handlers and before any of your custom middleware that is using the ORM. There might be issues when you register it before request processing middleware like `queryParser` or `bodyParser`, so definitely register the context after them. 
 
 More info about `RequestContext` is described [here](https://mikro-orm.io/docs/identity-map/#request-context).
 
-Now you can start defining your entities (in one of the `entities` folders). This is how
-simple entity can look like in mongo driver:
+Now you can start defining your entities (in one of the `entities` folders). This is how simple entity can look like in mongo driver:
 
 **`./entities/MongoBook.ts`**
 
@@ -287,10 +256,10 @@ export class MongoBook {
   @Property()
   title: string;
 
-  @ManyToOne()
+  @ManyToOne(() => Author)
   author: Author;
 
-  @ManyToMany()
+  @ManyToMany(() => BookTag)
   tags = new Collection<BookTag>(this);
 
   constructor(title: string, author: Author) {
@@ -331,15 +300,11 @@ export class UuidBook {
 }
 ```
 
-More information can be found in
-[defining entities section](https://mikro-orm.io/docs/defining-entities/) in docs.
+More information can be found in [defining entities section](https://mikro-orm.io/docs/defining-entities/) in docs.
 
-When you have your entities defined, you can start using ORM either via `EntityManager`
-or via `EntityRepository`s.
+When you have your entities defined, you can start using ORM either via `EntityManager` or via `EntityRepository`s.
 
-To save entity state to database, you need to persist it. Persist takes care or deciding 
-whether to use `insert` or `update` and computes appropriate change-set. Entity references
-that are not persisted yet (does not have identifier) will be cascade persisted automatically. 
+To save entity state to database, you need to persist it. Persist takes care or deciding whether to use `insert` or `update` and computes appropriate change-set. Entity references that are not persisted yet (does not have identifier) will be cascade persisted automatically. 
 
 ```typescript
 // use constructors in your entities for required parameters
@@ -356,13 +321,13 @@ const book3 = new Book('My Life on The Wall, part 3', author);
 book3.publisher = publisher;
 
 // just persist books, author and publisher will be automatically cascade persisted
-await orm.em.persistAndFlush([book1, book2, book3]);
+await em.persistAndFlush([book1, book2, book3]);
 ```
 
 To fetch entities from database you can use `find()` and `findOne()` of `EntityManager`: 
 
 ```typescript
-const authors = orm.em.find(Author, {});
+const authors = em.find(Author, {}, { populate: ['books'] });
 
 for (const author of authors) {
   console.log(author); // instance of Author entity
@@ -375,16 +340,11 @@ for (const author of authors) {
 }
 ```
 
-More convenient way of fetching entities from database is by using `EntityRepository`, that
-carries the entity name so you do not have to pass it to every `find` and `findOne` calls:
+More convenient way of fetching entities from database is by using `EntityRepository`, that carries the entity name, so you do not have to pass it to every `find` and `findOne` calls:
 
 ```typescript
-const booksRepository = orm.em.getRepository(Book);
-
-// with sorting, limit and offset parameters, populating author references
-const books = await booksRepository.find({ author: '...' }, ['author'], { title: QueryOrder.DESC }, 2, 1);
+const booksRepository = em.getRepository(Book);
 
-// or with options object
 const books = await booksRepository.find({ author: '...' }, { 
   populate: ['author'],
   limit: 1,
@@ -392,17 +352,14 @@ const books = await booksRepository.find({ author: '...' }, {
   orderBy: { title: QueryOrder.DESC },
 });
 
-console.log(books); // Book[]
+console.log(books); // Loaded<Book, 'author'>[]
 ```
 
-Take a look at docs about [working with `EntityManager`](https://mikro-orm.io/docs/entity-manager/)
-or [using `EntityRepository` instead](https://mikro-orm.io/docs/repositories/).
+Take a look at docs about [working with `EntityManager`](https://mikro-orm.io/docs/entity-manager/) or [using `EntityRepository` instead](https://mikro-orm.io/docs/repositories/).
 
 ## 🤝 Contributing
 
-Contributions, issues and feature requests are welcome. Please read 
-[CONTRIBUTING.md](CONTRIBUTING.md) 
-for details on the process for submitting pull requests to us.
+Contributions, issues and feature requests are welcome. Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on the process for submitting pull requests to us.
 
 ## Authors
 

package/SqlEntityManager.d.ts

@@ -16,10 +16,6 @@ export declare class SqlEntityManager<D extends AbstractSqlDriver = AbstractSqlD
      * Shortcut for `createQueryBuilder()`
      */
     qb<T extends object>(entityName: EntityName<T>, alias?: string, type?: ConnectionType): QueryBuilder<T>;
-    /**
-     * Creates raw SQL query that won't be escaped when used as a parameter.
-     */
-    raw<R = Knex.Raw>(sql: string, bindings?: Knex.RawBinding[] | Knex.ValueDict): R;
     /**
      * Returns configured knex instance.
      */

package/SqlEntityManager.js

@@ -20,14 +20,6 @@ class SqlEntityManager extends core_1.EntityManager {
     qb(entityName, alias, type) {
         return this.createQueryBuilder(entityName, alias, type);
     }
-    /**
-     * Creates raw SQL query that won't be escaped when used as a parameter.
-     */
-    raw(sql, bindings = []) {
-        const raw = this.getKnex().raw(sql, bindings);
-        raw.__raw = true; // tag it as there is now way to check via `instanceof`
-        return raw;
-    }
     /**
      * Returns configured knex instance.
      */

package/index.mjs

@@ -138,6 +138,7 @@ export const QueryOperator = mod.QueryOperator;
 export const QueryOrder = mod.QueryOrder;
 export const QueryOrderNumeric = mod.QueryOrderNumeric;
 export const QueryType = mod.QueryType;
+export const RawQueryFragment = mod.RawQueryFragment;
 export const ReadOnlyException = mod.ReadOnlyException;
 export const Reference = mod.Reference;
 export const ReferenceKind = mod.ReferenceKind;
@@ -187,6 +188,7 @@ export const equals = mod.equals;
 export const expr = mod.expr;
 export const helper = mod.helper;
 export const knex = mod.knex;
+export const raw = mod.raw;
 export const ref = mod.ref;
 export const rel = mod.rel;
 export const serialize = mod.serialize;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "6.0.0-dev.45",
+  "version": "6.0.0-dev.47",
   "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",
@@ -63,9 +63,9 @@
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^5.6.12"
+    "@mikro-orm/core": "^5.6.15"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "~6.0.0-dev.45"
+    "@mikro-orm/core": "~6.0.0-dev.47"
   }
 }

package/query/CriteriaNodeFactory.js

@@ -12,7 +12,7 @@ const CriteriaNode_1 = require("./CriteriaNode");
 class CriteriaNodeFactory {
     static createNode(metadata, entityName, payload, parent, key) {
         const customExpression = CriteriaNode_1.CriteriaNode.isCustomExpression(key || '');
-        const scalar = core_1.Utils.isPrimaryKey(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
+        const scalar = core_1.Utils.isPrimaryKey(payload) || core_1.Utils.isRawSql(payload) || payload instanceof RegExp || payload instanceof Date || customExpression;
         if (Array.isArray(payload) && !scalar) {
             return this.createArrayNode(metadata, entityName, payload, parent, key);
         }

package/query/QueryBuilder.d.ts

@@ -5,8 +5,8 @@ import type { AnyEntity, ConnectionType, Dictionary, EntityData, EntityName, Ent
 import { LockMode, PopulateHint, QueryFlag } from '@mikro-orm/core';
 import { QueryType } from './enums';
 import type { AbstractSqlDriver } from '../AbstractSqlDriver';
-import { QueryBuilderHelper } from './QueryBuilderHelper';
 import type { Alias } from './QueryBuilderHelper';
+import { QueryBuilderHelper } from './QueryBuilderHelper';
 import type { SqlEntityManager } from '../SqlEntityManager';
 import type { Field } from '../typings';
 /**
@@ -77,7 +77,7 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     /**
      * @internal
      */
-    constructor(entityName: EntityName<T> | QueryBuilder<T>, metadata: MetadataStorage, driver: AbstractSqlDriver, context?: Knex.Transaction<any, any[]> | undefined, alias?: string, connectionType?: ConnectionType | undefined, em?: SqlEntityManager<AbstractSqlDriver<import("../AbstractSqlConnection").AbstractSqlConnection, import("../AbstractSqlPlatform").AbstractSqlPlatform>> | undefined);
+    constructor(entityName: EntityName<T> | QueryBuilder<T>, metadata: MetadataStorage, driver: AbstractSqlDriver, context?: Knex.Transaction<any, any[]> | undefined, alias?: string, connectionType?: ConnectionType | undefined, em?: SqlEntityManager<AbstractSqlDriver<import("..").AbstractSqlConnection, import("..").AbstractSqlPlatform>> | undefined);
     select(fields: Field<T> | Field<T>[], distinct?: boolean): SelectQueryBuilder<T>;
     addSelect(fields: Field<T> | Field<T>[]): SelectQueryBuilder<T>;
     distinct(): SelectQueryBuilder<T>;
@@ -116,7 +116,6 @@ export declare class QueryBuilder<T extends object = AnyEntity> {
     ref(field: string): Knex.Ref<string, {
         [x: string]: string;
     }>;
-    raw<R = Knex.Raw>(sql: string, bindings?: Knex.RawBinding[] | Knex.ValueDict): R;
     limit(limit?: number, offset?: number): this;
     offset(offset?: number): this;
     withSchema(schema?: string): this;

package/query/QueryBuilder.js

@@ -116,7 +116,7 @@ class QueryBuilder {
             this._fields = this.mainAlias.metadata.primaryKeys;
         }
         else {
-            this._fields = [this.raw('*')];
+            this._fields = [(0, core_1.raw)('*')];
         }
         if (distinct) {
             this.flags.add(core_1.QueryFlag.DISTINCT);
@@ -278,11 +278,6 @@ class QueryBuilder {
     ref(field) {
         return this.knex.ref(field);
     }
-    raw(sql, bindings = []) {
-        const raw = this.knex.raw(sql, bindings);
-        raw.__raw = true; // tag it as there is now way to check via `instanceof`
-        return raw;
-    }
     limit(limit, offset = 0) {
         this.ensureNotFinalized();
         this._limit = limit;
@@ -374,7 +369,7 @@ class QueryBuilder {
         if (this.lockMode) {
             this.helper.getLockSQL(qb, this.lockMode, this.lockTables);
         }
-        this.helper.finalize(this.type ?? enums_1.QueryType.SELECT, qb, this.mainAlias.metadata);
+        this.helper.finalize(this.type ?? enums_1.QueryType.SELECT, qb, this.mainAlias.metadata, this._data);
         return qb;
     }
     /**
@@ -523,7 +518,11 @@ class QueryBuilder {
      * Provides promise-like interface so we can await the QB instance.
      */
     then(onfulfilled, onrejected) {
-        switch (this.type ?? enums_1.QueryType.SELECT) {
+        let type = this.type ?? enums_1.QueryType.SELECT;
+        if (this.flags.has(core_1.QueryFlag.UPDATE_SUB_QUERY) || this.flags.has(core_1.QueryFlag.DELETE_SUB_QUERY)) {
+            type = enums_1.QueryType.UPDATE;
+        }
+        switch (type) {
             case enums_1.QueryType.INSERT:
             case enums_1.QueryType.UPDATE:
             case enums_1.QueryType.DELETE:
@@ -546,7 +545,10 @@ class QueryBuilder {
             /* istanbul ignore next */
             alias = meta?.properties[f]?.fieldNames[0] ?? alias;
         }
-        return qb.as(alias);
+        const ret = qb.as(alias);
+        // tag the instance, so it is possible to detect it easily
+        Object.defineProperty(ret, '__as', { enumerable: false, value: alias });
+        return ret;
     }
     clone() {
         const qb = new QueryBuilder(this.mainAlias.entityName, this.metadata, this.driver, this.context, this.mainAlias.aliasName, this.connectionType, this.em);
@@ -863,6 +865,7 @@ class QueryBuilder {
         if (this._offset) {
             subQuery.offset(this._offset);
         }
+        const addToSelect = [];
         if (this._orderBy.length > 0) {
             const orderBy = [];
             for (const orderMap of this._orderBy) {
@@ -870,15 +873,31 @@ class QueryBuilder {
                     const [a, f] = this.helper.splitField(field);
                     const prop = this.helper.getProperty(f, a);
                     const type = this.platform.castColumn(prop);
-                    orderBy.push({
-                        [`min(${this.ref(this.helper.mapper(field, this.type, undefined, null))}${type})`]: direction,
-                    });
+                    const fieldName = this.helper.mapper(field, this.type, undefined, null);
+                    if (!prop?.persist && !prop?.formula) {
+                        addToSelect.push(fieldName);
+                    }
+                    orderBy.push({ [`min(${this.ref(fieldName)}${type})`]: direction });
                 }
             }
             subQuery.orderBy(orderBy);
         }
         subQuery.finalized = true;
         const knexQuery = subQuery.as(this.mainAlias.aliasName).clearSelect().select(pks);
+        if (addToSelect.length > 0) {
+            addToSelect.forEach(prop => {
+                const field = this._fields.find(field => {
+                    if (typeof field === 'object' && field && '__as' in field) {
+                        return field.__as === prop;
+                    }
+                    // not perfect, but should work most of the time, ideally we should check only the alias (`... as alias`)
+                    return field.toString().includes(prop);
+                });
+                if (field) {
+                    knexQuery.select(field);
+                }
+            });
+        }
         // multiple sub-queries are needed to get around mysql limitations with order by + limit + where in + group by (o.O)
         // https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu
         const subSubQuery = this.getKnex().select(pks).from(knexQuery);

package/query/QueryBuilderHelper.d.ts

@@ -48,7 +48,7 @@ export declare class QueryBuilderHelper {
     private getOperatorReplacement;
     getQueryOrder(type: QueryType, orderBy: FlatQueryOrderMap | FlatQueryOrderMap[], populate: Dictionary<string>): string;
     getQueryOrderFromObject(type: QueryType, orderBy: FlatQueryOrderMap, populate: Dictionary<string>): string;
-    finalize(type: QueryType, qb: Knex.QueryBuilder, meta?: EntityMetadata): void;
+    finalize(type: QueryType, qb: Knex.QueryBuilder, meta?: EntityMetadata, data?: Dictionary): void;
     splitField<T>(field: EntityKey<T>, greedyAlias?: boolean): [string, EntityKey<T>];
     getLockSQL(qb: Knex.QueryBuilder, lockMode: LockMode, lockTables?: string[]): void;
     updateVersionProperty(qb: Knex.QueryBuilder, data: Dictionary): void;

package/query/QueryBuilderHelper.js

@@ -19,6 +19,9 @@ class QueryBuilderHelper {
         this.metadata = this.driver.getMetadata();
     }
     mapper(field, type = enums_1.QueryType.SELECT, value, alias) {
+        if (core_1.Utils.isRawSql(field)) {
+            return this.platform.formatQuery(field.sql, field.params ?? []);
+        }
         if (typeof field !== 'string') {
             return field;
         }
@@ -460,11 +463,23 @@ class QueryBuilderHelper {
         });
         return ret.join(', ');
     }
-    finalize(type, qb, meta) {
-        const useReturningStatement = type === enums_1.QueryType.INSERT && this.platform.usesReturningStatement() && meta && !meta.compositePK;
-        if (useReturningStatement) {
-            const returningProps = meta.hydrateProps.filter(prop => prop.persist !== false && (prop.primary || prop.defaultRaw));
-            qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+    finalize(type, qb, meta, data) {
+        if (!meta || !data || !this.platform.usesReturningStatement()) {
+            return;
+        }
+        if (type === enums_1.QueryType.INSERT) {
+            const returningProps = meta.hydrateProps
+                .filter(prop => prop.persist !== false && ((prop.primary && prop.autoincrement) || prop.defaultRaw))
+                .filter(prop => !(prop.name in data) || core_1.Utils.isRawSql(data[prop.name]));
+            if (returningProps.length > 0) {
+                qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+            }
+        }
+        if (type === enums_1.QueryType.UPDATE) {
+            const returningProps = meta.hydrateProps.filter(prop => core_1.Utils.isRawSql(data[prop.name]));
+            if (returningProps.length > 0) {
+                qb.returning(core_1.Utils.flatten(returningProps.map(prop => prop.fieldNames)));
+            }
         }
     }
     splitField(field, greedyAlias = false) {

package/query/ScalarCriteriaNode.d.ts

@@ -5,5 +5,6 @@ import type { IQueryBuilder } from '../typings';
  */
 export declare class ScalarCriteriaNode<T extends object> extends CriteriaNode<T> {
     process(qb: IQueryBuilder<T>, alias?: string): any;
+    willAutoJoin<T>(qb: IQueryBuilder<T>, alias?: string): boolean;
     shouldJoin(): boolean;
 }

package/query/ScalarCriteriaNode.js

@@ -22,6 +22,9 @@ class ScalarCriteriaNode extends CriteriaNode_1.CriteriaNode {
         }
         return this.payload;
     }
+    willAutoJoin(qb, alias) {
+        return this.shouldJoin();
+    }
     shouldJoin() {
         if (!this.parent || !this.prop) {
             return false;

package/schema/DatabaseTable.js

@@ -287,7 +287,7 @@ class DatabaseTable {
         return '' + val;
     }
     addIndex(meta, index, type) {
-        const properties = core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames));
+        const properties = core_1.Utils.unique(core_1.Utils.flatten(core_1.Utils.asArray(index.properties).map(prop => meta.properties[prop].fieldNames)));
         if (properties.length === 0 && !index.expression) {
             return;
         }

package/schema/SchemaHelper.d.ts

@@ -29,8 +29,8 @@ export declare abstract class SchemaHelper {
     configureColumn(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     configureColumnDefault(column: Column, col: Knex.ColumnBuilder, knex: Knex, changedProperties?: Set<string>): Knex.ColumnBuilder;
     getPreAlterTable(tableDiff: TableDifference, safe: boolean): string;
-    getAlterColumnAutoincrement(tableName: string, column: Column): string;
-    getChangeColumnCommentSQL(tableName: string, to: Column): string;
+    getAlterColumnAutoincrement(tableName: string, column: Column, schemaName?: string): string;
+    getChangeColumnCommentSQL(tableName: string, to: Column, schemaName?: string): string;
     getNamespaces(connection: AbstractSqlConnection): Promise<string[]>;
     getColumns(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<Column[]>;
     getIndexes(connection: AbstractSqlConnection, tableName: string, schemaName?: string): Promise<IndexDef[]>;

package/schema/SchemaHelper.js

@@ -129,10 +129,10 @@ class SchemaHelper {
     getPreAlterTable(tableDiff, safe) {
         return '';
     }
-    getAlterColumnAutoincrement(tableName, column) {
+    getAlterColumnAutoincrement(tableName, column, schemaName) {
         return '';
     }
-    getChangeColumnCommentSQL(tableName, to) {
+    getChangeColumnCommentSQL(tableName, to, schemaName) {
         return '';
     }
     async getNamespaces(connection) {

package/schema/SqlSchemaGenerator.js

@@ -294,13 +294,13 @@ class SqlSchemaGenerator extends core_1.AbstractSchemaGenerator {
                 this.helper.configureColumn(column, col, this.knex, changedProperties);
             }
             for (const { column } of Object.values(diff.changedColumns).filter(diff => diff.changedProperties.has('autoincrement'))) {
-                this.helper.pushTableQuery(table, this.helper.getAlterColumnAutoincrement(tableName, column));
+                this.helper.pushTableQuery(table, this.helper.getAlterColumnAutoincrement(tableName, column, schemaName));
             }
             for (const { column, changedProperties } of Object.values(diff.changedColumns).filter(diff => diff.changedProperties.has('comment'))) {
                 if (['type', 'nullable', 'autoincrement', 'unsigned', 'default', 'enumItems'].some(t => changedProperties.has(t))) {
                     continue; // will be handled via knex
                 }
-                this.helper.pushTableQuery(table, this.helper.getChangeColumnCommentSQL(tableName, column));
+                this.helper.pushTableQuery(table, this.helper.getChangeColumnCommentSQL(tableName, column, schemaName));
             }
             for (const [oldColumnName, column] of Object.entries(diff.renamedColumns)) {
                 this.helper.pushTableQuery(table, this.helper.getRenameColumnSQL(tableName, oldColumnName, column, schemaName));