From 38ec752f1fa24a80f0f07d5bef886e255af4cfe0 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 7 Jul 2023 16:50:35 +0200
Subject: [PATCH] fix pgsql early handle abort

---
 backend/windmill-worker/src/pg_executor.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/backend/windmill-worker/src/pg_executor.rs b/backend/windmill-worker/src/pg_executor.rs
index 71ed6d9b4a..7964318993 100644
--- a/backend/windmill-worker/src/pg_executor.rs
+++ b/backend/windmill-worker/src/pg_executor.rs
@@ -159,18 +159,15 @@ pub async fn do_postgresql(
         .await
         .map_err(to_anyhow)?;
 
+    let result = json!(rows
+        .try_collect::<Vec<Row>>()
+        .await
+        .map_err(to_anyhow)?
+        .into_iter()
+        .map(postgres_row_to_json_value)
+        .collect::<Result<Vec<_>, _>>()?);
+
     handle.abort();
     // And then check that we got back the same string we sent over.
-    return Ok(JobCompleted {
-        job: job,
-        result: json!(rows
-            .try_collect::<Vec<Row>>()
-            .await
-            .map_err(to_anyhow)?
-            .into_iter()
-            .map(postgres_row_to_json_value)
-            .collect::<Result<Vec<_>, _>>()?),
-        logs: "".to_string(),
-        success: true,
-    });
+    return Ok(JobCompleted { job: job, result, logs: "".to_string(), success: true });
 }