fix: postgres CI tests with service container and test pool setup

franzos · franzos · commit 79ca17b77735 · 2026-04-02T17:30:25.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,15 +6,8 @@ on:
   pull_request:
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        include:
-          - features: sqlite
-            os: ubuntu-latest
-          - features: postgres
-            os: ubuntu-latest
-    runs-on: ${{ matrix.os }}
+  test-sqlite:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
 
@@ -23,12 +16,55 @@ jobs:
           components: clippy
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          key: sqlite
+
+      - name: Check
+        run: cargo check --no-default-features --features sqlite
+
+      - name: Clippy
+        run: cargo clippy --no-default-features --features sqlite -- -D warnings
+
+      - name: Test
+        run: cargo test --no-default-features --features sqlite
+
+  test-postgres:
+    runs-on: ubuntu-latest
+
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_USER: stackpit
+          POSTGRES_PASSWORD: stackpit
+          POSTGRES_DB: stackpit_test
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 5
+
+    env:
+      DATABASE_URL: postgres://stackpit:stackpit@localhost:5432/stackpit_test
+
+    steps:
+      - uses: actions/checkout@v5
+
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          components: clippy
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: postgres
 
       - name: Check
-        run: cargo check --no-default-features --features ${{ matrix.features }}
+        run: cargo check --no-default-features --features postgres
 
       - name: Clippy
-        run: cargo clippy --no-default-features --features ${{ matrix.features }} -- -D warnings
+        run: cargo clippy --no-default-features --features postgres -- -D warnings
 
       - name: Test
-        run: cargo test --no-default-features --features ${{ matrix.features }}
+        run: cargo test --no-default-features --features postgres -- --test-threads=1
diff --git a/src/db/mod.rs b/src/db/mod.rs
@@ -158,8 +158,38 @@ pub(crate) struct EventRow {
 
 #[cfg(test)]
 pub(crate) async fn open_test_pool() -> DbPool {
-    let pool = pool::create_write_pool("sqlite::memory:").await.unwrap();
+    #[cfg(all(feature = "sqlite", not(feature = "postgres")))]
+    let url = "sqlite::memory:";
+
+    #[cfg(all(feature = "postgres", not(feature = "sqlite")))]
+    let url_owned = std::env::var("DATABASE_URL")
+        .unwrap_or_else(|_| "postgres://stackpit:stackpit@localhost:5432/stackpit_test".into());
+    #[cfg(all(feature = "postgres", not(feature = "sqlite")))]
+    let url = url_owned.as_str();
+
+    let pool = pool::create_write_pool(url).await.unwrap();
     pool::run_migrations(&pool).await.unwrap();
+
+    // Postgres tests share a real database -- clean all data between tests.
+    // TRUNCATE CASCADE handles foreign key ordering for us.
+    #[cfg(all(feature = "postgres", not(feature = "sqlite")))]
+    {
+        sqlx::query(
+            "TRUNCATE events, issues, logs, spans, metrics, attachments, \
+             issue_tag_values, integrations, project_integrations, \
+             alert_rules, alert_state, digest_schedules, \
+             project_keys, projects, releases, sourcemaps, upload_chunks, \
+             discard_stats, discarded_fingerprints, inbound_filters, \
+             message_filters, rate_limits, environment_filters, \
+             release_filters, user_agent_filters, filter_rules, \
+             ip_blocklist, project_repos, sync_state \
+             CASCADE",
+        )
+        .execute(&pool)
+        .await
+        .unwrap();
+    }
+
     pool
 }
 
