one dimensions merge now

Author: claytongentry

lib/manifold/terraform/workspace_configuration.rb

@@ -68,36 +68,32 @@ def table_config
       def routine_config
         return nil if @vectors.empty? || @merge_config.nil?
 
-        routines = @vectors.map { |vector| build_routine(vector) }
-        routines.to_h
-      end
-
-      def build_routine(vector)
-        routine_name = "merge_#{vector["name"].downcase}_dimensions"
-        [routine_name, routine_attributes(routine_name, vector)]
+        {
+          "merge_dimensions" => routine_attributes
+        }
       end
 
-      def routine_attributes(routine_name, vector)
+      def routine_attributes
         {
           "dataset_id" => name,
           "project" => "${var.project_id}",
-          "routine_id" => routine_name,
+          "routine_id" => "merge_dimensions",
           "routine_type" => "PROCEDURE",
           "language" => "SQL",
-          "definition_body" => merge_routine_definition(vector),
+          "definition_body" => merge_routine_definition,
           "depends_on" => ["google_bigquery_dataset.#{name}"]
         }
       end
 
-      def merge_routine_definition(vector)
+      def merge_routine_definition
         source_sql = read_source_sql(@merge_config["source"])
         <<~SQL
           MERGE #{name}.Dimensions AS TARGET
           USING (
             #{source_sql}
           ) AS source
           ON source.id = target.id
-          WHEN MATCHED THEN UPDATE SET target.#{vector["name"].downcase} = source.dimensions
+          WHEN MATCHED THEN UPDATE SET target.dimensions = source.dimensions
           WHEN NOT MATCHED THEN INSERT ROW;
         SQL
       end

spec/manifold/terraform/workspace_configuration_spec.rb

@@ -40,7 +40,7 @@
 
       it "includes routine configuration" do
         expect(json["resource"]["google_bigquery_routine"]).to include(
-          "merge_page_dimensions" => expected_routine_config
+          "merge_dimensions" => expected_routine_config
         )
       end
     end
@@ -75,7 +75,7 @@ def expected_routine_config
       {
         "dataset_id" => name,
         "project" => "${var.project_id}",
-        "routine_id" => "merge_page_dimensions",
+        "routine_id" => "merge_dimensions",
         "routine_type" => "PROCEDURE",
         "language" => "SQL",
         "definition_body" => expected_merge_routine,
@@ -90,7 +90,7 @@ def expected_merge_routine
           #{source_sql}
         ) AS source
         ON source.id = target.id
-        WHEN MATCHED THEN UPDATE SET target.page = source.dimensions
+        WHEN MATCHED THEN UPDATE SET target.dimensions = source.dimensions
         WHEN NOT MATCHED THEN INSERT ROW;
       SQL
     end