avoid cloning variables when not needed in run_sql

Author: lovasoa

src/webserver/database/sqlpage_functions/functions.rs

@@ -368,12 +368,14 @@ async fn run_sql<'a>(
         )
         .await
         .with_context(|| format!("run_sql: invalid path {sql_file_path:?}"))?;
-    let mut tmp_req = request.clone();
-    if let Some(variables) = variables {
+    let mut tmp_req = if let Some(variables) = variables {
+        let mut tmp_req = request.clone_without_variables();
         let variables: ParamMap = serde_json::from_str(&variables)?;
         tmp_req.get_variables = variables;
-        tmp_req.post_variables = Default::default();
-    }
+        tmp_req
+    } else {
+        request.clone()
+    };
     if tmp_req.clone_depth > 8 {
         anyhow::bail!("Too many nested inclusions. run_sql can include a file that includes another file, but the depth is limited to 8 levels. \n\
         Executing sqlpage.run_sql('{sql_file_path}') would exceed this limit. \n\

src/webserver/http_request_info.rs

@@ -40,14 +40,14 @@ pub struct RequestInfo {
     pub clone_depth: u8,
 }
 
-impl Clone for RequestInfo {
-    fn clone(&self) -> Self {
+impl RequestInfo {
+    pub fn clone_without_variables(&self) -> Self {
         Self {
             method: self.method.clone(),
             path: self.path.clone(),
             protocol: self.protocol.clone(),
-            get_variables: self.get_variables.clone(),
-            post_variables: self.post_variables.clone(),
+            get_variables: ParamMap::new(),
+            post_variables: ParamMap::new(),
             uploaded_files: self.uploaded_files.clone(),
             headers: self.headers.clone(),
             client_ip: self.client_ip,
@@ -59,6 +59,15 @@ impl Clone for RequestInfo {
     }
 }
 
+impl Clone for RequestInfo {
+    fn clone(&self) -> Self {
+        let mut clone = self.clone_without_variables();
+        clone.get_variables = self.get_variables.clone();
+        clone.post_variables = self.post_variables.clone();
+        clone
+    }
+}
+
 pub(crate) async fn extract_request_info(
     req: &mut ServiceRequest,
     app_state: Arc<AppState>,

tests/sql_test_files/it_works_run_sql_variable_access.sql

@@ -0,0 +1,4 @@
+set html = 'It ';
+select 'dynamic' as component, sqlpage.run_sql('tests/display_text.sql') as properties;
+set html = 'works !';
+select 'dynamic' as component, sqlpage.run_sql('tests/display_text.sql') as properties;