clean up code a bit

Author: sdebruyn

dbt/include/sqlserver/macros/materializations/seeds/helpers.sql

@@ -1,18 +1,3 @@
-{% macro calc_batch_size(num_columns,max_batch_size) %}
-    {#
-        SQL Server allows for a max of 2100 parameters in a single statement.
-        Check if the max_batch_size fits with the number of columns, otherwise
-        reduce the batch size so it fits.
-    #}
-    {% if num_columns * max_batch_size < 2100 %}
-    {% set batch_size = max_batch_size %}
-    {% else %}
-    {% set batch_size = (2100 / num_columns)|int %}
-    {% endif %}
-
-    {{ return(batch_size) }}
-{%  endmacro %}
-
 {% macro sqlserver__get_binding_char() %}
   {{ return('?') }}
 {% endmacro %}
@@ -21,13 +6,27 @@
   {{ return(400) }}
 {% endmacro %}
 
-{% macro basic_load_csv_rows(model, batch_size, agate_table) %}
+{% macro calc_batch_size(num_columns) %}
+    {#
+        SQL Server allows for a max of 2100 parameters in a single statement.
+        Check if the max_batch_size fits with the number of columns, otherwise
+        reduce the batch size so it fits.
+    #}
+    {% set max_batch_size = get_batch_size() %}
+    {% set calculated_batch = (2100 / num_columns)|int %}
+    {% set batch_size = [max_batch_size, calculated_batch] | min %}
+
+    {{ return(batch_size) }}
+{%  endmacro %}
 
+{% macro sqlserver__load_csv_rows(model, agate_table) %}
   {% set cols_sql = get_seed_column_quoted_csv(model, agate_table.column_names) %}
+  {% set batch_size = calc_batch_size(agate_table.column_names|length) %}
   {% set bindings = [] %}
-
   {% set statements = [] %}
 
+  {{ log("Inserting batches of " ~ batch_size ~ " records") }}
+
   {% for chunk in agate_table.rows | batch(batch_size) %}
       {% set bindings = [] %}
 
@@ -56,11 +55,3 @@
   {# Return SQL so we can render it out into the compiled files #}
   {{ return(statements[0]) }}
 {% endmacro %}
-
-{% macro sqlserver__load_csv_rows(model, agate_table) %}
-  {% set max_batch_size = get_batch_size() %}
-  {% set cols_sql = agate_table.column_names %}
-  {% set batch_size = calc_batch_size(cols_sql|length, max_batch_size) %}
-
-  {{ return(basic_load_csv_rows(model, batch_size, agate_table) )}}
-{% endmacro %}