@vibeorm/adapter-pg 1.0.2 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibeorm/adapter-pg",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "node-postgres adapter for VibeORM — use VibeORM with pg on Bun or Node.js",
   "license": "MIT",
   "keywords": [
@@ -31,7 +31,7 @@
     "url": "https://github.com/vibeorm/vibeorm/issues"
   },
   "dependencies": {
-    "@vibeorm/runtime": "1.0.2"
+    "@vibeorm/runtime": "1.1.0"
   },
   "peerDependencies": {
     "pg": ">=8"

package/src/index.ts

@@ -5,7 +5,8 @@
  * named prepared statement caching for PostgreSQL plan reuse.
  */
 
-import type { DatabaseAdapter, QueryResult } from "@vibeorm/runtime";
+import type { DatabaseAdapter, QueryResult, TransactionOptions } from "@vibeorm/runtime";
+import { normalizeError } from "@vibeorm/runtime";
 
 /**
  * Options for creating a pg adapter.
@@ -226,30 +227,41 @@ export function pgAdapter(options?: PgAdapterOptions): DatabaseAdapter {
   }
 
   function createClientAdapter(client: PgPoolClient): DatabaseAdapter {
+    let savepointCounter = 0;
+
     return {
       async execute(params) {
-        const config = buildQueryConfig(params);
-        const result = await client.query(config);
-        return result.rows;
+        try {
+          const config = buildQueryConfig(params);
+          const result = await client.query(config);
+          return result.rows;
+        } catch (err) {
+          throw normalizeError({ error: err });
+        }
       },
 
       async executeUnsafe(params) {
-        const values = params.values ? serializeParams({ values: params.values }) : undefined;
-        const result = await client.query(params.text, values);
-        const affectedRows = result.rowCount ?? 0;
-        return { rows: result.rows, affectedRows };
+        try {
+          const values = params.values ? serializeParams({ values: params.values }) : undefined;
+          const result = await client.query(params.text, values);
+          const affectedRows = result.rowCount ?? 0;
+          return { rows: result.rows, affectedRows };
+        } catch (err) {
+          throw normalizeError({ error: err });
+        }
       },
 
       async transaction<T>(fn: (txAdapter: DatabaseAdapter) => Promise<T>): Promise<T> {
-        // Nested transactions use SAVEPOINTs
-        await client.query("SAVEPOINT vibeorm_nested");
+        // Nested transactions use unique SAVEPOINTs
+        const spName = `vibeorm_sp_${savepointCounter++}`;
+        await client.query(`SAVEPOINT ${spName}`);
         try {
           const nestedAdapter = createClientAdapter(client);
           const result = await fn(nestedAdapter);
-          await client.query("RELEASE SAVEPOINT vibeorm_nested");
+          await client.query(`RELEASE SAVEPOINT ${spName}`);
           return result;
         } catch (err) {
-          await client.query("ROLLBACK TO SAVEPOINT vibeorm_nested");
+          await client.query(`ROLLBACK TO SAVEPOINT ${spName}`);
           throw err;
         }
       },
@@ -269,34 +281,58 @@ export function pgAdapter(options?: PgAdapterOptions): DatabaseAdapter {
     };
   }
 
+  function isolationLevelToSql(params: { level: NonNullable<TransactionOptions["isolationLevel"]> }): string {
+    switch (params.level) {
+      case "ReadCommitted": return "READ COMMITTED";
+      case "RepeatableRead": return "REPEATABLE READ";
+      case "Serializable": return "SERIALIZABLE";
+    }
+  }
+
   const adapter: DatabaseAdapter = {
     async execute(params) {
-      const p = getPool();
-      const config = buildQueryConfig(params);
-      const result = await p.query(config);
-      return result.rows;
+      try {
+        const p = getPool();
+        const config = buildQueryConfig(params);
+        const result = await p.query(config);
+        return result.rows;
+      } catch (err) {
+        throw normalizeError({ error: err });
+      }
     },
 
     async executeUnsafe(params) {
-      const p = getPool();
-      const values = params.values ? serializeParams({ values: params.values }) : undefined;
-      const result = await p.query(params.text, values);
-      const affectedRows = result.rowCount ?? 0;
-      return { rows: result.rows, affectedRows };
+      try {
+        const p = getPool();
+        const values = params.values ? serializeParams({ values: params.values }) : undefined;
+        const result = await p.query(params.text, values);
+        const affectedRows = result.rowCount ?? 0;
+        return { rows: result.rows, affectedRows };
+      } catch (err) {
+        throw normalizeError({ error: err });
+      }
     },
 
-    async transaction<T>(fn: (txAdapter: DatabaseAdapter) => Promise<T>): Promise<T> {
+    async transaction<T>(fn: (txAdapter: DatabaseAdapter) => Promise<T>, options?: TransactionOptions): Promise<T> {
       const p = getPool();
       const client = await p.connect();
       try {
-        await client.query("BEGIN");
+        const isolation = options?.isolationLevel
+          ? ` ISOLATION LEVEL ${isolationLevelToSql({ level: options.isolationLevel })}`
+          : "";
+        await client.query(`BEGIN${isolation}`);
+
+        if (options?.timeout) {
+          await client.query(`SET LOCAL statement_timeout = ${Number(options.timeout)}`);
+        }
+
         const txAdapter = createClientAdapter(client);
         const result = await fn(txAdapter);
         await client.query("COMMIT");
         return result;
       } catch (err) {
         await client.query("ROLLBACK");
-        throw err;
+        throw normalizeError({ error: err });
       } finally {
         client.release();
       }