From 9c9b2ff48da936deea204681142bfc4e64dc386c Mon Sep 17 00:00:00 2001 From: Sam Rose Date: Tue, 21 May 2024 14:15:17 +0100 Subject: [PATCH] Move empty object range tests out of sql.spec.ts. --- .../src/api/routes/tests/search.spec.ts | 14 +++++++ .../server/src/integrations/tests/sql.spec.ts | 38 ------------------- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts index 2ddc6ef1ff..5b5f05bc58 100644 --- a/packages/server/src/api/routes/tests/search.spec.ts +++ b/packages/server/src/api/routes/tests/search.spec.ts @@ -712,6 +712,20 @@ describe.each([ expectQuery({ range: { name: { low: "g", high: "h" } }, }).toFindNothing()) + + !isLucene && + it("ignores low if it's an empty object", () => + expectQuery({ + // @ts-ignore + range: { name: { low: {}, high: "z" } }, + }).toContainExactly([{ name: "foo" }, { name: "bar" }])) + + !isLucene && + it("ignores high if it's an empty object", () => + expectQuery({ + // @ts-ignore + range: { name: { low: "a", high: {} } }, + }).toContainExactly([{ name: "foo" }, { name: "bar" }])) }) describe("empty", () => { diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts index cf433725ce..377c1d65e0 100644 --- a/packages/server/src/integrations/tests/sql.spec.ts +++ b/packages/server/src/integrations/tests/sql.spec.ts @@ -190,44 +190,6 @@ describe("SQL query builder", () => { }) }) - it("should ignore high range value if it is an empty object", () => { - const query = sql._query( - generateReadJson({ - filters: { - range: { - dob: { - low: "2000-01-01 00:00:00", - high: {}, - }, - }, - }, - }) - ) - expect(query).toEqual({ - bindings: ["2000-01-01 00:00:00", 500], - sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."dob" >= $1 limit $2) as "${TABLE_NAME}"`, - }) - }) - - it("should ignore low range value if it is an empty object", () => { - const query = sql._query( - generateReadJson({ - filters: { - range: { - dob: { - low: {}, - high: "2010-01-01 00:00:00", - }, - }, - }, - }) - ) - expect(query).toEqual({ - bindings: ["2010-01-01 00:00:00", 500], - sql: `select * from (select * from "${TABLE_NAME}" where "${TABLE_NAME}"."dob" <= $1 limit $2) as "${TABLE_NAME}"`, - }) - }) - it("should lowercase the values for Oracle LIKE statements", () => { let query = new Sql(SqlClient.ORACLE, limit)._query( generateReadJson({