@mikro-orm/knex 6.0.0-dev.255 → 6.0.0-dev.256
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/query/ObjectCriteriaNode.js +10 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mikro-orm/knex",
|
|
3
|
-
"version": "6.0.0-dev.
|
|
3
|
+
"version": "6.0.0-dev.256",
|
|
4
4
|
"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.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"module": "index.mjs",
|
|
@@ -66,6 +66,6 @@
|
|
|
66
66
|
"@mikro-orm/core": "^5.9.2"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@mikro-orm/core": "6.0.0-dev.
|
|
69
|
+
"@mikro-orm/core": "6.0.0-dev.256"
|
|
70
70
|
}
|
|
71
71
|
}
|
|
@@ -16,7 +16,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
|
|
|
16
16
|
if (nestedAlias) {
|
|
17
17
|
alias = nestedAlias;
|
|
18
18
|
}
|
|
19
|
-
if (this.shouldAutoJoin(nestedAlias)) {
|
|
19
|
+
if (this.shouldAutoJoin(qb, nestedAlias)) {
|
|
20
20
|
if (keys.some(k => ['$some', '$none', '$every'].includes(k))) {
|
|
21
21
|
const $and = [];
|
|
22
22
|
const primaryKeys = this.metadata.find(this.entityName).primaryKeys.map(pk => {
|
|
@@ -86,7 +86,7 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
|
|
|
86
86
|
if (nestedAlias) {
|
|
87
87
|
alias = nestedAlias;
|
|
88
88
|
}
|
|
89
|
-
if (this.shouldAutoJoin(nestedAlias)) {
|
|
89
|
+
if (this.shouldAutoJoin(qb, nestedAlias)) {
|
|
90
90
|
return !keys.some(k => ['$some', '$none', '$every'].includes(k));
|
|
91
91
|
}
|
|
92
92
|
return keys.some(field => {
|
|
@@ -137,15 +137,19 @@ class ObjectCriteriaNode extends CriteriaNode_1.CriteriaNode {
|
|
|
137
137
|
}
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
|
-
shouldAutoJoin(nestedAlias) {
|
|
140
|
+
shouldAutoJoin(qb, nestedAlias) {
|
|
141
141
|
if (!this.prop || !this.parent) {
|
|
142
142
|
return false;
|
|
143
143
|
}
|
|
144
|
+
const keys = Object.keys(this.payload);
|
|
145
|
+
if (keys.every(k => k.includes('.') && k.startsWith(`${qb.alias}.`))) {
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
148
|
+
const meta = this.metadata.find(this.entityName);
|
|
144
149
|
const embeddable = this.prop.kind === core_1.ReferenceKind.EMBEDDED;
|
|
145
150
|
const knownKey = [core_1.ReferenceKind.SCALAR, core_1.ReferenceKind.MANY_TO_ONE, core_1.ReferenceKind.EMBEDDED].includes(this.prop.kind) || (this.prop.kind === core_1.ReferenceKind.ONE_TO_ONE && this.prop.owner);
|
|
146
|
-
const operatorKeys = knownKey &&
|
|
147
|
-
const primaryKeys = knownKey &&
|
|
148
|
-
const meta = this.metadata.find(this.entityName);
|
|
151
|
+
const operatorKeys = knownKey && keys.every(key => core_1.Utils.isOperator(key, false));
|
|
152
|
+
const primaryKeys = knownKey && keys.every(key => {
|
|
149
153
|
if (!meta.primaryKeys.includes(key)) {
|
|
150
154
|
return false;
|
|
151
155
|
}
|