Revert "chore: refactor database query generator usage"

This reverts commit 542b79f.

Author: benfdking

rust/cli/src/main.rs

@@ -134,7 +134,7 @@ async fn main_wrapped() -> Result<(), String> {
             let database = database_query_generator_from_config(config)
                 .map_err(|e| format!("Error creating database query generator: {}", e))?;
 
-            let (project, _) = parse_project(&*database)
+            let (project, _) = parse_project(&database)
                 .await
                 .map_err(|e| format!("Error parsing project: {}", e))?;
 
@@ -155,7 +155,7 @@ async fn main_wrapped() -> Result<(), String> {
 
             let database = database_from_config(&config).await?;
             let query_generator = database.query_generator();
-            let (project, file_system) = parse_project(&*query_generator).await?;
+            let (project, file_system) = parse_project(&query_generator).await?;
 
             // If cache table deletes any previous cache views.
             let cache_delete_views_sqls: Vec<(String, String)> = if build_args.cache_views {
@@ -167,7 +167,7 @@ async fn main_wrapped() -> Result<(), String> {
                     .into_iter()
                     .map(|view| {
                         let is_cache =
-                            is_cache_full_path(&*database.query_generator(), &view.full_path)?;
+                            is_cache_full_path(&database.query_generator(), &view.full_path)?;
                         Ok((view, is_cache))
                     })
                     .collect::<Result<Vec<_>, String>>()?;
@@ -192,7 +192,7 @@ async fn main_wrapped() -> Result<(), String> {
             let cache_to_create: Vec<(String, Vec<String>)> = if build_args.cache_views {
                 let project_graph = project_to_graph(project.clone())?;
                 let views =
-                    derive_hash_views(&*database.query_generator(), &project, &project_graph)?;
+                    derive_hash_views(&database.query_generator(), &project, &project_graph)?;
                 Ok::<_, String>(
                     views
                         .into_iter()
@@ -206,7 +206,7 @@ async fn main_wrapped() -> Result<(), String> {
             let sqls = project_and_fs_to_sql_for_views(
                 &project,
                 &file_system,
-                &*query_generator,
+                &query_generator,
                 false,
                 false,
             )
@@ -287,12 +287,12 @@ async fn main_wrapped() -> Result<(), String> {
 
             let database = database_from_config(&config).await?;
             let query_generator = database.query_generator();
-            let (project, file_system) = parse_project(&*query_generator).await?;
+            let (project, file_system) = parse_project(&query_generator).await?;
 
             let limit = if test_args.verbose { None } else { Some(1) };
 
             let tests = return_tests_sql(
-                &*database.query_generator(),
+                &database.query_generator(),
                 &project,
                 &file_system,
                 test_args.full_source,
@@ -336,7 +336,7 @@ async fn main_wrapped() -> Result<(), String> {
             // TODO Need to reintroduce the progressbar
             println!("running tests {}", tests.len());
             return match run_tests_internal(
-                &*query_generator,
+                &query_generator,
                 &file_system,
                 &project,
                 "",
@@ -473,7 +473,7 @@ async fn main_wrapped() -> Result<(), String> {
         Commands::GenerateSources(_) => {
             let config = get_config_file(&args.project_file)?;
             let database = database_from_config(&config).await?;
-            let sources = generate_sources(&*database).await?;
+            let sources = generate_sources(database.as_ref()).await?;
             let project_file = ProjectFile {
                 sources,
                 models: vec![],
@@ -488,12 +488,12 @@ async fn main_wrapped() -> Result<(), String> {
             let config = get_config_file(&args.project_file)?;
             let database = database_from_config(&config).await?;
             let query_generator = database.query_generator();
-            let (project, file_system) = parse_project(&*query_generator).await?;
+            let (project, file_system) = parse_project(&query_generator).await?;
             let snapshots_sql = project_and_fs_to_sql_for_snapshots(
                 &project,
                 &file_system,
-                &*query_generator,
-                &*database,
+                &query_generator,
+                database.as_ref(),
             )
             .await?;
 
@@ -603,7 +603,7 @@ fn address_to_source(address_with_columns: AddressWithColumns) -> ProjectFileSou
 }
 
 async fn parse_project(
-    database: &dyn DatabaseQueryGenerator,
+    database: &impl DatabaseQueryGenerator,
 ) -> Result<(quary_proto::Project, LocalFS), String> {
     let dir = std::env::current_dir().map_err(|e| e.to_string())?;
     let filesystem = LocalFS::new(dir);

rust/cli/src/rpc_functions.rs

@@ -99,7 +99,7 @@ async fn list_sources(
     _: ListSourcesRequest,
     database: Box<dyn DatabaseConnection>,
 ) -> Result<ListSourcesResponse, String> {
-    let sources = generate_sources(&*database)
+    let sources = generate_sources(database.as_ref())
         .await
         .map_err(|e| format!("Failed to list sources: {}", e))?;
     Ok(ListSourcesResponse { sources })

rust/core/src/automatic_branching.rs

@@ -91,7 +91,7 @@ pub fn derive_model_hash(
         }
         hasher.finalize()
     };
-    Ok(HEXLOWER.encode(&*hash_of_hashes))
+    Ok(HEXLOWER.encode(hash_of_hashes.as_ref()))
 }
 
 fn hash_source(source: &Source) -> String {
@@ -139,7 +139,7 @@ pub async fn derive_sha256_file_contents(
 /// and seed inside of the project that is passed in. The returned type is a map from the model
 /// to a tuple of the model hash and sql statements required to create the view.
 pub fn derive_hash_views<'a>(
-    database: &dyn DatabaseQueryGenerator,
+    database: &impl DatabaseQueryGenerator,
     project: &'a Project,
     project_graph: &'_ ProjectGraph,
 ) -> Result<BTreeMap<ModelName<'a>, (String, Vec<String>)>, String> {
@@ -206,7 +206,7 @@ pub fn cache_view_name_to_table_name_and_hash(
 
 /// is_cache_full_path returns true if the full path is a cache view name.
 pub fn is_cache_full_path(
-    database: &dyn DatabaseQueryGenerator,
+    database: &impl DatabaseQueryGenerator,
     full_path: &str,
 ) -> Result<bool, String> {
     let view_name = database.return_name_from_full_path(full_path)?;

rust/core/src/databases.rs

@@ -141,6 +141,85 @@ pub trait DatabaseQueryGenerator: SnapshotGenerator + Debug + Sync {
     }
 }
 
+impl DatabaseQueryGenerator for Box<dyn DatabaseQueryGenerator> {
+    fn validate_materialization_type(
+        &self,
+        materialization_type: &Option<String>,
+    ) -> Result<(), String> {
+        self.as_ref()
+            .validate_materialization_type(materialization_type)
+    }
+
+    fn models_drop_query(
+        &self,
+        view_name: &str,
+        materialization_type: &Option<String>,
+    ) -> Result<String, String> {
+        self.as_ref()
+            .models_drop_query(view_name, materialization_type)
+    }
+
+    fn models_create_query(
+        &self,
+        view_name: &str,
+        original_select_statement: &str,
+        materialization_type: &Option<String>,
+    ) -> Result<String, String> {
+        self.as_ref().models_create_query(
+            view_name,
+            original_select_statement,
+            materialization_type,
+        )
+    }
+
+    fn seeds_drop_table_query(&self, table_name: &str) -> String {
+        self.as_ref().seeds_drop_table_query(table_name)
+    }
+
+    fn seeds_create_table_query(&self, table_name: &str, columns: &[String]) -> String {
+        self.as_ref().seeds_create_table_query(table_name, columns)
+    }
+
+    fn seeds_insert_into_table_query(
+        &self,
+        table_name: &str,
+        columns: &[String],
+        values: &[Vec<String>],
+    ) -> String {
+        self.as_ref()
+            .seeds_insert_into_table_query(table_name, columns, values)
+    }
+
+    fn escape_seed_value(&self, seed_value: &str) -> String {
+        self.as_ref().escape_seed_value(seed_value)
+    }
+
+    fn return_full_path_requirement(&self, table_name: &str) -> String {
+        self.as_ref().return_full_path_requirement(table_name)
+    }
+
+    fn return_name_from_full_path<'a>(&self, full_path: &'a str) -> Result<&'a str, String> {
+        self.as_ref().return_name_from_full_path(full_path)
+    }
+
+    fn automatic_cache_sql_create_statement(
+        &self,
+        model: &str,
+        model_cache_name: &str,
+    ) -> Vec<String> {
+        self.as_ref()
+            .automatic_cache_sql_create_statement(model, model_cache_name)
+    }
+
+    fn get_dialect(&self) -> &Dialect {
+        self.as_ref().get_dialect()
+    }
+
+    fn database_name_wrapper(&self, name: &str) -> String {
+        self.as_ref().database_name_wrapper(name)
+    }
+}
+
 pub trait SnapshotGenerator {
     /// GenerateSnapshotSQL generates the SQL statements to create a snapshot of a table.
     ///
@@ -191,6 +270,36 @@ pub trait SnapshotGenerator {
     }
 }
 
+impl SnapshotGenerator for Box<dyn DatabaseQueryGenerator> {
+    fn generate_snapshot_sql(
+        &self,
+        path: &str,
+        templated_select: &str,
+        unique_key: &str,
+        strategy: &StrategyType,
+        table_exists: Option<bool>,
+    ) -> Result<Vec<String>, String> {
+        self.as_ref().generate_snapshot_sql(
+            path,
+            templated_select,
+            unique_key,
+            strategy,
+            table_exists,
+        )
+    }
+
+    fn generate_snapshot_query(
+        &self,
+        templated_select: &str,
+        unique_key: &str,
+        strategy: &StrategyType,
+        now: &str,
+    ) -> Result<String, String> {
+        self.as_ref()
+            .generate_snapshot_query(templated_select, unique_key, strategy, now)
+    }
+}
+
 pub fn base_for_seeds_create_table_specifying_text_type(
     text_type: &str,
     table_name: &str,

rust/core/src/models.rs

@@ -25,7 +25,7 @@ pub fn validate_model_name(name: &str) -> Result<(), String> {
 /// parse_model_schemas_to_views takes in a reader and reads it to a View file
 /// name_replacing_strategy takes in the reference name and replaces it with whatever strategy is necessary.
 pub async fn parse_model_schemas_to_views<F>(
-    database: &dyn DatabaseQueryGenerator,
+    database: &impl DatabaseQueryGenerator,
     file_reader: Box<dyn AsyncRead + Send + Unpin>,
     view_name: &str,
     materialization: &Option<String>,
@@ -76,7 +76,7 @@ pub async fn read_normalise_model(
 }
 
 fn return_sql_model_template(
-    database: &dyn DatabaseQueryGenerator,
+    database: &impl DatabaseQueryGenerator,
     name: &str,
     materialization: &Option<String>,
     select_statement: &str,