feat: enable custom operators through use of sql tokens (#192)

ProjectXero · Mar 31, 2021 · c4a77db · c4a77db
2 parents f611993 + 0254308
commit c4a77db
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/datasource/DBDataSource.ts b/src/datasource/DBDataSource.ts
@@ -439,10 +439,10 @@ export default class DBDataSource<
       ...options,
       expected: 'any',
       where: {
-        [column]: this.builder.any(
+        [column]: sql`= ${this.builder.any(
           ([...args] as unknown) as (string | number | boolean | Date | null)[],
           type
-        ),
+        )}`,
         ...options?.where,
       },
     })

diff --git a/src/datasource/__tests__/__snapshots__/queries.test.ts.snap b/src/datasource/__tests__/__snapshots__/queries.test.ts.snap
@@ -254,6 +254,14 @@ Object {
 }
 `;
 
+exports[`QueryBuilder clause generators where enables custom operators through use of sql tokens 1`] = `
+Object {
+  "sql": "WHERE (\\"any_table\\".\\"id\\" > 1)",
+  "type": "SLONIK_TOKEN_SQL",
+  "values": Array [],
+}
+`;
+
 exports[`QueryBuilder clause generators where handles multiple values for a column 1`] = `
 Object {
   "sql": "WHERE (\\"any_table\\".\\"id\\" = ANY($1::these[]))",

diff --git a/src/datasource/__tests__/queries.test.ts b/src/datasource/__tests__/queries.test.ts
@@ -69,6 +69,10 @@ describe(QueryBuilder, () => {
         expect(builder.where(conditions)).toMatchSnapshot()
       })
 
+      it('enables custom operators through use of sql tokens', () => {
+        expect(builder.where({ id: sql`> 1` })).toMatchSnapshot()
+      })
+
       it('produces a valid clause with no conditions', () => {
         expect(builder.where({})).toMatchSnapshot()
         expect(builder.where([])).toMatchSnapshot()

diff --git a/src/datasource/queries/QueryBuilder.ts b/src/datasource/queries/QueryBuilder.ts
@@ -457,6 +457,8 @@ export default class QueryBuilder<
           } else {
             return condition
           }
+        } else if (isSqlSqlTokenType(value)) {
+          return sql`${this.identifier(column)} ${value}`
         }
 
         // We've already filtered out value === undefined above