@pi-r/postgres 0.12.0 → 0.12.2

package/client/index.js

@@ -159,6 +159,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         outResult ||= new Array(length);
     }
     const caching = this.hasCache("postgres", sessionKey);
+    const sortKeys = this.settingsOf("postgres", 'cache', 'sort_keys') === true;
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
@@ -233,11 +234,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState = 1;
         const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres", 'options', credential) && asFunction(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
-        let queryString = '';
+        let queryString = '', cacheCredential;
         if (caching && ignoreCache !== true) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true) + (streamRow && item.options && isString(query) ? Db.asString(item.options, true) : '');
+            cacheCredential = DbPool.sanitize(credential, sortKeys);
             if (ignoreCache !== 1) {
-                const result = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
+                const result = this.getQueryResult(source, cacheCredential, queryString, cacheValue);
                 if (result) {
                     if (parallel) {
                         tasks[i] = Promise.resolve(result);
@@ -296,7 +298,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         else {
                             this.add(item, 4);
-                            resolve(!error ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : rows);
+                            resolve(!error ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : rows);
                         }
                     })
                         .on('end', () => stream.destroy());
@@ -304,7 +306,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 else {
                     const { rows, command } = await client.query(query, params);
                     this.add(item, 4);
-                    resolve(rows.length || command === 'SELECT' ? this.setQueryResult(source, DbPool.sanitize(credential), queryString, rows, cacheValue) : null);
+                    resolve(rows.length > 0 || command === 'SELECT' ? this.setQueryResult(source, cacheCredential, queryString, rows, cacheValue) : null);
                 }
             }
             catch (err) {

package/client/pool.js

@@ -11,12 +11,12 @@ class PostgresPool extends DbPool {
         }
         return super.asString(credential);
     }
-    static sanitize(credential) {
+    static sanitize(credential, sort) {
         if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
             return credential;
         }
         const ssl = credential.ssl;
-        let result = super.sanitize(credential);
+        let result = super.sanitize(credential, sort);
         if (isObject(ssl)) {
             if (result === credential) {
                 result = { ...credential };

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/anpham6/pi-r.git",
@@ -20,13 +17,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.14.0",
-    "@e-mc/types": "^0.14.0",
-    "pg": "^8.20.0",
-    "pg-connection-string": "^2.12.0",
-    "pg-query-stream": "^4.14.0"
-  },
-  "peerDependencies": {
-    "@types/pg": "^8"
+    "@e-mc/db": "^0.14.3",
+    "@e-mc/types": "^0.14.3",
+    "pg": "^8.21.0",
+    "pg-connection-string": "^2.13.0",
+    "pg-query-stream": "^4.15.0"
   }
 }