@dionlarson/playwright-orchestrator-mysql 1.5.0 → 1.6.0

package/dist/mysql-adapter.d.ts

@@ -14,6 +14,7 @@ export declare class MySQLAdapter extends Adapter {
     failTest(params: ResultTestParams): Promise<void>;
     saveTestRun({ runId, testRun, args, historyWindow }: SaveTestRunParams): Promise<void>;
     initialize(): Promise<void>;
+    private addTitleColumnIfNeeded;
     startShard(runId: string): Promise<TestRunConfig>;
     finishShard(runId: string): Promise<void>;
     dispose(): Promise<void>;

package/dist/mysql-adapter.js

@@ -42,31 +42,27 @@ export class MySQLAdapter extends Adapter {
         const client = await this.pool.getConnection();
         try {
             await client.beginTransaction();
-            const [result] = await client.query(`SET @order_num = (SELECT order_num FROM ??
-                    WHERE run_id = UUID_TO_BIN(?) AND status = ?
-                    ORDER BY order_num
-                    LIMIT 1
-                    FOR UPDATE SKIP LOCKED);
-                UPDATE ??
-                SET status = ?, updated = CURRENT_TIMESTAMP
-                WHERE run_id = UUID_TO_BIN(?) AND order_num = @order_num;
-                
-                SELECT * FROM ??
-                WHERE run_id = UUID_TO_BIN(?) AND order_num = @order_num`, [
-                this.testsTable,
-                runId,
-                TestStatus.Ready,
+            // Use UPDATE ... ORDER BY ... LIMIT 1 for truly atomic claim.
+            // This locks exactly one row during the UPDATE, preventing race conditions.
+            // Store the claimed order_num in a session variable for the subsequent SELECT.
+            const [result] = await client.query(`UPDATE ?? SET status = ?, updated = CURRENT_TIMESTAMP, order_num = (@claimed_order := order_num)
+                WHERE run_id = UUID_TO_BIN(?) AND status = ?
+                ORDER BY order_num
+                LIMIT 1;
+
+                SELECT * FROM ?? WHERE run_id = UUID_TO_BIN(?) AND order_num = @claimed_order`, [
                 this.testsTable,
                 TestStatus.Ongoing,
                 runId,
+                TestStatus.Ready,
                 this.testsTable,
                 runId,
             ]);
             await client.commit();
-            if (result[2].length === 0)
+            if (result[1].length === 0)
                 return undefined;
-            const { file, line, pos, project, timeout, order_num } = result[2][0];
-            return { file, position: `${line}:${pos}`, project, timeout, order: order_num };
+            const { file, line, pos, project, timeout, order_num, title } = result[1][0];
+            return { file, position: `${line}:${pos}`, project, timeout, order: order_num, title };
         }
         catch (e) {
             await client.rollback();
@@ -86,9 +82,9 @@ export class MySQLAdapter extends Adapter {
         let tests = this.transformTestRunToItems(testRun.testRun);
         const testInfos = await this.loadTestInfos(tests);
         tests = this.sortTests(tests, testInfos, { historyWindow });
-        const testValues = tests.map(({ position, order, file, project, timeout }) => {
+        const testValues = tests.map(({ position, order, file, project, timeout, title }) => {
             const [line, character] = position.split(':');
-            return [runId, order, file, +line, +character, project, timeout];
+            return [runId, order, file, +line, +character, project, timeout, title];
         });
         const values = [
             this.configTable,
@@ -101,8 +97,8 @@ export class MySQLAdapter extends Adapter {
         await this.pool.query({
             sql: `
             INSERT INTO ?? (id, status, config) VALUES (UUID_TO_BIN(?), ?, ?);
-            INSERT INTO ?? (run_id, order_num, file, line, pos, project, timeout) VALUES ${testValues
-                .map(() => '(UUID_TO_BIN(?), ?, ?, ?, ?, ?, ?)')
+            INSERT INTO ?? (run_id, order_num, file, line, pos, project, timeout, title) VALUES ${testValues
+                .map(() => '(UUID_TO_BIN(?), ?, ?, ?, ?, ?, ?, ?)')
                 .join(', ')}`,
             values: values,
         });
@@ -124,6 +120,7 @@ export class MySQLAdapter extends Adapter {
                 pos INT NOT NULL,
                 project TEXT NOT NULL,
                 timeout INT NOT NULL,
+                title TEXT NOT NULL DEFAULT '',
                 updated TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
                 report JSON,
                 PRIMARY KEY (run_id, order_num),
@@ -156,6 +153,21 @@ export class MySQLAdapter extends Adapter {
                 this.testInfoTable,
             ],
         });
+        // Migration: add title column if it doesn't exist (for existing databases)
+        await this.addTitleColumnIfNeeded();
+    }
+    async addTitleColumnIfNeeded() {
+        try {
+            await this.pool.query({
+                sql: `ALTER TABLE ?? ADD COLUMN title TEXT NOT NULL DEFAULT ''`,
+                values: [this.testsTable],
+            });
+        }
+        catch (e) {
+            // Error code 1060 = Duplicate column name (column already exists)
+            if (e.errno !== 1060)
+                throw e;
+        }
     }
     async startShard(runId) {
         const client = await this.pool.getConnection();

package/package.json

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