fix: test for typeorm#4165

Benjamin-Dobell · Jan 13, 2020 · 49564e4 · 49564e4
1 parent c8b93bf
commit 49564e4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/src/query-builder/QueryExpressionMap.ts b/src/query-builder/QueryExpressionMap.ts
@@ -434,6 +434,7 @@ export class QueryExpressionMap {
         map.callObservers = this.callObservers;
         map.useTransaction = this.useTransaction;
         map.nativeParameters = Object.assign({}, this.nativeParameters);
+        map.eagerRelations = this.eagerRelations;
         return map;
     }
 

diff --git a/test/github-issues/4156/issue-4156.ts b/test/github-issues/4156/issue-4156.ts
@@ -36,7 +36,8 @@ describe("github issues > #4156 QueryExpressionMap doesn't clone all values corr
         await prepareData(connection);
 
         const qb = connection.manager
-          .createQueryBuilder("Post", "post");
+          .createQueryBuilder("Post", "post")
+          .disableEagerRelations(true);
 
         const [loadedPost1, loadedPost2] = await Promise.all([
           qb.clone().where({ id: 1 }).getOne(),
@@ -62,6 +63,7 @@ describe("github issues > #4156 QueryExpressionMap doesn't clone all values corr
 
         const qb = connection.manager
           .createQueryBuilder("Post", "post")
+          .disableEagerRelations(true)
           .where({ id: 1 });
 
         const [loadedPost1, loadedPost2] = await Promise.all([

diff --git a/test/github-issues/5334/entity/SomeEntityWithADate.ts b/test/github-issues/5334/entity/SomeEntityWithADate.ts
@@ -1,7 +1,11 @@
-import {Column, Entity} from "../../../../src";
+import {Column, Entity, Generated, PrimaryColumn} from "../../../../src";
 
 @Entity()
 export default class SomeEntityWithADate {
-    @Column({type: "time without time zone"})
+    @PrimaryColumn("integer")
+    @Generated()
+    id: number;
+
+    @Column({type: "date"})
     someDateField: Date;
 }
diff --git a/test/github-issues/5334/issue-5334.ts b/test/github-issues/5334/issue-5334.ts
@@ -1,12 +1,12 @@
+import "reflect-metadata";
 import {expect} from "chai";
-
-import {Connection} from "../../../src";
 import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../utils/test-utils";
+import {Connection} from "../../../src/connection/Connection";
 
 import SomeEntityWithADate from "./entity/SomeEntityWithADate";
 
 
-describe("github issues > #9999 Unable to perform find with where clause containing a date", () => {
+describe("github issues > #5334 Unable to perform find with where clause containing a date", () => {
 
     let connections: Connection[];
     before(async () => connections = await createTestingConnections({
@@ -15,7 +15,7 @@ describe("github issues > #9999 Unable to perform find with where clause contain
     beforeEach(() => reloadTestingDatabases(connections));
     after(() => closeTestingConnections(connections));
 
-    it("should work as expected", () => Promise.all(connections.map(async connection => {
+    it("should findOne with Date without throwing an error", () => Promise.all(connections.map(async connection => {
 
         const date = new Date("2020-01-13");
 
@@ -25,13 +25,17 @@ describe("github issues > #9999 Unable to perform find with where clause contain
 
         const repository = connection.getRepository(SomeEntityWithADate);
 
-        const foundEntity = await repository.findOne({
+        const findSomeEntity = repository.findOne({
             where: {
                 someDateField: date
             }
         });
 
-        expect(foundEntity).to.not.be.null;
+        findSomeEntity.should.not.be.rejected;
+
+        const entity = await findSomeEntity;
+
+        expect(entity).to.not.be.null;
 
     })));