Some tests and little fixes

Author: Pavel Romanov

connections/abstract-connection.js

@@ -21,7 +21,7 @@ class AbstractConnection {
     /**
      * @abstract
      * @async
-     * @param {{name: String, sql:String, addonds: Object}} queryObject query data
+     * @param {{name: String, sql:String, addons: Object}} queryObject query data
      * @param {Object} queryParams named params
      * @param {Object} queryOptions options
      * @returns {Promise<Array>} query result

connections/postgres-connection.js

@@ -12,7 +12,7 @@ class PostgresConnection extends AbstractConnection {
      * @private
      */
     async _executeQuery(query, params) {
-        const {rows} = await this.client.query(query);
+        const {rows} = await this.client.query(query, params);
         return rows;
     }
 
@@ -29,7 +29,10 @@ class PostgresConnection extends AbstractConnection {
      */
     query(queryObject, queryParams, queryOptions = {}) {
         const {sql, addons} = queryObject;
-        const {templateParams} = queryOptions;
+        if (!sql) {
+            throw new TypeError('Invalid query object, "sql" property missing');
+        }
+        const {templateParams = {}} = queryOptions;
         let queryText = sql;
 
         if (addons) {

package.json

@@ -8,7 +8,7 @@
   "license": "MIT",
   "version": "0.0.2",
   "scripts": {
-    "autofix": "eslint --fix .",
+    "autofix": "eslint --fix ."
   },
   "dependencies": {
     "pg": "^7.4.1",

test/postgres-connection.test.js

@@ -1,8 +1,72 @@
-const jest = require('jest');
-const QueryTemplater = require('query-template');
-
-jest.mock('query-template');
+// const jest = require('jest');
+const PostgresConnection = require('../connections/postgres-connection.js');
 
 describe('Postgres connection', () => {
+    const client = {
+        query: jest.fn((query, params) => Promise.resolve({query, params})),
+    };
+
+    beforeEach(() => {
+        client.query.mockClear();
+    });
+
+    const pq = new PostgresConnection({
+        client,
+        type: 'pg',
+    });
+
+    test('should handle simple query with right format', async () => {
+        const query = {
+            sql: 'SELECT * FROM table WHERE field1 = :field1 {{t1}}',
+            addons: {
+                t1: {
+                    sql: 'AND field2 = :field2',
+                    options: {propertyName: 'field2t'},
+                },
+            },
+        };
+
+        await pq.query(query, {field1: 1, field2: 2}, {templateParams: {field2t: true}});
+        expect(client.query.mock.calls[0][0]).toBe('SELECT * FROM table WHERE field1 = $1 AND field2 = $2');
+        expect(client.query.mock.calls[0][1]).toMatchObject([1, 2]);
+    });
+
+    test('should handle simple query without template params', async () => {
+        const query = {
+            sql: 'SELECT * FROM table WHERE field1 = :field1 {{t1}}',
+            addons: {
+                t1: {
+                    sql: 'AND field2 = :field2',
+                    options: {propertyName: 'field2'},
+                },
+            },
+        };
+
+        await pq.query(query, {field1: 1, field2: 2});
+        expect(client.query.mock.calls[0][0]).toBe('SELECT * FROM table WHERE field1 = $1 AND field2 = $2');
+        expect(client.query.mock.calls[0][1]).toMatchObject([1, 2]);
+    });
+
+    test('should handle simple query without templates', async () => {
+        const query = {
+            sql: 'SELECT * FROM table WHERE field1 = :field1',
+        };
+
+        await pq.query(query, {field1: 1, field2: 2});
+        expect(client.query.mock.calls[0][0]).toBe('SELECT * FROM table WHERE field1 = $1');
+        expect(client.query.mock.calls[0][1]).toMatchObject([1]);
+    });
+
+    test('should throw on invalid query format', async () => {
+        const query = {
+            addons: {
+                t1: {
+                    sql: 'AND field2 = :field2',
+                    options: {propertyName: 'field2'},
+                },
+            },
+        };
 
-});
+        expect(() => pq.query(query, {field1: 1, field2: 2})).toThrow(/sql/);
+    });
+});