From 766ffd16d5158bf01415361d618af9c626714d5b Mon Sep 17 00:00:00 2001 From: claytongentry Date: Tue, 11 Mar 2025 09:42:50 -0400 Subject: [PATCH 1/3] Factor out SQL Generator --- lib/manifold/api/workspace.rb | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/lib/manifold/api/workspace.rb b/lib/manifold/api/workspace.rb index 24f555a..94cc4e2 100644 --- a/lib/manifold/api/workspace.rb +++ b/lib/manifold/api/workspace.rb @@ -25,29 +25,6 @@ def generate(path) end end - # Handles SQL generation for manifold workspaces - class SqlGenerator - def initialize(name, manifold_yaml) - @name = name - @manifold_yaml = manifold_yaml - end - - def generate_dimensions_merge_sql(source_sql) - return unless valid_dimensions_config? - - sql_builder = Terraform::SQLBuilder.new(@name, @manifold_yaml) - sql_builder.build_dimensions_merge_sql(source_sql) - end - - private - - def valid_dimensions_config? - return false unless @manifold_yaml - - !@manifold_yaml["dimensions"]&.dig("merge", "source").nil? - end - end - # Handles schema file generation for manifold workspaces class SchemaWriter def initialize(name, vectors, vector_service, manifold_yaml, logger) @@ -190,8 +167,17 @@ def dimensions_merge_source_exists? end def generate_dimensions_merge_sql + return unless valid_dimensions_config? + source_sql = File.read(Pathname.pwd.join(manifold_yaml["dimensions"]["merge"]["source"])) - SqlGenerator.new(name, manifold_yaml).generate_dimensions_merge_sql(source_sql) + sql_builder = Terraform::SQLBuilder.new(name, manifold_yaml) + sql_builder.build_dimensions_merge_sql(source_sql) + end + + def valid_dimensions_config? + return false unless manifold_yaml + + !manifold_yaml["dimensions"]&.dig("merge", "source").nil? end def write_dimensions_merge_sql_file(sql) From f9155b5516d693f0d30183b5f1c0a13347e11660 Mon Sep 17 00:00:00 2001 From: claytongentry Date: Tue, 11 Mar 2025 09:45:36 -0400 Subject: [PATCH 2/3] more factoring out --- lib/manifold/api/workspace.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/manifold/api/workspace.rb b/lib/manifold/api/workspace.rb index 94cc4e2..f373986 100644 --- a/lib/manifold/api/workspace.rb +++ b/lib/manifold/api/workspace.rb @@ -154,9 +154,11 @@ def write_manifold_merge_sql end def write_dimensions_merge_sql - return unless dimensions_merge_source_exists? + return unless valid_dimensions_config? - sql = generate_dimensions_merge_sql + source_sql = File.read(Pathname.pwd.join(manifold_yaml["dimensions"]["merge"]["source"])) + sql_builder = Terraform::SQLBuilder.new(name, manifold_yaml) + sql = sql_builder.build_dimensions_merge_sql(source_sql) return unless sql write_dimensions_merge_sql_file(sql) @@ -166,14 +168,6 @@ def dimensions_merge_source_exists? manifold_yaml["dimensions"]&.dig("merge", "source") end - def generate_dimensions_merge_sql - return unless valid_dimensions_config? - - source_sql = File.read(Pathname.pwd.join(manifold_yaml["dimensions"]["merge"]["source"])) - sql_builder = Terraform::SQLBuilder.new(name, manifold_yaml) - sql_builder.build_dimensions_merge_sql(source_sql) - end - def valid_dimensions_config? return false unless manifold_yaml From beb3c4634da8b20395f751c22d4cd5320b371a8d Mon Sep 17 00:00:00 2001 From: claytongentry Date: Tue, 11 Mar 2025 09:47:00 -0400 Subject: [PATCH 3/3] debride --- lib/manifold/api/workspace.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/manifold/api/workspace.rb b/lib/manifold/api/workspace.rb index f373986..d1ce29d 100644 --- a/lib/manifold/api/workspace.rb +++ b/lib/manifold/api/workspace.rb @@ -164,10 +164,6 @@ def write_dimensions_merge_sql write_dimensions_merge_sql_file(sql) end - def dimensions_merge_source_exists? - manifold_yaml["dimensions"]&.dig("merge", "source") - end - def valid_dimensions_config? return false unless manifold_yaml