graphile-test 5.14.4 → 5.14.6

package/context.js

@@ -165,38 +165,38 @@ const runGraphQLInContext = async ({ input, conn, schema, resolvedPreset, pgServ
         // Include additional request options (excluding pgSettings to avoid duplication)
         ...Object.fromEntries(Object.entries(reqOptions).filter(([key]) => key !== 'pgSettings')),
     };
+    // Check if we're in a transaction by looking at the test client's transaction state
+    // When useRoot is true, we might not be in a transaction
+    // pgsql-test's `db` client is in a transaction, but `pg` (root) client may not be
+    const isInTransaction = !input.useRoot;
     // Provide a custom withPgClient function that uses the test client
     // This ensures GraphQL operations run within the test transaction
     // instead of getting a new connection from the pool
     const withPgClientKey = pgService.withPgClientKey ?? 'withPgClient';
     contextValue[withPgClientKey] = async (_pgSettings, callback) => {
         // Augment the client with withTransaction if it doesn't already have it.
-        // In production, @dataplan/pg provides this method. In tests the raw pg
-        // Client lacks it, so we implement it via savepoints (which nest cleanly
-        // inside the test harness's outer transaction).
+        // In production @dataplan/pg provides this method; a raw pg Client lacks
+        // it. Like @dataplan/pg's client, nest with a savepoint when a transaction
+        // is already open and open a real one otherwise.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const client = pgClient;
         if (typeof client.withTransaction !== 'function') {
             client.withTransaction = async (cb) => {
                 const sp = `wt_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-                await client.query(`SAVEPOINT ${sp}`);
+                await client.query(isInTransaction ? `SAVEPOINT ${sp}` : 'BEGIN');
                 try {
                     const result = await cb(client);
-                    await client.query(`RELEASE SAVEPOINT ${sp}`);
+                    await client.query(isInTransaction ? `RELEASE SAVEPOINT ${sp}` : 'COMMIT');
                     return result;
                 }
                 catch (err) {
-                    await client.query(`ROLLBACK TO SAVEPOINT ${sp}`);
+                    await client.query(isInTransaction ? `ROLLBACK TO SAVEPOINT ${sp}` : 'ROLLBACK');
                     throw err;
                 }
             };
         }
         return callback(pgClient);
     };
-    // Check if we're in a transaction by looking at the test client's transaction state
-    // When useRoot is true, we might not be in a transaction
-    // pgsql-test's `db` client is in a transaction, but `pg` (root) client may not be
-    const isInTransaction = !input.useRoot;
     // Wrap the entire query execution in a savepoint if we're in a transaction
     // This matches v4 PostGraphile behavior where each mutation is wrapped in a savepoint
     // allowing the transaction to continue after a database error

package/esm/context.js

@@ -161,38 +161,38 @@ export const runGraphQLInContext = async ({ input, conn, schema, resolvedPreset,
         // Include additional request options (excluding pgSettings to avoid duplication)
         ...Object.fromEntries(Object.entries(reqOptions).filter(([key]) => key !== 'pgSettings')),
     };
+    // Check if we're in a transaction by looking at the test client's transaction state
+    // When useRoot is true, we might not be in a transaction
+    // pgsql-test's `db` client is in a transaction, but `pg` (root) client may not be
+    const isInTransaction = !input.useRoot;
     // Provide a custom withPgClient function that uses the test client
     // This ensures GraphQL operations run within the test transaction
     // instead of getting a new connection from the pool
     const withPgClientKey = pgService.withPgClientKey ?? 'withPgClient';
     contextValue[withPgClientKey] = async (_pgSettings, callback) => {
         // Augment the client with withTransaction if it doesn't already have it.
-        // In production, @dataplan/pg provides this method. In tests the raw pg
-        // Client lacks it, so we implement it via savepoints (which nest cleanly
-        // inside the test harness's outer transaction).
+        // In production @dataplan/pg provides this method; a raw pg Client lacks
+        // it. Like @dataplan/pg's client, nest with a savepoint when a transaction
+        // is already open and open a real one otherwise.
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const client = pgClient;
         if (typeof client.withTransaction !== 'function') {
             client.withTransaction = async (cb) => {
                 const sp = `wt_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
-                await client.query(`SAVEPOINT ${sp}`);
+                await client.query(isInTransaction ? `SAVEPOINT ${sp}` : 'BEGIN');
                 try {
                     const result = await cb(client);
-                    await client.query(`RELEASE SAVEPOINT ${sp}`);
+                    await client.query(isInTransaction ? `RELEASE SAVEPOINT ${sp}` : 'COMMIT');
                     return result;
                 }
                 catch (err) {
-                    await client.query(`ROLLBACK TO SAVEPOINT ${sp}`);
+                    await client.query(isInTransaction ? `ROLLBACK TO SAVEPOINT ${sp}` : 'ROLLBACK');
                     throw err;
                 }
             };
         }
         return callback(pgClient);
     };
-    // Check if we're in a transaction by looking at the test client's transaction state
-    // When useRoot is true, we might not be in a transaction
-    // pgsql-test's `db` client is in a transaction, but `pg` (root) client may not be
-    const isInTransaction = !input.useRoot;
     // Wrap the entire query execution in a savepoint if we're in a transaction
     // This matches v4 PostGraphile behavior where each mutation is wrapped in a savepoint
     // allowing the transaction to continue after a database error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphile-test",
-  "version": "5.14.4",
+  "version": "5.14.6",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostGraphile Testing",
   "main": "index.js",
@@ -34,9 +34,9 @@
     "makage": "^0.8.0"
   },
   "dependencies": {
-    "@constructive-io/graphql-env": "^3.31.3",
-    "@constructive-io/graphql-types": "^3.30.3",
-    "@pgpmjs/types": "^2.53.1",
+    "@constructive-io/graphql-env": "^3.32.1",
+    "@constructive-io/graphql-types": "^3.31.1",
+    "@pgpmjs/types": "^2.53.3",
     "grafast": "1.1.2",
     "graphile-build": "5.1.1",
     "graphile-build-pg": "5.1.3",
@@ -44,7 +44,7 @@
     "graphql": "16.13.0",
     "mock-req": "^0.2.0",
     "pg": "^8.21.0",
-    "pgsql-test": "^5.13.4",
+    "pgsql-test": "^5.13.6",
     "postgraphile": "5.1.4"
   },
   "keywords": [
@@ -55,5 +55,5 @@
     "pgpm",
     "test"
   ],
-  "gitHead": "6e2d71a9eb4e1f49f0de0b2b594b2f811de97442"
+  "gitHead": "27be33dc1ba8351e2a2c2bbb99b9c0798c0813b9"
 }