fix(core): ensure correct aliasing when auto-joining PKs in group con…

…ditions Closes #1734
mikro-orm · Apr 26, 2021 · 38775e6 · 38775e6
1 parent 1ba49fe
commit 38775e6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/packages/knex/src/query/ObjectCriteriaNode.ts b/packages/knex/src/query/ObjectCriteriaNode.ts
@@ -26,14 +26,15 @@ export class ObjectCriteriaNode extends CriteriaNode {
       const operator = Utils.isOperator(field);
       const customExpression = ObjectCriteriaNode.isCustomExpression(field);
       const virtual = childNode.prop?.persist === false;
-      const primaryKey = this.metadata.find(this.entityName)?.primaryKeys.includes(field);
+      // if key is missing, we are inside group operator and we need to prefix with alias
+      const primaryKey = this.key && this.metadata.find(this.entityName)!.primaryKeys.includes(field);
 
       if (childNode.shouldInline(payload)) {
         const childAlias = qb.getAliasForJoinPath(childNode.getPath());
         this.inlineChildPayload(o, payload, field, alias, childAlias);
       } else if (childNode.shouldRename(payload)) {
         o[childNode.renameFieldToPK(qb)] = payload;
-      } else if (primaryKey || virtual || operator || customExpression || field.includes('.') || ![QueryType.SELECT, QueryType.COUNT].includes(qb.type)) {
+      } else if (primaryKey || virtual || operator || customExpression || field.includes('.') || ![QueryType.SELECT, QueryType.COUNT].includes(qb.type ?? QueryType.SELECT)) {
         o[field] = payload;
       } else {
         o[`${alias}.${field}`] = payload;

diff --git a/tests/QueryBuilder.test.ts b/tests/QueryBuilder.test.ts
@@ -1948,6 +1948,22 @@ describe('QueryBuilder', () => {
     expect(sql3).toBe("update `my_schema`.`author2` force index(custom_email_index_name) set `name` = '...' where `favourite_book_uuid_pk` in ('1', '2', '3')");
   });
 
+  test('$or operator inside auto-joined relation', async () => {
+    const query = {
+      author: {
+        $or: [
+          { id: 123 },
+          { name: { $like: `%jon%` } },
+        ],
+      },
+    };
+    const expected = "select `e0`.*, `e0`.price * 1.19 as `price_taxed` from `book2` as `e0` left join `author2` as `e1` on `e0`.`author_id` = `e1`.`id` where (`e1`.`id` = 123 or `e1`.`name` like '%jon%')";
+    const sql1 = orm.em.createQueryBuilder(Book2).select('*').where(query).getFormattedQuery();
+    expect(sql1).toBe(expected);
+    const sql2 = orm.em.createQueryBuilder(Book2).where(query).getFormattedQuery();
+    expect(sql2).toBe(expected);
+  });
+
   afterAll(async () => orm.close(true));
 
 });