fix(core): do not lookup in identity map with non-PK conditions

This fixes `findOne(Ent, { id: 1, active: false })` like conditions, that were mistakenly checking
the identity map based on the PK present in condition, even if there were additional conditions
like `active: false`.

Closes #625

packages/core/src/EntityManager.ts

@@ -297,7 +297,7 @@ export class EntityManager<D extends IDatabaseDriver = IDatabaseDriver> {
 
     entityName = Utils.className(entityName as string);
     this.validator.validatePrimaryKey(data as EntityData<T>, this.metadata.get(entityName));
-    let entity = this.getUnitOfWork().tryGetById<T>(entityName, data as FilterQuery<T>);
+    let entity = this.getUnitOfWork().tryGetById<T>(entityName, data as FilterQuery<T>, false);
 
     if (entity && wrap(entity).isInitialized() && !refresh) {
       return entity;

packages/core/src/unit-of-work/UnitOfWork.ts

@@ -61,8 +61,8 @@ export class UnitOfWork {
     return this.identityMap[token] as T;
   }
 
-  tryGetById<T extends AnyEntity<T>>(entityName: string, where: FilterQuery<T>): T | null {
-    const pk = Utils.extractPK(where, this.metadata.get(entityName));
+  tryGetById<T extends AnyEntity<T>>(entityName: string, where: FilterQuery<T>, strict = true): T | null {
+    const pk = Utils.extractPK(where, this.metadata.get(entityName), strict);
 
     if (!pk) {
       return null;

packages/core/src/utils/Utils.ts

@@ -272,13 +272,17 @@ export class Utils {
   /**
    * Extracts primary key from `data`. Accepts objects or primary keys directly.
    */
-  static extractPK<T extends AnyEntity<T>>(data: any, meta?: EntityMetadata): Primary<T> | null {
+  static extractPK<T extends AnyEntity<T>>(data: any, meta?: EntityMetadata, strict = false): Primary<T> | null {
     if (Utils.isPrimaryKey(data)) {
       return data as Primary<T>;
     }
 
-    if (Utils.isEntity(data, true) && !meta) {
-      meta = wrap(data, true).__meta;
+    if (Utils.isEntity(data, true)) {
+      return wrap(data, true).__primaryKey as Primary<T>;
+    }
+
+    if (strict && meta && Object.keys(data).length !== meta.primaryKeys.length) {
+      return null;
     }
 
     if (Utils.isObject(data) && meta) {

tests/EntityManager.mysql.test.ts

@@ -2232,6 +2232,14 @@ describe('EntityManagerMySql', () => {
     // await expect(orm.em.execute('insert into foo_bar2 () values ()')).rejects.toThrow(NotNullConstraintViolationException);
   });
 
+  test('GH 625', async () => {
+    const a = new Author2('n', 'e');
+    a.termsAccepted = false;
+    await orm.em.persistAndFlush(a);
+    const res = await orm.em.findOne(Author2, { id: a.id, termsAccepted: true });
+    expect(res).toBeNull();
+  });
+
   test('em.execute()', async () => {
     const res1 = await orm.em.execute('insert into author2 (name, email) values (?, ?)', ['name', 'email']);
     expect(res1).toMatchObject({ affectedRows: 1, insertId: 1 });