fix: revert some of the box stuff

quarylabs · Apr 29, 2024 · 085e3a1 · 085e3a1
1 parent 2d0ea9a
commit 085e3a1
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 21 deletions.
diff --git a/rust/core/src/project.rs b/rust/core/src/project.rs
@@ -1556,7 +1556,7 @@ async fn render_model_select_statement(
     })?;
     let replaced = reference_search.replace_all(
         sql.as_str(),
-        replace_reference_string_found(&HashMap::new(), &database),
+        replace_reference_string_found(&HashMap::new(), database),
     );
     let connection_config = project
         .connection_config
@@ -1593,7 +1593,7 @@ async fn render_snapshot_select_statement(
     })?;
     let replaced = reference_search.replace_all(
         sql.as_str(),
-        replace_reference_string_found(&HashMap::new(), &database),
+        replace_reference_string_found(&HashMap::new(), database),
     );
     let connection_config = project
         .connection_config
@@ -1676,8 +1676,9 @@ fn replace_reference_string_found_with_database<'a>(
 
 pub fn replace_reference_string_found<'a>(
     overrides: &'a HashMap<String, String>,
-    database: &'a &impl DatabaseQueryGenerator,
+    database: &'a (impl DatabaseQueryGenerator + ?Sized),
 ) -> Box<dyn Fn(&regex::Captures) -> String + 'a> {
+    let database = database.clone();
     #[allow(clippy::indexing_slicing)]
     Box::new(move |caps: &regex::Captures| {
         let model = &caps[1];

diff --git a/rust/core/src/project_tests.rs b/rust/core/src/project_tests.rs
@@ -156,7 +156,7 @@ pub async fn return_tests_sql(
                             .map_err(|e| format!("failed to return reference search: {}", e))?;
                         let sql = reference_search.clone().replace_all(
                             file.as_str(),
-                            replace_reference_string_found(&sources, &database),
+                            replace_reference_string_found(&sources, database),
                         );
                         Ok(sql.to_string())
                     }
@@ -243,7 +243,7 @@ pub async fn return_tests_sql(
                             .map_err(|e| format!("failed to return reference search: {}", e))?;
                         let sql = reference_search.replace_all(
                             &file,
-                            replace_reference_string_found(&path_map, &database),
+                            replace_reference_string_found(&path_map, database),
                         );
                         Ok((name, sql.to_string()))
                     }

diff --git a/rust/quary-databases/src/databases_duckdb.rs b/rust/quary-databases/src/databases_duckdb.rs
@@ -956,10 +956,14 @@ snapshots:
             .await
             .unwrap();
 
-        let snapshots_sql =
-            project_and_fs_to_sql_for_snapshots(&project, &file_system, &db_generator, database.as_ref())
-                .await
-                .unwrap();
+        let snapshots_sql = project_and_fs_to_sql_for_snapshots(
+            &project,
+            &file_system,
+            &db_generator,
+            database.as_ref(),
+        )
+        .await
+        .unwrap();
         for (_, sql) in snapshots_sql {
             for statement in sql {
                 database.exec(statement.as_str()).await.unwrap()
@@ -1184,10 +1188,14 @@ snapshots:
             .await
             .unwrap();
 
-        let snapshots_sql =
-            project_and_fs_to_sql_for_snapshots(&project, &file_system, &db_generator, database.as_ref())
-                .await
-                .unwrap();
+        let snapshots_sql = project_and_fs_to_sql_for_snapshots(
+            &project,
+            &file_system,
+            &db_generator,
+            database.as_ref(),
+        )
+        .await
+        .unwrap();
         for (_, sql) in snapshots_sql {
             for statement in sql {
                 database.exec(statement.as_str()).await.unwrap()

diff --git a/rust/quary-databases/src/databases_postgres.rs b/rust/quary-databases/src/databases_postgres.rs
@@ -1211,10 +1211,14 @@ snapshots:
             .await
             .unwrap();
 
-        let snapshots_sql =
-            project_and_fs_to_sql_for_snapshots(&project, &file_system, &db_generator, database.as_ref())
-                .await
-                .unwrap();
+        let snapshots_sql = project_and_fs_to_sql_for_snapshots(
+            &project,
+            &file_system,
+            &db_generator,
+            database.as_ref(),
+        )
+        .await
+        .unwrap();
         for (_, sql) in snapshots_sql {
             for statement in sql {
                 database.exec(statement.as_str()).await.unwrap()

diff --git a/rust/quary-databases/src/databases_redshift.rs b/rust/quary-databases/src/databases_redshift.rs
@@ -717,10 +717,14 @@ mod tests {
             .await
             .unwrap();
 
-        let snapshots_sql =
-            project_and_fs_to_sql_for_snapshots(&project, &file_system, &db_generator, database.as_ref())
-                .await
-                .unwrap();
+        let snapshots_sql = project_and_fs_to_sql_for_snapshots(
+            &project,
+            &file_system,
+            &db_generator,
+            database.as_ref(),
+        )
+        .await
+        .unwrap();
         for (_, sql) in snapshots_sql {
             for statement in sql {
                 println!("{}", statement.as_str());