progress

Author: psteinroe

crates/pgls_splinter/TODO.md

@@ -39,19 +39,17 @@ pub struct SplinterQueryResult {
 }
 
 pub async fn load_splinter_results(pool: &PgPool) -> Result<Vec<SplinterQueryResult>, sqlx::Error> {
-    let mut tx = pool.begin().await?;
+    let mut conn = pool.acquire().await?;
 
     // this is done by the splinter.sql file normally, but we remove it so that sqlx can work with
     // the file properly.
     sqlx::query("set local search_path = ''")
-        .execute(&mut *tx)
+        .execute(&mut *conn)
         .await?;
 
     let results = sqlx::query_file_as!(SplinterQueryResult, "vendor/splinter.sql")
-        .fetch_all(&mut *tx)
+        .fetch_all(&mut *conn)
         .await?;
 
-    tx.commit().await?;
-
     Ok(results)
 }

crates/pgls_splinter/src/query.rs

@@ -51,21 +51,6 @@ struct TestSetup<'a> {
 
 impl TestSetup<'_> {
     async fn test(self) {
-        // Create Supabase-specific roles that splinter expects
-        for role in ["anon", "authenticated", "service_role"] {
-            let result = sqlx::query(&format!("CREATE ROLE {role} NOLOGIN"))
-                .execute(self.test_db)
-                .await;
-
-            // Ignore duplicate role errors
-            if let Err(sqlx::Error::Database(db_err)) = &result {
-                let code = db_err.code();
-                if code.as_deref() != Some("23505") && code.as_deref() != Some("42710") {
-                    result.expect("Failed to create Supabase roles");
-                }
-            }
-        }
-
         // Run setup SQL
         sqlx::raw_sql(self.setup)
             .execute(self.test_db)

crates/pgls_splinter/tests/diagnostics.rs

@@ -21,12 +21,40 @@ end;
 
 begin
   create role test_nologin;
-exception 
+exception
+  when duplicate_object then
+    null;
+  when unique_violation then
+    null;
+end;
+
+-- Supabase roles required for splinter tests
+begin
+  create role anon nologin;
+exception
+  when duplicate_object then
+    null;
+  when unique_violation then
+    null;
+end;
+
+begin
+  create role authenticated nologin;
+exception
+  when duplicate_object then
+    null;
+  when unique_violation then
+    null;
+end;
+
+begin
+  create role service_role nologin;
+exception
   when duplicate_object then
     null;
   when unique_violation then
     null;
 end;
 
-end 
+end
 $$;