fix seed tests

Author: sdebruyn

dbt/include/sqlserver/macros/materializations/models/incremental/merge.sql

@@ -13,7 +13,7 @@
   {{ default__get_insert_overwrite_merge_sql(target, source, dest_columns, predicates, include_sql_header) }};
 {% endmacro %}
 
-{% macro sqlserver__get_delete_insert_merge_sql(target, source, unique_key, dest_columns, incremental_predicates) %}
+{% macro sqlserver__get_delete_insert_merge_sql(target, source, unique_key, dest_columns, incremental_predicates=none) %}
     {%- set dest_cols_csv = get_quoted_csv(dest_columns | map(attribute="name")) -%}
 
     {% if unique_key %}

tests/functional/adapter/test_seed.py

@@ -49,7 +49,7 @@
     {% endfor %}
 
     {% set col_type = col_types.get(column_name) %}
-    {% set col_type = 'text' if col_type and 'character varying' in col_type else col_type %}
+    {% set col_type = 'text' if col_type and 'varchar' in col_type else col_type %}
 
     {% set validation_message = 'Got a column type of ' ~ col_type ~ ', expected ' ~ type %}