Merge pull request #31 from CurtisTechSolutions/feat/postgres-match-store

feat: add atomic PostgreSQL match storage

Author: nosam1998

.github/scripts/postgres-query-check.py

@@ -0,0 +1,18 @@
+"""Verify checked-in SQLx PostgreSQL metadata against the migrated CI database."""
+import json
+import os
+from pathlib import Path
+
+
+def metadata(directory):
+    values = {}
+    for path in directory.glob("query-*.json"):
+        value = json.loads(path.read_text())
+        if value["db_name"] == "PostgreSQL":
+            values[path.name] = value
+    return values
+
+
+generated = metadata(Path(os.environ["SQLX_OFFLINE_DIR"]))
+if not generated or generated != metadata(Path(".sqlx")):
+    raise SystemExit("PostgreSQL SQLx metadata is missing or stale.")

.github/scripts/sqlite-query-check.py

@@ -19,7 +19,11 @@
             connection.executescript(migration.read_text())
 elif sys.argv[1] == "verify":
     def metadata(directory):
-        return {path.name: json.loads(path.read_text()) for path in directory.glob("query-*.json")}
+        return {
+            path.name: json.loads(path.read_text())
+            for path in directory.glob("query-*.json")
+            if json.loads(path.read_text())["db_name"] == "SQLite"
+        }
 
     generated = metadata(queries)
     if not generated or generated != metadata(Path(".sqlx")):

.github/workflows/ci.yml

@@ -19,14 +19,17 @@ jobs:
         run: python3 .github/scripts/sqlite-query-check.py prepare
         env:
           GFA_SQLX_WORK_DIR: ${{ runner.temp }}/gfa-sqlx
-      - run: cargo test --workspace --all-features --locked
+      - run: cargo check -p gfa-store --no-default-features --features sqlite --locked
         env:
           DATABASE_URL: sqlite:${{ runner.temp }}/gfa-sqlx/schema.sqlite
           SQLX_OFFLINE_DIR: ${{ runner.temp }}/gfa-sqlx/queries
       - name: Verify offline query metadata
         run: python3 .github/scripts/sqlite-query-check.py verify
         env:
           GFA_SQLX_WORK_DIR: ${{ runner.temp }}/gfa-sqlx
+      - run: cargo test --workspace --all-features --locked
+        env:
+          SQLX_OFFLINE: "true"
       - run: cargo build -p gfa-cli --locked
       - run: python3 .github/scripts/local-server-smoke.py
       - name: Export generated OpenAPI

.github/workflows/postgres.yml

@@ -0,0 +1,44 @@
+name: PostgreSQL CI
+on:
+  pull_request:
+  push:
+    branches: [main]
+permissions:
+  contents: read
+concurrency:
+  group: postgres-ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  postgres:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16-alpine
+        env:
+          POSTGRES_USER: gfa_test
+          POSTGRES_PASSWORD: gfa-test
+          POSTGRES_DB: gfa_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready -U gfa_test -d gfa_test"
+          --health-interval 5s --health-timeout 5s --health-retries 10
+    env:
+      DATABASE_URL: postgres://gfa_test:gfa-test@localhost:5432/gfa_query
+      GFA_TEST_POSTGRES_URL: postgres://gfa_test:gfa-test@localhost:5432/gfa_test
+      SQLX_OFFLINE_DIR: ${{ github.workspace }}/target/pg-queries
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+      - name: Prepare migration-derived query schema
+        run: |
+          psql "$GFA_TEST_POSTGRES_URL" -v ON_ERROR_STOP=1 -c 'CREATE DATABASE gfa_query'
+          for migration in crates/adapters/gfa-store/migrations/postgres/*.sql; do
+            psql "$DATABASE_URL" -v ON_ERROR_STOP=1 -f "$migration"
+          done
+          mkdir -p "$SQLX_OFFLINE_DIR"
+      - name: Check queries and exercise PostgreSQL
+        run: cargo test -p gfa-store --no-default-features --features postgres --locked -- --ignored
+      - name: Verify PostgreSQL query metadata
+        run: python3 .github/scripts/postgres-query-check.py