imodel-pg 0.19.2 → 0.19.3

package/index.d.mts

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.19.2
+ * imodel v0.19.3
  * (c) 2019-2026 undefined
  * @license undefined
  */

package/index.mjs

@@ -1,5 +1,5 @@
 /*!
- * imodel v0.19.2
+ * imodel v0.19.3
  * (c) 2019-2026 undefined
  * @license undefined
  */
@@ -1734,6 +1734,144 @@ async function syncTables(env, query, tables, schema) {
   }
 }
 
+/** @import { Environment } from 'imodel' */
+/** @import { PgEnvTrans } from './index.mjs' */
+/**
+ *
+ * @param {string?} [detail]
+ * @returns
+ */
+function parseUniqueViolationErrorColumns(detail) {
+  const match = /^[^"]*"(.*)"[^"]*$/.exec(detail || '');
+  const colsStr = match?.[1];
+  if (!colsStr) {
+    return [];
+  }
+  const cols = [];
+  let i = 1;
+  for (; i < colsStr.length; i++) {
+    const char = colsStr[i];
+    if (char === ' ' || char === ',') {
+      continue;
+    }
+    if (char === ')') {
+      break;
+    }
+    const list = [];
+    if (char === '"') {
+      i++;
+      for (; i < colsStr.length; i++) {
+        const char = colsStr[i];
+        if (char === '"') {
+          if (colsStr[i + 1] !== '"') {
+            break;
+          }
+          i++;
+        }
+        list.push(char);
+      }
+    } else {
+      for (; i < colsStr.length; i++) {
+        const char = colsStr[i];
+        if (char === ' ') {
+          continue;
+        }
+        if (char === ')' || char === ',') {
+          i--;
+          break;
+        }
+        list.push(char);
+      }
+    }
+    cols.push(list.join(''));
+    continue;
+  }
+  return cols;
+}
+/** @type {Record<string, (e: pg.DatabaseError, env: Environment<PgEnvTrans>) => any>} */
+const errors = {
+  '22P02'(error, {
+    errors
+  }) {
+    return new errors.InvalidInputSyntaxError(error.message);
+  },
+  23502(error, {
+    errors
+  }) {
+    const {
+      table,
+      column
+    } = error;
+    if (!table || !column) {
+      return;
+    }
+    return new errors.NotNullViolationError(table, column);
+  },
+  23505(error, {
+    errors
+  }) {
+    const {
+      table,
+      detail
+    } = error;
+    if (!table) {
+      return;
+    }
+    return new errors.UniqueViolationError(table, parseUniqueViolationErrorColumns(detail));
+  },
+  23503(error, {
+    errors
+  }) {
+    const {
+      table,
+      column,
+      constraint
+    } = error;
+    if (!table || !column) {
+      return;
+    }
+    return new errors.ForeignKeyViolationError(table, column, constraint);
+  },
+  42883(error, {
+    errors
+  }) {
+    return new errors.OperatorMismatchError(error.message);
+  }
+};
+const errorGroup = {
+  22: 'data',
+  23: 'constraint',
+  24: 'cursor',
+  25: 'transaction'
+};
+/**
+ *
+ * @param {pg.DatabaseError} error
+ * @param {Environment<PgEnvTrans>} env
+ */
+function errorConvert(error, env) {
+  if (!(error instanceof pg.DatabaseError)) {
+    return error;
+  }
+  const {
+    code
+  } = error;
+  if (!code) {
+    throw error;
+  }
+  const convert = Object.hasOwn(errors, code) ? errors[code] : null;
+  const converted = convert?.(error, env);
+  if (converted) {
+    return converted;
+  }
+  if (typeof code !== 'string' || code.length !== 5) {
+    return error;
+  }
+  const group = code.slice(0, 2);
+  const groupCode = Object.hasOwn(errorGroup, group) && errorGroup[group];
+  return new env.errors.ConnectionError(groupCode ? `${groupCode}::pg:${code}` : `:pg:${code}`, error.message);
+}
+
 /** @import { Environment, IConnection } from 'imodel' */
 const {
   types
@@ -1862,22 +2000,19 @@ function index (pool, version) {
     const {
       transaction
     } = env;
-    const transactionClient = transaction?.client;
-    if (transactionClient) {
-      const client = await Promise.resolve(transactionClient);
-      return client.query({
-        text,
-        values: [...values]
-      });
-    }
-    const client = await connect();
+    const transactionClient = await Promise.resolve(transaction?.client);
+    const client = transactionClient || (await connect());
     try {
       return await client.query({
         text,
         values: [...values]
       });
+    } catch (error) {
+      throw errorConvert(error, env) || error;
     } finally {
-      client.release();
+      if (!transactionClient) {
+        client.release();
+      }
     }
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imodel-pg",
-  "version": "0.19.2",
+  "version": "0.19.3",
   "dependencies": {
     "pg": "^8.13.3",
     "tagged-sql": "^0.9.0"