simplified db util with pool.query

timgit · Mar 9, 2017 · f4d4f4a · f4d4f4a
1 parent 18db071
commit f4d4f4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 29 deletions.
diff --git a/src/db.js b/src/db.js
@@ -36,35 +36,11 @@ class Db {
         }
     }
 
-    executePreparedSql(name, text, values){
-        return this.execute({name,text,values});
-    }
-
-    executeSql(text, values){
-       return this.execute({text,values});
-    }
-
-    execute(query) {
-        if(query.values && !Array.isArray(query.values))
-            query.values = [query.values];
-
-        return new Promise((resolve, reject) => {
-            this.pool.connect((err, client, done) => {
-
-                if(err)
-                    return reject(err);
-
-                client.query(query, (err, result) => {
-                    done(err);
-
-                    if(err)
-                        reject(err);
-                    else
-                        resolve(result);
-                });
-            });
-        });
+    executeSql(text, values) {
+        if(values && !Array.isArray(values))
+            values = [values];
 
+        return this.pool.query(text, values);
     }
 
     migrate(version, uninstall) {

diff --git a/src/manager.js b/src/manager.js
@@ -194,7 +194,7 @@ class Manager extends EventEmitter {
     }
 
     fetch(name) {
-        return this.db.executePreparedSql('nextJob', this.nextJobCommand, name)
+        return this.db.executeSql(this.nextJobCommand, name)
             .then(result => {
                 if(result.rows.length === 0)
                     return null;