@mikro-orm/sql 7.1.16-dev.1 → 7.1.16-dev.10

package/AbstractSqlDriver.js

@@ -1333,7 +1333,7 @@ export class AbstractSqlDriver extends DatabaseDriver {
             ],
             populateWhere: undefined,
             _populateWhere: 'infer',
-            populateFilter: this.wrapPopulateFilter(options, pivotProp2.name),
+            populateFilter: this.wrapPopulateFilter(options, pivotProp1.name),
         };
         if (pivotFindOptions._partitionLimit) {
             pivotFindOptions._partitionLimit.partitionBy = pivotProp2.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mikro-orm/sql",
-  "version": "7.1.16-dev.1",
+  "version": "7.1.16-dev.10",
   "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.",
   "keywords": [
     "data-mapper",
@@ -53,7 +53,7 @@
     "@mikro-orm/core": "^7.1.15"
   },
   "peerDependencies": {
-    "@mikro-orm/core": "7.1.16-dev.1"
+    "@mikro-orm/core": "7.1.16-dev.10"
   },
   "engines": {
     "node": ">= 22.17.0"

package/query/ObjectCriteriaNode.d.ts

@@ -13,6 +13,7 @@ export declare class ObjectCriteriaNode<T extends object> extends CriteriaNode<T
     private inlineArrayChildPayload;
     private inlineChildPayload;
     private inlineCondition;
+    private isCollectionOperator;
     private shouldAutoJoin;
     private autoJoin;
     private isPrefixed;

package/query/ObjectCriteriaNode.js

@@ -1,7 +1,7 @@
 import { ALIAS_REPLACEMENT, GroupOperator, QueryFlag, raw, RawQueryFragment, ReferenceKind, Utils, } from '@mikro-orm/core';
 import { CriteriaNode } from './CriteriaNode.js';
 import { JoinType, QueryType } from './enums.js';
-const COLLECTION_OPERATORS = ['$some', '$none', '$every', '$size'];
+const COLLECTION_OPERATORS = ['$some', '$none', '$every', '$size', '$all'];
 /**
  * @internal
  */
@@ -17,7 +17,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             alias = nestedAlias;
         }
         if (this.shouldAutoJoin(qb, nestedAlias)) {
-            if (keys.some(k => COLLECTION_OPERATORS.includes(k))) {
+            if (keys.some(k => this.isCollectionOperator(k))) {
                 if (![ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(this.prop.kind)) {
                     // ignore collection operators when used on a non-relational property - this can happen when they get into
                     // populateWhere via `infer` on m:n properties with select-in strategy
@@ -34,11 +34,24 @@ export class ObjectCriteriaNode extends CriteriaNode {
                 const primaryKeys = parentMeta.primaryKeys.map(pk => {
                     return [QueryType.SELECT, QueryType.COUNT].includes(qb.type) ? `${knownKey ? alias : ownerAlias}.${pk}` : pk;
                 });
+                const conditions = [];
+                let matchNothing = false;
                 for (const key of keys) {
                     if (typeof key !== 'string' || !COLLECTION_OPERATORS.includes(key)) {
                         throw new Error('Mixing collection operators with other filters is not allowed.');
                     }
                     const payload = this.payload[key].unwrap();
+                    // `$all` requires every listed item to be present, which is an intersection of `$some` conditions
+                    if (key === '$all') {
+                        // an empty `$all` matches nothing, same as in mongo
+                        matchNothing ||= payload.length === 0;
+                        conditions.push(...payload.map(item => ['$some', item]));
+                    }
+                    else {
+                        conditions.push([key, payload]);
+                    }
+                }
+                for (const [key, payload] of conditions) {
                     // entities with a fixed schema must resolve the `from` table's own schema in the subquery,
                     // otherwise a nested operator inherits the root entity's schema (GH #7894); for wildcard or
                     // schema-less entities the schema is resolved dynamically and needs to be carried over
@@ -70,6 +83,9 @@ export class ObjectCriteriaNode extends CriteriaNode {
                         [Utils.getPrimaryKeyHash(primaryKeys)]: { [op]: sub.getNativeQuery().toRaw() },
                     });
                 }
+                if (matchNothing) {
+                    $and.push({ [Utils.getPrimaryKeyHash(primaryKeys)]: { $in: [] } });
+                }
                 if ($and.length === 1) {
                     return $and[0];
                 }
@@ -154,7 +170,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
             alias = nestedAlias;
         }
         if (this.shouldAutoJoin(qb, nestedAlias)) {
-            return !keys.some(k => COLLECTION_OPERATORS.includes(k));
+            return !keys.some(k => this.isCollectionOperator(k));
         }
         return keys.some(field => {
             const childNode = this.payload[field];
@@ -238,6 +254,14 @@ export class ObjectCriteriaNode extends CriteriaNode {
         delete o[key];
         o.$and = $and;
     }
+    isCollectionOperator(key) {
+        if (typeof key !== 'string' || !COLLECTION_OPERATORS.includes(key)) {
+            return false;
+        }
+        // `$all` is primarily a mongo array operator, in SQL it is supported only on collections
+        return (key !== '$all' ||
+            (!!this.prop && [ReferenceKind.MANY_TO_MANY, ReferenceKind.ONE_TO_MANY].includes(this.prop.kind)));
+    }
     shouldAutoJoin(qb, nestedAlias) {
         if (!this.prop || !this.parent) {
             return false;
@@ -246,7 +270,7 @@ export class ObjectCriteriaNode extends CriteriaNode {
         if (keys.every(k => typeof k === 'string' && k.includes('.') && k.startsWith(`${qb.alias}.`))) {
             return false;
         }
-        if (keys.some(k => COLLECTION_OPERATORS.includes(k))) {
+        if (keys.some(k => this.isCollectionOperator(k))) {
             return true;
         }
         const meta = this.metadata.find(this.entityName);

package/query/QueryBuilderHelper.js

@@ -643,6 +643,10 @@ export class QueryBuilderHelper {
         return '?';
     }
     getOperatorReplacement(op, value) {
+        // collection properties expand `$all` into `$some` sub-queries in `ObjectCriteriaNode`, nothing else has a SQL equivalent
+        if (op === '$all') {
+            throw new Error('The `$all` operator is supported only on collection properties in SQL drivers, use `$contains` for array columns instead.');
+        }
         let replacement = QueryOperator[op];
         if (op === '$exists') {
             replacement = value[op] ? 'is not' : 'is';