Mini fixes

Author: Pavel Romanov

connections/PostgresConnection.js

@@ -8,40 +8,13 @@ class PostgresConnection extends AbstractConnection {
         super(config);
     }
 
-    // async query(queryName, queryParams, queryOptions = null) {
-    //     const self = this;
-    //
-    //     // let timeOld;
-    //     // if (queryOptions && queryOptions.time) {
-    //     //     timeOld = Date.now();
-    //     // }
-    //
-    //     const data = await self.client.query(self.queries[queryName], queryParams);
-    //     const {rows} = data;
-    //
-    //     // if (queryOptions && queryOptions.time) {
-    //     //     log.info(`Query ${queryName} execution time: ${Date.now() - timeOld} ms`);
-    //     // }
-    //
-    //     return rows;
-    // }
     async _executeQuery(query) {
         const {rows} = await this.client.query(query);
         return rows;
     }
 
     async rawQuery(queryText, queryParams, queryOptions = null) {
-        // let timeOld;
-        // if (queryOptions && queryOptions.time && queryOptions.queryName) {
-        //     timeOld = Date.now();
-        // }
-
         const {rows} = await this.client.query(queryText, queryParams);
-
-        // if (queryOptions && queryOptions.time) {
-        //     log.info(`Query ${queryOptions.queryName} execution time: ${Date.now() - timeOld} ms`);
-        // }
-
         return rows;
     }
 
@@ -56,9 +29,8 @@ class PostgresConnection extends AbstractConnection {
         }
 
         const preparedQuery = escapeParams(queryText, queryParams);
-        console.log(preparedQuery);
 
-        // return this._executeQuery(preparedQuery);
+        return this._executeQuery(preparedQuery);
     }
 
     getQueryText(queryName) {

connectors/AbstractConnector.js

@@ -10,21 +10,21 @@ class AbstractConnector {
     /**
      * @returns {Promise<AbstractConnection>} Connection
      */
-    async getConnection() {
+    getConnection() {
         throw new TypeError('This method must be overridden!');
     }
 
     /**
      * @param {AbstractConnection} connection Abstract connection
      */
-    async releaseConnection(connection) {
+    releaseConnection(connection) {
         throw new TypeError('This method must be overridden!');
     }
 
     /**
      * @async
      */
-    async closeConnection() {
+    closeConnection() {
         throw new TypeError('This method must be overridden!');
     }
 }

connectors/PostgresConnector.js

@@ -1,5 +1,4 @@
 const {Pool} = require('pg');
-// const log = require('../../../../app/components/log')(module);
 
 const AbstractConnector = require('./AbstractConnector');
 const PostgresConnection = require('../connections/PostgresConnection');