Fix (N)IN Filters for Postgres. Abstract postprocessor.

Author: AJCStriker

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strontium",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "Strontium is a TypeScript toolkit for High Performance API servers built for Production not Projects.",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",

src/query/drivers/sql/SQLFilterCompiler.ts

@@ -46,13 +46,21 @@ export const compileSQLFilter: FilterCompiler<[string, Array<any>]> = (
                 // IN with an empty array typically causes an error - just make a tautological filter instead
                 queries.push(["TRUE = FALSE", []])
             } else {
-                queries.push(["?? IN ?", [field, subquery.$in]])
+                queries.push([
+                    `?? IN (${subquery.$in.map((p: any) => "?").join(", ")})`,
+                    [field, ...subquery.$in],
+                ])
             }
         } else if (subquery.$nin !== undefined) {
             if (subquery.$nin.length === 0) {
                 queries.push(["TRUE = TRUE", []])
             } else {
-                queries.push(["?? NOT IN ?", [field, subquery.$nin]])
+                queries.push([
+                    `?? NOT IN (${subquery.$nin
+                        .map((p: any) => "?")
+                        .join(", ")})`,
+                    [field, ...subquery.$nin],
+                ])
             }
         } else if (subquery.$neq !== undefined) {
             if (subquery.$neq === null) {

src/query/drivers/sql/TableRepository.ts

@@ -1,6 +1,6 @@
 import { pgQueryPostProcessor } from "../pg/PGQueryPostProcessor"
 import { Repository } from "../../abstract/Repository"
-import { MySQLStore, SQLStore } from "../../../datastore"
+import { MySQLStore, PGStore, SQLStore } from "../../../datastore"
 import { injectable } from "inversify"
 import { isUndefined, omitBy } from "lodash"
 
@@ -17,13 +17,22 @@ export abstract class TableRepository<
     T extends any,
     K extends keyof T
 > extends Repository<T, K> {
+    private postProcessor: (
+        query: string,
+        parameters: Array<any>
+    ) => [string, Array<any>] = (q, p) => [q, p]
+
     constructor(
         private store: SQLStore,
         private tableName: string,
         private queryFields: Array<keyof T>,
         private primaryKeyField: K
     ) {
         super()
+
+        if (store instanceof PGStore) {
+            this.postProcessor = pgQueryPostProcessor
+        }
     }
 
     async create(
@@ -75,7 +84,7 @@ export abstract class TableRepository<
 
             parameters.push(this.primaryKeyField)
 
-            let [processedQuery, processedParameters] = pgQueryPostProcessor(
+            let [processedQuery, processedParameters] = this.postProcessor(
                 query,
                 parameters
             )
@@ -126,7 +135,7 @@ export abstract class TableRepository<
             OFFSET ${pagination.offset}`
         }
 
-        let [processedQuery, processedParameters] = pgQueryPostProcessor(
+        let [processedQuery, processedParameters] = this.postProcessor(
             lookupQuery,
             parameters
         )
@@ -161,7 +170,7 @@ export abstract class TableRepository<
             payloadParameters.push(filteredPayload[k])
         })
 
-        let [processedQuery, processedParameters] = pgQueryPostProcessor(
+        let [processedQuery, processedParameters] = this.postProcessor(
             lookupQuery,
             [...payloadParameters, ...filterParameters]
         )
@@ -182,7 +191,7 @@ export abstract class TableRepository<
                 ${filterQuery}	
         `
 
-        let [processedQuery, processedParameters] = pgQueryPostProcessor(
+        let [processedQuery, processedParameters] = this.postProcessor(
             lookupQuery,
             parameters
         )

tests/query/drivers/PGQueryPostProcessor.spec.ts

@@ -116,8 +116,8 @@ describe("PGQueryPostProcessor", () => {
             expectQueryOutcome(
                 finalQuery,
                 ["a", "b", "c", "d", ...filterParameters, 250],
-                "SELECT a, b, c, d FROM myTable WHERE ((test = $1) OR (((otherThing > $2) AND (moreThings = $3)) AND (finalThing IN $4))) AND (rabbit = $5) LIMIT $6",
-                ["thing", 123, "test", ["final", "testing"], "foot", 250]
+                "SELECT a, b, c, d FROM myTable WHERE ((test = $1) OR (((otherThing > $2) AND (moreThings = $3)) AND (finalThing IN ($4, $5)))) AND (rabbit = $6) LIMIT $7",
+                ["thing", 123, "test", "final", "testing", "foot", 250]
             )
         })
     })

tests/query/drivers/SQLFilterCompiler.spec.ts

@@ -41,8 +41,8 @@ describe("SQLFilterCompiler", () => {
                         $in: [15, 16, 17],
                     },
                 },
-                "?? IN ?",
-                ["id", [15, 16, 17]]
+                "?? IN (?, ?, ?)",
+                ["id", 15, 16, 17]
             )
         })
 
@@ -65,8 +65,8 @@ describe("SQLFilterCompiler", () => {
                         $nin: [15, 16, 17],
                     },
                 },
-                "?? NOT IN ?",
-                ["id", [15, 16, 17]]
+                "?? NOT IN (?, ?, ?)",
+                ["id", 15, 16, 17]
             )
         })