Merge pull request #2 from Shikyaro/dev

[v0.0.4] Added "query" method (proxy to pool.query)

Author: a1k0r

connectors/abstract-connector.js

@@ -1,3 +1,4 @@
+const QueryTemplater = require('query-template');
 /**
  * @abstract
  * @class {AbstractConnector}
@@ -8,6 +9,11 @@ class AbstractConnector {
      */
     constructor(config) {
         this.config = config;
+        /**
+         * @type {QueryTemplater}
+         * @protected
+         */
+        this._templater = config.templater || new QueryTemplater();
 
         if (new.target === AbstractConnector) {
             throw new TypeError('Abstract class can not be created!');
@@ -23,6 +29,19 @@ class AbstractConnector {
         throw new TypeError('This method must be overridden!');
     }
 
+    /**
+     * Pool.query proxy method
+     * @abstract
+     * @async
+     * @param {{name: String, sql:String, addons: Object}} queryObject query data
+     * @param {Object} queryParams named params
+     * @param {Object} queryOptions options
+     * @returns {Promise<Array>} query result
+     */
+    query(queryObject, queryParams, queryOptions = {}) {
+        throw new TypeError('This method must be overridden!');
+    }
+
     /**
      * @abstract
      * @async

connectors/postgres-connector.js

@@ -4,7 +4,8 @@ const AbstractConnector = require('./abstract-connector.js');
 const PostgresConnection = require('../connections/postgres-connection.js');
 
 /**
- * @inheritDoc
+ * @class
+ * @extends AbstractConnector
  */
 class PostgresConnector extends AbstractConnector {
     /**
@@ -27,10 +28,28 @@ class PostgresConnector extends AbstractConnector {
         };
 
         const connection = new PostgresConnection(config);
-
         return connection;
     }
 
+    /**
+     * @inheritDoc
+     */
+    query(queryObject, queryParams, queryOptions = {}) {
+        const {sql, addons} = queryObject;
+        if (!sql) {
+            throw new TypeError('Invalid query object, "sql" property missing');
+        }
+        const {templateParams = {}} = queryOptions;
+        let queryText = sql;
+
+        if (addons) {
+            queryText = this._templater.processTemplates(queryObject, {...queryParams, ...templateParams});
+        }
+
+        const {query, params} = this._templater.parametrizeQuery(queryText, queryParams, this.config.type);
+        return this.pool.query(query, params);
+    }
+
     /**
      * @inheritDoc
      */

index.js

@@ -46,6 +46,29 @@ class DataStorage {
         return connector.getConnection();
     }
 
+    /**
+     * @async
+     * @param {String} connectorName connector name
+     * @param {{name: String, sql:String, addons: Object}} queryObject query data
+     * @param {Object} queryParams named params
+     * @param {Object} queryOptions options
+     * @returns {Promise<Array>} query result
+     */
+    async query(connectorName, queryObject, queryParams, queryOptions = {}) {
+        let connection;
+        try {
+            connection = await this.getConnection(connectorName);
+            const data = await connection.query(queryObject, queryParams, queryOptions);
+            return data;
+        } catch (error) {
+            throw error;
+        } finally {
+            if (connection) {
+                await connection.release();
+            }
+        }
+    }
+
     /**
      * Method for graceful shutdown
      * @async

package.json

@@ -6,7 +6,7 @@
     "url": "git://github.com/Shikyaro/multi-data-source.git"
   },
   "license": "MIT",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "scripts": {
     "autofix": "eslint --fix .",
     "test": "./node_modules/.bin/jest ./test"