@dionlarson/playwright-orchestrator-pg 1.5.0 → 1.6.0

package/dist/postgresql-adapter.js

@@ -24,40 +24,27 @@ export class PostgreSQLAdapter extends Adapter {
         this.testInfoHistoryTable = pg.escapeIdentifier(`${tableNamePrefix}_test_info_history`);
     }
     async getNextTest(runId, config) {
-        const client = await this.pool.connect();
-        try {
-            console.log(`[pg-adapter] getNextTest: BEGIN transaction`);
-            await client.query('BEGIN');
-            const result = await client.query({
-                text: `WITH next_test AS (
+        // Use UPDATE with subquery and double-check status in outer WHERE.
+        // The subquery's FOR UPDATE SKIP LOCKED finds a Ready row, but the lock
+        // is released when the subquery returns. Adding status=$2 in the outer
+        // WHERE ensures only one transaction succeeds if multiple grab the same order_num.
+        const result = await this.pool.query({
+            text: `UPDATE ${this.testsTable}
+                SET status = $3, updated = NOW()
+                WHERE run_id = $1 AND status = $2 AND order_num = (
                     SELECT order_num FROM ${this.testsTable}
                     WHERE run_id = $1 AND status = $2
                     ORDER BY order_num
                     LIMIT 1
                     FOR UPDATE SKIP LOCKED
                 )
-                UPDATE ${this.testsTable} t
-                SET status = $3, updated = NOW()
-                FROM next_test
-                WHERE t.run_id = $1 AND t.order_num = next_test.order_num
                 RETURNING *`,
-                values: [runId, TestStatus.Ready, TestStatus.Ongoing],
-            });
-            console.log(`[pg-adapter] getNextTest: got ${result.rowCount} rows, order_num=${result.rows[0]?.order_num}`);
-            await client.query('COMMIT');
-            console.log(`[pg-adapter] getNextTest: COMMIT`);
-            if (result.rowCount === 0)
-                return undefined;
-            const { file, line, character, project, timeout, order_num } = result.rows[0];
-            return { file, position: `${line}:${character}`, project, timeout, order: order_num };
-        }
-        catch (e) {
-            console.log(`[pg-adapter] getNextTest: ERROR ${e}, rolling back`);
-            await client.query('ROLLBACK');
-        }
-        finally {
-            client.release();
-        }
+            values: [runId, TestStatus.Ready, TestStatus.Ongoing],
+        });
+        if (result.rowCount === 0)
+            return undefined;
+        const { file, line, character, project, timeout, order_num, title } = result.rows[0];
+        return { file, position: `${line}:${character}`, project, timeout, order: order_num, title };
     }
     async finishTest(params) {
         await this.updateTestWithResults(TestStatus.Passed, params);
@@ -73,7 +60,7 @@ export class PostgreSQLAdapter extends Adapter {
             text: `INSERT INTO ${this.configTable} (id, status, config) VALUES ($1, $2, $3)`,
             values: [runId, RunStatus.Created, JSON.stringify({ ...testRun.config, args, historyWindow })],
         });
-        const fields = ['order_num', 'file', 'line', 'character', 'project', 'timeout'];
+        const fields = ['order_num', 'file', 'line', 'character', 'project', 'timeout', 'title'];
         await this.pool.query({
             text: `INSERT INTO ${this.testsTable} (run_id, ${fields.join(', ')}) VALUES ${tests
                 .map((_, i) => {
@@ -84,9 +71,9 @@ export class PostgreSQLAdapter extends Adapter {
                 .join(', ')}`,
             values: [
                 runId,
-                ...tests.flatMap(({ position, order, file, project, timeout }) => {
+                ...tests.flatMap(({ position, order, file, project, timeout, title }) => {
                     const [line, character] = position.split(':');
-                    return [order, file, line, character, project, timeout];
+                    return [order, file, line, character, project, timeout, title];
                 }),
             ],
         });
@@ -107,12 +94,14 @@ export class PostgreSQLAdapter extends Adapter {
                 character INT NOT NULL,
                 project TEXT NOT NULL,
                 timeout INT NOT NULL,
+                title TEXT NOT NULL DEFAULT '',
                 updated TIMESTAMP NOT NULL DEFAULT NOW(),
                 report JSONB,
                 PRIMARY KEY (run_id, order_num),
                 FOREIGN KEY (run_id) REFERENCES ${this.configTable}(id)
             );
             CREATE INDEX IF NOT EXISTS status_idx ON ${this.testsTable}(status);
+            ALTER TABLE ${this.testsTable} ADD COLUMN IF NOT EXISTS title TEXT NOT NULL DEFAULT '';
             CREATE TABLE IF NOT EXISTS ${this.testInfoTable} (
                 id SERIAL PRIMARY KEY,
                 name TEXT NOT NULL,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dionlarson/playwright-orchestrator-pg",
-    "version": "1.5.0",
+    "version": "1.6.0",
     "keywords": [],
     "author": "Rostyslav Kudrevatykh",
     "license": "Apache-2.0",