Added further tests for where-builder

Author: luca-nardelli

packages/query-typeorm/__tests__/query/__snapshots__/where.builder.spec.ts.snap

@@ -11,6 +11,22 @@ Array [
 ]
 `;
 
+exports[`WhereBuilder and and multiple expressions together with custom filters 1`] = `SELECT "TestEntity"."test_entity_pk" AS "TestEntity_test_entity_pk", "TestEntity"."string_type" AS "TestEntity_string_type", "TestEntity"."bool_type" AS "TestEntity_bool_type", "TestEntity"."number_type" AS "TestEntity_number_type", "TestEntity"."date_type" AS "TestEntity_date_type", "TestEntity"."oneTestRelationTestRelationPk" AS "TestEntity_oneTestRelationTestRelationPk" FROM "test_entity" "TestEntity" WHERE ((("TestEntity"."number_type" > ?)) AND (("TestEntity"."number_type" < ?)) AND (("TestEntity"."number_type" >= ?)) AND (("TestEntity"."number_type" <= ?)) AND ((("TestEntity"."numberType" % ?) == 0)) AND (((EXTRACT(EPOCH FROM "TestEntity"."dateType") / 3600 / 24) % ?) == 0)) AND ((ST_Distance("TestEntity"."fakePointType", ST_MakePoint(?,?)) <= ?)))`;
+
+exports[`WhereBuilder and and multiple expressions together with custom filters 2`] = `
+Array [
+  10,
+  20,
+  30,
+  40,
+  5,
+  3,
+  45.3,
+  9.5,
+  50000,
+]
+`;
+
 exports[`WhereBuilder and and multiple filters together with multiple fields 1`] = `SELECT "TestEntity"."test_entity_pk" AS "TestEntity_test_entity_pk", "TestEntity"."string_type" AS "TestEntity_string_type", "TestEntity"."bool_type" AS "TestEntity_bool_type", "TestEntity"."number_type" AS "TestEntity_number_type", "TestEntity"."date_type" AS "TestEntity_date_type", "TestEntity"."oneTestRelationTestRelationPk" AS "TestEntity_oneTestRelationTestRelationPk" FROM "test_entity" "TestEntity" WHERE ((("TestEntity"."number_type" > ?) AND ("TestEntity"."string_type" LIKE ?)) AND (("TestEntity"."number_type" < ?) AND ("TestEntity"."string_type" LIKE ?)))`;
 
 exports[`WhereBuilder and and multiple filters together with multiple fields 2`] = `
@@ -85,6 +101,22 @@ Array [
 ]
 `;
 
+exports[`WhereBuilder or or multiple expressions together with custom filter 1`] = `SELECT "TestEntity"."test_entity_pk" AS "TestEntity_test_entity_pk", "TestEntity"."string_type" AS "TestEntity_string_type", "TestEntity"."bool_type" AS "TestEntity_bool_type", "TestEntity"."number_type" AS "TestEntity_number_type", "TestEntity"."date_type" AS "TestEntity_date_type", "TestEntity"."oneTestRelationTestRelationPk" AS "TestEntity_oneTestRelationTestRelationPk" FROM "test_entity" "TestEntity" WHERE ((("TestEntity"."number_type" > ?)) OR (("TestEntity"."number_type" < ?)) OR (("TestEntity"."number_type" >= ?)) OR (("TestEntity"."number_type" <= ?)) OR ((("TestEntity"."numberType" % ?) == 0)) OR (((EXTRACT(EPOCH FROM "TestEntity"."dateType") / 3600 / 24) % ?) == 0)) OR ((ST_Distance("TestEntity"."fakePointType", ST_MakePoint(?,?)) <= ?)))`;
+
+exports[`WhereBuilder or or multiple expressions together with custom filter 2`] = `
+Array [
+  10,
+  20,
+  30,
+  40,
+  5,
+  3,
+  45.3,
+  9.5,
+  50000,
+]
+`;
+
 exports[`WhereBuilder or should properly group OR with a sibling field comparison 1`] = `SELECT "TestEntity"."test_entity_pk" AS "TestEntity_test_entity_pk", "TestEntity"."string_type" AS "TestEntity_string_type", "TestEntity"."bool_type" AS "TestEntity_bool_type", "TestEntity"."number_type" AS "TestEntity_number_type", "TestEntity"."date_type" AS "TestEntity_date_type", "TestEntity"."oneTestRelationTestRelationPk" AS "TestEntity_oneTestRelationTestRelationPk" FROM "test_entity" "TestEntity" WHERE ((("TestEntity"."number_type" = ?)) OR (("TestEntity"."number_type" > ?))) AND ("TestEntity"."string_type" = ?)`;
 
 exports[`WhereBuilder or should properly group OR with a sibling field comparison 2`] = `

packages/query-typeorm/__tests__/query/where.builder.spec.ts

@@ -64,6 +64,20 @@ describe('WhereBuilder', (): void => {
       });
     });
 
+    it('and multiple expressions together with custom filters', (): void => {
+      expectSQLSnapshot({
+        and: [
+          { numberType: { gt: 10 } },
+          { numberType: { lt: 20 } },
+          { numberType: { gte: 30 } },
+          { numberType: { lte: 40 } },
+          { numberType: { isMultipleOf: 5 } },
+          { dateType: { isMultipleOf: 3 } },
+          { fakePointType: { distanceFrom: { point: { lat: 45.3, lng: 9.5 }, radius: 50000 } } },
+        ],
+      });
+    });
+
     it('and multiple filters together with multiple fields', (): void => {
       expectSQLSnapshot({
         and: [
@@ -99,6 +113,20 @@ describe('WhereBuilder', (): void => {
       });
     });
 
+    it('or multiple expressions together with custom filter', (): void => {
+      expectSQLSnapshot({
+        or: [
+          { numberType: { gt: 10 } },
+          { numberType: { lt: 20 } },
+          { numberType: { gte: 30 } },
+          { numberType: { lte: 40 } },
+          { numberType: { isMultipleOf: 5 } },
+          { dateType: { isMultipleOf: 3 } },
+          { fakePointType: { distanceFrom: { point: { lat: 45.3, lng: 9.5 }, radius: 50000 } } },
+        ],
+      });
+    });
+
     it('and multiple and filters together', (): void => {
       expectSQLSnapshot({
         or: [