Harmonize rapi_execute()

duckdb · Oct 20, 2024 · eb38b2b · eb38b2b
1 parent 771ba49
commit eb38b2b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/statement.cpp b/src/statement.cpp
@@ -342,15 +342,16 @@ bool FetchArrowChunk(ChunkScanState &scan_state, ClientProperties options, Appen
 
 	auto generic_result = stmt->stmt->Execute(stmt->parameters, false);
 
-	if (generic_result->HasError()) {
-		if (signal_handler.HandleInterrupt()) {
-			return R_NilValue;
-		}
-		cpp11::stop("rapi_execute: Failed to run query\nError: %s", generic_result->GetError().c_str());
+	if (signal_handler.HandleInterrupt()) {
+		return R_NilValue;
 	}
 
 	signal_handler.Disable();
 
+	if (generic_result->HasError()) {
+		cpp11::stop("rapi_execute: Failed to run query\nError: %s", generic_result->GetError().c_str());
+	}
+
 	if (arrow) {
 		auto query_result = new RQueryResult();
 		query_result->result = std::move(generic_result);