mythix-orm-postgresql 1.8.0 → 1.9.0

package/lib/postgresql-connection.js

@@ -76,11 +76,11 @@ class PostgreSQLConnection extends SQLConnectionBase {
       },
       options,
       {
-        statement_timeout:                    options.statementTimeout || DEFAULT_TIMEOUT_MS,
-        query_timeout:                        options.queryTimeout || DEFAULT_TIMEOUT_MS,
-        connectionTimeoutMillis:              options.connectionTimeout || 60000,
-        idle_in_transaction_session_timeout:  options.idleTransactionTimeout,
-        max:                                  options.maxPoolConnections,
+        statement_timeout:                   options.statementTimeout || DEFAULT_TIMEOUT_MS,
+        query_timeout:                       options.queryTimeout || DEFAULT_TIMEOUT_MS,
+        connectionTimeoutMillis:             options.connectionTimeout || 60000,
+        idle_in_transaction_session_timeout: options.idleTransactionTimeout,
+        max:                                 options.maxPoolConnections,
       },
     );
 
@@ -180,7 +180,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
       }
 
       if (logger && sql.text)
-        console.log('QUERY: ', sql.text);
+        logger.log('QUERY: ', sql.text);
 
       let result;
 
@@ -192,6 +192,13 @@ class PostgreSQLConnection extends SQLConnectionBase {
       if (client && hasOwnClient)
         await client.release();
 
+      if (logger && options.logResponse) {
+        logger.log('QUERY RESULT: ', {
+          columns: (result.fields) ? result.fields.map((field) => field.name) : [],
+          result:  (result.rows) ? result.rows : result,
+        });
+      }
+
       return this.formatResultsResponse(sql, result);
     } catch (error) {
       if (client && hasOwnClient)
@@ -208,6 +215,16 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
   }
 
+  formatResultsResponse(sqlStatement, result) {
+    if (!result.rows || !result.fields)
+      return result;
+
+    return {
+      rows:    result.rows,
+      columns: result.fields.map((field) => field.name),
+    };
+  }
+
   async transaction(callback, _options, _retryCount) {
     let options       = _options || {};
     let inheritedThis = Object.create(options.connection || this.getContextValue('connection', this));
@@ -295,16 +312,6 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
   }
 
-  formatResultsResponse(sqlStatement, result) {
-    if (!result.rows || !result.fields)
-      return result;
-
-    return {
-      rows:     result.rows,
-      columns:  result.fields.map((field) => field.name),
-    };
-  }
-
   async truncate(Model, options) {
     let queryGenerator  = this.getQueryGenerator();
     let sqlStatement    = queryGenerator.generateTruncateTableStatement(Model, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "PostgreSQL driver for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-postgresql#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.10.2",
-    "mythix-orm-sql-base": "^1.8.0"
+    "mythix-orm": "^1.11.0",
+    "mythix-orm-sql-base": "^1.9.0"
   },
   "dependencies": {
     "luxon": "^3.1.0",