Include the trailing semicolon in sql queries sent to the database

Fixes #318

Author: lovasoa

CHANGELOG.md

@@ -13,6 +13,7 @@
     - In short, if you saw an error like `Error: unrecognized token ":"` after upgrading to 0.20.5, this version should fix it.
  - The `dynamic` component now properly displays error messages when its properties are invalid. There used to be a bug where errors would be silently ignored, making it hard to debug invalid dynamic components.
  - New [`sqlpage.request_method`](https://sql.ophir.dev/functions.sql?function=request_method#function) function to get the HTTP method used to access the current page. This is useful to create pages that behave differently depending on whether they are accessed with a GET request (to display a form, for instance) or a POST request (to process the form).
+ - include the trailing semicolon as a part of the SQL statement sent to the database. This doesn't change anything in most databases, but Microsoft SQL Server requires a trailing semicolon after certain statements, such as `MERGE`. Fixes [issue #318](https://github.com/lovasoa/SQLpage/issues/318)
 
 ## 0.20.5 (2024-05-07)
 

src/webserver/database/sql.rs

@@ -99,7 +99,10 @@ fn parse_single_statement(parser: &mut Parser<'_>, db_kind: AnyKind) -> Option<P
         Err(err) => return Some(syntax_error(err, parser)),
     };
     log::debug!("Parsed statement: {stmt}");
-    while parser.consume_token(&SemiColon) {}
+    let mut semicolon = false;
+    while parser.consume_token(&SemiColon) {
+        semicolon = true;
+    }
     let params = ParameterExtractor::extract_parameters(&mut stmt, db_kind);
     if let Some((variable, query)) = extract_set_variable(&mut stmt) {
         return Some(ParsedStatement::SetVariable {
@@ -114,7 +117,10 @@ fn parse_single_statement(parser: &mut Parser<'_>, db_kind: AnyKind) -> Option<P
         log::debug!("Optimised a static simple select to avoid a trivial database query: {stmt} optimized to {static_statement:?}");
         return Some(ParsedStatement::StaticSimpleSelect(static_statement));
     }
-    let query = stmt.to_string();
+    let query = format!(
+        "{stmt}{semicolon}",
+        semicolon = if semicolon { ";" } else { "" }
+    );
     log::debug!("Final transformed statement: {stmt}");
     Some(ParsedStatement::StmtWithParams(StmtWithParams {
         query,