@pi-r/postgres 0.6.1 → 0.6.2

package/README.md

@@ -1,5 +1,7 @@
 ### @pi-r/postgres
 
+https://e-mc.readthedocs.io/en/latest/db/postgres.html
+
 ### LICENSE
 
 MIT

package/client/index.js

@@ -62,7 +62,15 @@ function fromConnectionString(credential, uri) {
     }
     return credential;
 }
-const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '5432') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.connectionString || '');
+function getPoolKey(credential) {
+    if (credential.host && credential.user) {
+        if ('uuidKey' in credential) {
+            credential = { ...credential };
+            delete credential.uuidKey;
+        }
+        return JSON.stringify(credential);
+    }
+}
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
     credential.host || (credential.host = auth.hostname);
@@ -106,18 +114,19 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if (typeof usePool === 'string' && (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username)) {
-        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-        if (pool) {
-            pool.add(item, password);
+    if ((0, types_1.isString)(usePool)) {
+        if (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username) {
+            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+            if (pool) {
+                pool.add(item, password);
+                return;
+            }
+        }
+        if (!password) {
+            item.usePool = '';
             return;
         }
     }
-    const poolKey = getPoolKey(credential);
-    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
-        pool.add(item);
-        return;
-    }
     const config = this.getPoolConfig("postgres" /* STRINGS.MODULE_NAME */, password);
     if (config) {
         const { min, max, idle, timeout } = config;
@@ -134,6 +143,11 @@ function setCredential(item) {
             credential.connectionTimeoutMillis ?? (credential.connectionTimeoutMillis = timeout);
         }
     }
+    const poolKey = getPoolKey(credential);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
     new PostgresPool(new postgres.Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.1",
-    "@e-mc/types": "^0.8.1",
+    "@e-mc/db": "^0.8.2",
+    "@e-mc/types": "^0.8.2",
     "pg": "^8.11.3",
     "pg-connection-string": "^2.6.2",
     "pg-query-stream": "^4.5.3"

package/types/index.d.ts

@@ -2,7 +2,6 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 
-// @ts-ignore
 import type { PoolConfig, QueryArrayConfig } from 'pg';
 
 export interface PostgresDataSource<T = unknown[]> extends DbDataSource<string | QueryArrayConfig, unknown, unknown, string | PostgresCredential, string>, ExecuteAction<T> {