Reconcile #648 with current 0.6 release fixes

.github/workflows/ci.yml

@@ -204,14 +204,18 @@ jobs:
   # canonical, so this leg re-runs it with the queue-storage engine active on a
   # fresh database (a separate DB avoids cross-engine job_unique_claims carryover).
   rust-test-queue-storage:
-    name: Rust tests (queue_storage)
+    name: Rust tests (queue_storage, pg${{ matrix.postgres }})
     needs: [rust-build]
     if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'full-ci')
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        postgres: ["17", "18"]
     services:
       postgres:
-        image: postgres:17-alpine
+        image: postgres:${{ matrix.postgres }}-alpine
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: awa_test
@@ -314,10 +318,14 @@ jobs:
 
   # ─── Python (awa-python) ────────────────────────────────
   python-build-test:
-    name: Python build + test
+    name: Python build + test (${{ matrix.python }})
     if: github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'full-ci')
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.14", "3.15"]
     services:
       postgres:
         image: postgres:17-alpine
@@ -342,7 +350,7 @@ jobs:
           workspaces: "awa-python -> awa-python/target"
       - uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
+          python-version: ${{ matrix.python }}
       - name: Install uv
         uses: astral-sh/setup-uv@v8.2.0
       - name: Create venv and install deps

Cargo.toml

@@ -14,7 +14,7 @@ members = [
 exclude = ["awa-python", "spike"]
 
 [workspace.package]
-version = "0.6.13"
+version = "0.6.14"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Postgres-native background job queue — transactional enqueue, heartbeat crash recovery, SKIP LOCKED dispatch"
@@ -25,11 +25,11 @@ categories = ["database", "asynchronous", "web-programming"]
 
 [workspace.dependencies]
 # Internal crates
-awa-model = { path = "awa-model", version = "0.6.13" }
-awa-macros = { path = "awa-macros", version = "0.6.13" }
-awa-metrics = { path = "awa-metrics", version = "0.6.13" }
-awa-worker = { path = "awa-worker", version = "0.6.13" }
-awa = { path = "awa", version = "0.6.13" }
+awa-model = { path = "awa-model", version = "0.6.14" }
+awa-macros = { path = "awa-macros", version = "0.6.14" }
+awa-metrics = { path = "awa-metrics", version = "0.6.14" }
+awa-worker = { path = "awa-worker", version = "0.6.14" }
+awa = { path = "awa", version = "0.6.14" }
 
 # Database
 sea-orm = { version = "=2.0.0-rc.38", default-features = false, features = ["sqlx-postgres", "runtime-tokio-rustls", "with-chrono", "with-json"] }

awa-cli/Cargo.toml

@@ -14,7 +14,7 @@ path = "src/main.rs"
 [dependencies]
 awa-model.workspace = true
 awa-worker.workspace = true
-awa-ui = { path = "../awa-ui", version = "0.6.13" }
+awa-ui = { path = "../awa-ui", version = "0.6.14" }
 axum.workspace = true
 sqlx.workspace = true
 tokio.workspace = true
@@ -28,5 +28,5 @@ hex.workspace = true
 uuid.workspace = true
 
 [dev-dependencies]
-awa-testing = { path = "../awa-testing", version = "0.6.13" }
+awa-testing = { path = "../awa-testing", version = "0.6.14" }
 assert_cmd = "2"

awa-cli/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "awa-cli"
-version = "0.6.13"
+version = "0.6.14"
 description = "CLI for the Awa Postgres-native job queue (migrations, admin, serve)"
 readme = "README.md"
 requires-python = ">=3.10"

awa-cli/src/main.rs

@@ -29,7 +29,7 @@ enum Commands {
         #[arg(long)]
         extract_to: Option<String>,
         /// Print migration SQL to stdout instead of applying
-        #[arg(long)]
+        #[arg(long, conflicts_with = "extract_to")]
         sql: bool,
         /// Only include migrations after this version (exclusive)
         #[arg(long)]

awa-model/migrations/v023_install_queue_storage_substrate.sql

@@ -511,13 +511,12 @@ AS $problems$
                  AND NOT candidate.rolsuper
                  AND pg_has_role(candidate.oid, lane_sequence.relowner, 'USAGE')
                  AND (lane_sequence.relowner = lane_sequence.nspowner
-                      OR (pg_has_role(candidate.oid, lane_sequence.nspowner, 'USAGE')
-                          AND pg_has_role(
+                      OR pg_has_role(
                               candidate.oid,
                               lane_sequence.nspowner,
                               CASE WHEN current_setting('server_version_num')::int >= 160000
                                    THEN 'SET' ELSE 'MEMBER' END
-                          )))
+                          ))
                ORDER BY candidate.rolname
            )
     FROM lane_sequence
@@ -555,6 +554,9 @@ AS $repair$
 DECLARE
     v_problem RECORD;
     v_remaining RECORD;
+    v_original_role TEXT := current_setting('role');
+    v_reassigned BOOLEAN := false;
+    v_role_changed BOOLEAN := false;
     v_busy BOOLEAN := false;
     v_set_mode TEXT := CASE WHEN current_setting('server_version_num')::int >= 160000
                             THEN 'SET' ELSE 'MEMBER' END;
@@ -576,6 +578,7 @@ BEGIN
            AND pg_has_role(current_user, to_regrole(quote_ident(v_problem.expected_owner)), v_set_mode) THEN
             BEGIN
                 EXECUTE v_problem.reassign_sql;
+                v_reassigned := true;
             EXCEPTION WHEN insufficient_privilege THEN
                 NULL;
             END;
@@ -585,14 +588,29 @@ BEGIN
         FROM awa.lane_sequence_problems(p_schema, p_sequence) AS problem;
         IF FOUND
            AND cardinality(v_remaining.missing_grants) > 0
-           AND pg_has_role(current_user, to_regrole(quote_ident(v_remaining.owner)), 'USAGE') THEN
-            FOREACH v_statement IN ARRAY v_remaining.missing_grants LOOP
-                BEGIN
-                    EXECUTE v_statement;
-                EXCEPTION WHEN insufficient_privilege THEN
-                    NULL;
-                END;
-            END LOOP;
+           AND (pg_has_role(current_user, to_regrole(quote_ident(v_remaining.owner)), 'USAGE')
+                OR v_reassigned) THEN
+            BEGIN
+                IF v_reassigned
+                   AND NOT pg_has_role(current_user, to_regrole(quote_ident(v_remaining.owner)), 'USAGE') THEN
+                    PERFORM set_config('role', v_remaining.owner, true);
+                    v_role_changed := true;
+                END IF;
+
+                FOREACH v_statement IN ARRAY v_remaining.missing_grants LOOP
+                    BEGIN
+                        EXECUTE v_statement;
+                    EXCEPTION WHEN insufficient_privilege THEN
+                        NULL;
+                    END;
+                END LOOP;
+
+                IF v_role_changed THEN
+                    PERFORM set_config('role', v_original_role, true);
+                END IF;
+            EXCEPTION WHEN insufficient_privilege THEN
+                NULL;
+            END;
         END IF;
     EXCEPTION WHEN lock_not_available THEN
         v_busy := true;