@mikro-orm/knex 7.0.0-dev.7 → 7.0.0-dev.9

package/AbstractSqlConnection.js

@@ -81,6 +81,7 @@ export class AbstractSqlConnection extends Connection {
             this.logQuery(this.platform.getSavepointSQL(savepointName));
             return trx;
         }
+        await this.ensureConnection();
         await options.eventBroadcaster?.dispatchEvent(EventType.beforeTransactionStart);
         let trxBuilder = this.client.startTransaction();
         if (options.isolationLevel) {

package/AbstractSqlDriver.js

@@ -731,8 +731,14 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const pivotMeta = this.metadata.find(coll.property.pivotEntity);
             let schema = pivotMeta.schema;
             if (schema === '*') {
-                const ownerSchema = wrapped.getSchema() === '*' ? this.config.get('schema') : wrapped.getSchema();
-                schema = coll.property.owner ? ownerSchema : this.config.get('schema');
+                if (coll.property.owner) {
+                    schema = wrapped.getSchema() === '*' ? options?.schema ?? this.config.get('schema') : wrapped.getSchema();
+                }
+                else {
+                    const targetMeta = coll.property.targetMeta;
+                    const targetSchema = (coll[0] ?? snap?.[0]) && helper(coll[0] ?? snap?.[0]).getSchema();
+                    schema = targetMeta.schema === '*' ? options?.schema ?? targetSchema ?? this.config.get('schema') : targetMeta.schema;
+                }
             }
             else if (schema == null) {
                 schema = this.config.get('schema');
@@ -783,13 +789,15 @@ export class AbstractSqlDriver extends DatabaseDriver {
             const targetSchema = this.getSchemaName(prop.targetMeta, options) ?? this.platform.getDefaultSchemaName();
             qb.innerJoin(pivotProp1.name, targetAlias, {}, targetSchema);
             const targetFields = this.buildFields(prop.targetMeta, (options.populate ?? []), [], qb, targetAlias, options);
+            const additionalFields = [];
             for (const field of targetFields) {
                 const f = field.toString();
-                fields.unshift(f.includes('.') ? field : `${targetAlias}.${f}`);
+                additionalFields.push(f.includes('.') ? field : `${targetAlias}.${f}`);
                 if (RawQueryFragment.isKnownFragment(field)) {
                     qb.rawFragments.add(f);
                 }
             }
+            fields.unshift(...additionalFields);
             // we need to handle 1:1 owner auto-joins explicitly, as the QB type is the pivot table, not the target
             populate.forEach(hint => {
                 const alias = qb.getNextAlias(prop.targetMeta.tableName);

package/dialects/mssql/MsSqlNativeQueryBuilder.js

@@ -82,7 +82,9 @@ export class MsSqlNativeQueryBuilder extends NativeQueryBuilder {
             }
             this.parts.push('then update set');
             if (!clause.merge || Array.isArray(clause.merge)) {
-                const parts = keys.map((column) => `${this.quote(column)} = tsource.${this.quote(column)}`);
+                const parts = keys
+                    .filter(field => !Array.isArray(clause.fields) || !clause.fields.includes(field))
+                    .map((column) => `${this.quote(column)} = tsource.${this.quote(column)}`);
                 this.parts.push(parts.join(', '));
             }
             else if (typeof clause.merge === 'object') {

package/dialects/sqlite/BaseSqliteConnection.d.ts

@@ -1,5 +1,5 @@
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export declare abstract class BaseSqliteConnection extends AbstractSqlConnection {
-    connect(): Promise<void>;
+    connect(simple?: boolean): Promise<void>;
     getClientUrl(): string;
 }

package/dialects/sqlite/BaseSqliteConnection.js

@@ -3,9 +3,15 @@ import { CompiledQuery } from 'kysely';
 import { Utils } from '@mikro-orm/core';
 import { AbstractSqlConnection } from '../../AbstractSqlConnection.js';
 export class BaseSqliteConnection extends AbstractSqlConnection {
-    async connect() {
+    async connect(simple = false) {
         await super.connect();
-        Utils.ensureDir(dirname(this.config.get('dbName')));
+        if (simple) {
+            return;
+        }
+        const dbName = this.config.get('dbName');
+        if (dbName && dbName !== ':memory:') {
+            Utils.ensureDir(dirname(this.config.get('dbName')));
+        }
         await this.client.executeQuery(CompiledQuery.raw('pragma foreign_keys = on'));
     }
     getClientUrl() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/knex",
-  "version": "7.0.0-dev.7",
+  "version": "7.0.0-dev.9",
   "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.",
   "type": "module",
   "exports": {
@@ -50,13 +50,13 @@
     "access": "public"
   },
   "dependencies": {
-    "kysely": "https://pkg.pr.new/kysely-org/kysely/kysely@2b7007e",
+    "kysely": "0.28.0",
     "sqlstring": "2.3.3"
   },
   "devDependencies": {
-    "@mikro-orm/core": "^6.4.9"
+    "@mikro-orm/core": "^6.4.13"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.0.0-dev.7"
+    "@mikro-orm/core": "7.0.0-dev.9"
   }
 }

package/query/ObjectCriteriaNode.js

@@ -55,7 +55,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 }
                 return { $and };
             }
-            alias = this.autoJoin(qb, ownerAlias);
+            alias = this.autoJoin(qb, ownerAlias, options);
         }
         return keys.reduce((o, field) => {
             const childNode = this.payload[field];
@@ -193,7 +193,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
         });
         return !primaryKeys && !nestedAlias && !operatorKeys && !embeddable;
     }
-    autoJoin(qb, alias) {
+    autoJoin(qb, alias, options) {
         const nestedAlias = qb.getNextAlias(this.prop?.pivotTable ?? this.entityName);
         const customExpression = RawQueryFragment.isKnownFragment(this.key);
         const scalar = Utils.isPrimaryKey(this.payload) || this.payload instanceof RegExp || this.payload instanceof Date || customExpression;
@@ -211,7 +211,9 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 qb._fields = prev;
             }
         }
-        qb.scheduleFilterCheck(path);
+        if (!options || options.type !== 'orderBy') {
+            qb.scheduleFilterCheck(path);
+        }
         return nestedAlias;
     }
     isPrefixed(field) {

package/query/QueryBuilder.js

@@ -240,9 +240,12 @@ export class QueryBuilder {
             }
         }
         prop.targetMeta.props
-            .filter(prop => explicitFields
-            ? explicitFields.includes(prop.name) || explicitFields.includes(`${alias}.${prop.name}`) || prop.primary
-            : this.platform.shouldHaveColumn(prop, populate))
+            .filter(prop => {
+            if (!explicitFields) {
+                return this.platform.shouldHaveColumn(prop, populate);
+            }
+            return prop.primary && !explicitFields.includes(prop.name) && !explicitFields.includes(`${alias}.${prop.name}`);
+        })
             .forEach(prop => fields.push(...this.driver.mapPropToFieldNames(this, prop, alias)));
         return fields;
     }
@@ -275,6 +278,12 @@ export class QueryBuilder {
             }
             const cond = await em.applyFilters(join.prop.type, join.cond, filterOptions, 'read');
             if (Utils.hasObjectKeys(cond)) {
+                // remove nested filters, we only care about scalars here, nesting would require another join branch
+                for (const key of Object.keys(cond)) {
+                    if (Utils.isPlainObject(cond[key]) && Object.keys(cond[key]).every(k => !(Utils.isOperator(k) && !['$some', '$none', '$every'].includes(k)))) {
+                        delete cond[key];
+                    }
+                }
                 if (Utils.hasObjectKeys(join.cond)) {
                     /* istanbul ignore next */
                     join.cond = { $and: [join.cond, cond] };
@@ -363,7 +372,7 @@ export class QueryBuilder {
                 convertCustomTypes: false,
                 type: 'orderBy',
             });
-            this._orderBy.push(CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, processed).process(this, { matchPopulateJoins: true }));
+            this._orderBy.push(CriteriaNodeFactory.createNode(this.metadata, this.mainAlias.entityName, processed).process(this, { matchPopulateJoins: true, type: 'orderBy' }));
         });
         return this;
     }
@@ -1227,9 +1236,7 @@ export class QueryBuilder {
         }
     }
     hasToManyJoins() {
-        // console.log(this._joins);
         return Object.values(this._joins).some(join => {
-            // console.log(join.prop.name, join.prop.kind, [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(join.prop.kind));
             return [ReferenceKind.ONE_TO_MANY, ReferenceKind.MANY_TO_MANY].includes(join.prop.kind);
         });
     }

package/schema/DatabaseTable.js

@@ -97,6 +97,9 @@ export class DatabaseTable {
                 ignoreSchemaChanges: prop.ignoreSchemaChanges,
             };
             this.columns[field].unsigned ??= this.columns[field].autoincrement;
+            if (this.nativeEnums[type]) {
+                this.columns[field].enumItems ??= this.nativeEnums[type].items;
+            }
             const defaultValue = this.platform.getSchemaHelper().normalizeDefaultValue(prop.defaultRaw, prop.length);
             this.columns[field].default = defaultValue;
         });

package/typings.d.ts

@@ -170,6 +170,7 @@ export interface ICriteriaNodeProcessOptions {
     matchPopulateJoins?: boolean;
     ignoreBranching?: boolean;
     preferNoBranch?: boolean;
+    type?: 'orderBy';
 }
 export interface ICriteriaNode<T extends object> {
     readonly entityName: string;