Added check for database client in getBatched() (#11)

- Fix for responses from sqlite and mssql drivers [#9]

Author: tab00

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.7 - 24-04-2019
+
+- Fix for responses from sqlite and mssql drivers [#9]
+
 ## v0.1.6 - 05-04-2019
 
 - Fix issue setting TTL on cache requests [#15]

SQLCache.js

@@ -4,19 +4,42 @@ const DataLoader = require("dataloader");
 class SQLCache {
   constructor(cache = new InMemoryLRUCache(), knex) {
     this.cache = cache;
+    this.knex = knex;
     this.loader = new DataLoader(rawQueries =>
       Promise.all(rawQueries.map(rawQuery => knex.raw(rawQuery)))
     );
   }
 
+  normalizeDBResult(result) {
+    switch (this.knex.client) {
+      case "postgres":
+        return result && result.rows;
+      case "mssql":
+        return result;
+      case "sqlite3":
+        return result;
+      // TODO: Test and implement remaining clients
+      case "mysql":
+      case "mysql2":
+      case "oracledb":
+      case "redshift":
+      default:
+        return result;
+    }
+  }
+
+  getCacheKeyForQuery(query) {
+    const queryString = query.toString();
+    return `sqlcache:${queryString}`;
+  }
+
   getBatched(query) {
     const queryString = query.toString();
-    return this.loader.load(queryString).then(result => result && result.rows);
+    return this.loader.load(queryString).then(this.normalizeDBResult);
   }
 
   getCached(query, ttl) {
-    const queryString = query.toString();
-    const cacheKey = `sqlcache:${queryString}`;
+    const cacheKey = this.getCacheKeyForQuery(query);
 
     return this.cache.get(cacheKey).then(entry => {
       if (entry) return Promise.resolve(entry);
@@ -28,18 +51,15 @@ class SQLCache {
   }
 
   getBatchedAndCached(query, ttl) {
-    const queryString = query.toString();
-    const cacheKey = `sqlcache:${queryString}`;
+    const cacheKey = this.getCacheKeyForQuery(query);
 
     return this.cache.get(cacheKey).then(entry => {
       if (entry) return Promise.resolve(entry);
-      return this.loader
-        .load(queryString)
-        .then(result => result && result.rows)
-        .then(rows => {
-          if (rows) this.cache.set(cacheKey, rows, { ttl });
-          return Promise.resolve(rows);
-        });
+
+      return this.getBatched(query).then(rows => {
+        if (rows) this.cache.set(cacheKey, rows, { ttl });
+        return Promise.resolve(rows);
+      });
     });
   }
 }