fix: Correctly interpolate queries.

nearform · May 17, 2018 · fda0ac3 · fda0ac3
1 parent 2e96b0b
commit fda0ac3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "npm run sanity"
+      "pre-push": "npm run sanity"
     }
   },
   "workspaces": [

diff --git a/packages/trail-core/lib/index.js b/packages/trail-core/lib/index.js
@@ -116,13 +116,17 @@ class TrailsManager {
     // Perform the query
     const sql = SQL`
       SELECT
-        DISTINCT ON(${{__raw: type}}_id) ${{__raw: type}}_id AS entry
+        DISTINCT ON($type$_id) $type$_id AS entry
         FROM trails
         WHERE
           ("when" >= ${from.toISO()} AND "when" <= ${to.toISO()})
 
     `
 
+    const strings = Array.from(sql.strings)
+    strings.splice(0, 1, strings[0].replace(/\$type\$/g, type))
+    sql.strings = strings
+
     const footer = ` ORDER BY entry ${desc ? 'DESC' : 'ASC'} LIMIT ${pageSize} OFFSET ${(page - 1) * pageSize}`
     sql.append(SQL([footer]))