12: fix ttl vs options obj

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.1.6 - 05-04-2019
+
+- Fix issue setting TTL on cache requests [#15]
+
 ## v0.1.5 - 28-02-2019
 
 - Update dependencies to resolve cache TTL issue [#12]

README.md

@@ -16,7 +16,7 @@ And the peer dependencies (if you do not have them already): `npm i knex graphql
 const Knex = require("knex");
 const { SQLDataSource } = require("datasource-sql");
 
-const MINUTE = 60 * 1000;
+const MINUTE = 60;
 
 const knex = Knex({
   client: "pg",
@@ -89,21 +89,21 @@ SQLCache leverages Apollo's caching strategy to save results between requests an
 
 This method accepts two parameters:
 
-`getCached(knexQuery, ttlInMilliseconds)`
+`getCached(knexQuery, ttlInSeconds)`
 
 - `knexQuery`: <knexObject> A knex object that has not been then'd
-- `ttlInMilliseconds`: <Number> number of milliseconds to keep cached results
+- `ttlInSeconds`: <Number> number of seconds to keep cached results
 
 ### Why not both?
 
 To leverage caching _*and*_ batching for a query, use the method `getCachedAndBatched` which wraps both methods.
 
 This method accepts the same two params as `getCached`:
 
-`getBatchedAndCached(knexQuery, ttlInMilliseconds)`
+`getBatchedAndCached(knexQuery, ttlInSeconds)`
 
 - `knexQuery`: <knexObject> A knex object that has not been then'd
-- `ttlInMilliseconds`: <Number> number of milliseconds to keep cached results
+- `ttlInSeconds`: <Number> number of seconds to keep cached results
 
 From the example in the usage section above:
 

SQLCache.js

@@ -21,7 +21,7 @@ class SQLCache {
     return this.cache.get(cacheKey).then(entry => {
       if (entry) return Promise.resolve(entry);
       return query.then(rows => {
-        if (rows) this.cache.set(cacheKey, rows, ttl);
+        if (rows) this.cache.set(cacheKey, rows, { ttl });
         return Promise.resolve(rows);
       });
     });
@@ -37,7 +37,7 @@ class SQLCache {
         .load(queryString)
         .then(result => result && result.rows)
         .then(rows => {
-          if (rows) this.cache.set(cacheKey, rows, ttl);
+          if (rows) this.cache.set(cacheKey, rows, { ttl });
           return Promise.resolve(rows);
         });
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "datasource-sql",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "SQL DataSource for Apollo GraphQL projects",
   "main": "index.js",
   "scripts": {