mssql rollback after end req test

remove double rollback

Author: lovasoa

src/webserver/database/execute_queries.rs

@@ -112,17 +112,6 @@ pub fn stop_at_first_error(
         .take_until(error_rx)
 }
 
-pub(crate) async fn rollback_transaction(db_connection: &mut DbConn) {
-    if let Some(conn) = db_connection.as_mut() {
-        match conn.execute("ROLLBACK").await {
-            Ok(r) => log::debug!("Rolled back transaction with result: {:?}", r),
-            Err(e) => log::debug!("Failed to rollback transaction: {e:?}"),
-        }
-    } else {
-        log::debug!("No connection to rollback a transaction");
-    }
-}
-
 /// Executes the sqlpage pseudo-functions contained in a static simple select
 async fn exec_static_simple_select(
     columns: &[(String, SimpleSelectValue)],

src/webserver/http.rs

@@ -1,6 +1,6 @@
 use crate::render::{AnyRenderBodyContext, HeaderContext, PageContext};
 use crate::webserver::content_security_policy::ContentSecurityPolicy;
-use crate::webserver::database::execute_queries::{rollback_transaction, stop_at_first_error};
+use crate::webserver::database::execute_queries::stop_at_first_error;
 use crate::webserver::database::{execute_queries::stream_query_results_with_conn, DbItem};
 use crate::webserver::http_request_info::extract_request_info;
 use crate::webserver::ErrorWithStatus;
@@ -173,35 +173,32 @@ async fn render_sql(
         let database_entries_stream =
             stream_query_results_with_conn(&sql_file, &mut req_param, &mut conn);
         let database_entries_stream = stop_at_first_error(database_entries_stream);
-        {
-            let response_with_writer = build_response_header_and_stream(
-                Arc::clone(&app_state),
+        let response_with_writer = build_response_header_and_stream(
+            Arc::clone(&app_state),
+            database_entries_stream,
+            request_context,
+        )
+        .await;
+        match response_with_writer {
+            Ok(ResponseWithWriter::RenderStream {
+                http_response,
+                renderer,
                 database_entries_stream,
-                request_context,
-            )
-            .await;
-            match response_with_writer {
-                Ok(ResponseWithWriter::RenderStream {
-                    http_response,
-                    renderer,
-                    database_entries_stream,
-                }) => {
-                    resp_send
-                        .send(http_response)
-                        .unwrap_or_else(|e| log::error!("could not send headers {e:?}"));
-                    stream_response(database_entries_stream, renderer).await;
-                }
-                Ok(ResponseWithWriter::FinishedResponse { http_response }) => {
-                    resp_send
-                        .send(http_response)
-                        .unwrap_or_else(|e| log::error!("could not send headers {e:?}"));
-                }
-                Err(err) => {
-                    send_anyhow_error(&err, resp_send, app_state.config.environment);
-                }
+            }) => {
+                resp_send
+                    .send(http_response)
+                    .unwrap_or_else(|e| log::error!("could not send headers {e:?}"));
+                stream_response(database_entries_stream, renderer).await;
+            }
+            Ok(ResponseWithWriter::FinishedResponse { http_response }) => {
+                resp_send
+                    .send(http_response)
+                    .unwrap_or_else(|e| log::error!("could not send headers {e:?}"));
+            }
+            Err(err) => {
+                send_anyhow_error(&err, resp_send, app_state.config.environment);
             }
         }
-        rollback_transaction(&mut conn).await;
     });
     resp_recv.await.map_err(ErrorInternalServerError)
 }

tests/failed_transaction_mssql.sql

@@ -0,0 +1,6 @@
+BEGIN TRANSACTION;
+CREATE TABLE #t(f VARCHAR(100) NOT NULL);
+INSERT INTO #t(f) VALUES ($x);
+COMMIT TRANSACTION;
+
+SELECT 'text' AS component, f AS contents FROM #t;

tests/index.rs

@@ -478,6 +478,7 @@ async fn test_transaction_error() -> actix_web::Result<()> {
     let data = make_app_data().await;
     let path = match data.db.to_string().to_lowercase().as_str() {
         "mysql" => "/tests/failed_transaction_mysql.sql",
+        "mssql" => "/tests/failed_transaction_mssql.sql",
         _ => "/tests/failed_transaction.sql",
     };
     let req = get_request_to_with_data(path, data.clone())