diff --git a/integration_tests/dbt_date/macros/get_test_dates.sql b/integration_tests/dbt_date/macros/get_test_dates.sql index 6a87eeb..06c5a6f 100644 --- a/integration_tests/dbt_date/macros/get_test_dates.sql +++ b/integration_tests/dbt_date/macros/get_test_dates.sql @@ -4,10 +4,6 @@ {{ return([49,49]) }} {%- endmacro %} -{% macro synapse__get_test_week_of_year() -%} - {{ return(sqlserver__get_test_week_of_year()) }} -{%- endmacro %} - {% macro sqlserver__get_test_timestamps() -%} {{ return(['2021-06-07 07:35:20.000000 -07:00', '2021-06-07 14:35:20.000000 +00:00']) }} diff --git a/integration_tests/dbt_utils/macros/limit_zero.sql b/integration_tests/dbt_utils/macros/limit_zero.sql index 7390ecc..78a8432 100644 --- a/integration_tests/dbt_utils/macros/limit_zero.sql +++ b/integration_tests/dbt_utils/macros/limit_zero.sql @@ -1,7 +1,3 @@ {% macro sqlserver__limit_zero() %} {{ return('where 0=1') }} {% endmacro %} - -{% macro synapse__limit_zero() -%} - {{ return(sqlserver__limit_zero()) }} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_audit_helper/compare_column_values.sql b/macros/dbt_audit_helper/compare_column_values.sql index 1aa42aa..a6161b0 100644 --- a/macros/dbt_audit_helper/compare_column_values.sql +++ b/macros/dbt_audit_helper/compare_column_values.sql @@ -56,7 +56,3 @@ select from aggregated {% endmacro %} - -{% macro synapse__compare_column_values(a_query, b_query, primary_key, column_to_compare) -%} - {% do return( tsql_utils.sqlserver__compare_column_values(a_query, b_query, primary_key, column_to_compare)) %} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_audit_helper/compare_queries.sql b/macros/dbt_audit_helper/compare_queries.sql index 1b1e266..c2ffa85 100644 --- a/macros/dbt_audit_helper/compare_queries.sql +++ b/macros/dbt_audit_helper/compare_queries.sql @@ -83,8 +83,3 @@ select from summary_stats {% endmacro %} - - -{% macro synapse__compare_queries(a_query, b_query, primary_key=None) -%} - {% do return( tsql_utils.sqlserver__compare_queries(a_query, b_query, primary_key=None)) %} -{%- endmacro %} diff --git a/macros/dbt_audit_helper/compare_relation_columns.sql b/macros/dbt_audit_helper/compare_relation_columns.sql index d29443c..ec45067 100644 --- a/macros/dbt_audit_helper/compare_relation_columns.sql +++ b/macros/dbt_audit_helper/compare_relation_columns.sql @@ -21,9 +21,6 @@ full outer join b_cols using (column_name) {% endmacro %} -{% macro synapse__compare_relation_columns(a_relation, b_relation) -%} - {% do return( tsql_utils.sqlserver__compare_relation_columns(a_relation, b_relation)) %} -{%- endmacro %} {% macro sqlserver__get_columns_in_relation_sql(relation) %} SELECT @@ -54,7 +51,3 @@ full outer join b_cols using (column_name) from tempdb.INFORMATION_SCHEMA.COLUMNS where table_name like '{{ relation.identifier }}%') cols {% endmacro %} - -{% macro synapse__get_columns_in_relation_sql(relation) -%} - {% do return( tsql_utils.sqlserver__get_columns_in_relation_sql(relation)) %} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_audit_helper/compare_relations.sql b/macros/dbt_audit_helper/compare_relations.sql index 3980989..5912e2f 100644 --- a/macros/dbt_audit_helper/compare_relations.sql +++ b/macros/dbt_audit_helper/compare_relations.sql @@ -23,7 +23,3 @@ from {{ b_relation }} {{ tsql_utils.sqlserver__compare_queries(a_query, b_query, primary_key) }} {% endmacro %} - -{% macro synapse__compare_relations(a_relation, b_relation, exclude_columns=[], primary_key=None) -%} - {% do return( tsql_utils.sqlserver__compare_relations(a_relation, b_relation, exclude_columns=[], primary_key=None)) %} -{%- endmacro %} diff --git a/macros/dbt_date/calendar_date/convert_timezones.sql b/macros/dbt_date/calendar_date/convert_timezones.sql index db783a9..442227d 100644 --- a/macros/dbt_date/calendar_date/convert_timezones.sql +++ b/macros/dbt_date/calendar_date/convert_timezones.sql @@ -1,8 +1,3 @@ {% macro sqlserver__convert_timezone(column, target_tz, source_tz) -%} CAST({{ column }} as {{ dbt_utils.type_timestamp() }}) AT TIME ZONE '{{ source_tz }}' AT TIME ZONE '{{ target_tz }}' {%- endmacro -%} -{# {{ column }} AT TIME ZONE '{{ target_tz }}' #} -{% macro synapse__convert_timezone(column, target_tz, source_tz) -%} - {% do return( tsql_utils.sqlserver__convert_timezone(column, target_tz, source_tz)) %} -{%- endmacro -%} - diff --git a/macros/dbt_date/calendar_date/date_part.sql b/macros/dbt_date/calendar_date/date_part.sql index 27ce02f..fc789c2 100644 --- a/macros/dbt_date/calendar_date/date_part.sql +++ b/macros/dbt_date/calendar_date/date_part.sql @@ -1,7 +1,3 @@ {% macro sqlserver__date_part(datepart, date) -%} datepart({{ datepart }}, {{ date }}) {%- endmacro %} - -{% macro synapse__date_part(datepart, date) -%} - {% do return( tsql_utils.sqlserver__date_part(datepart, date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/day_name.sql b/macros/dbt_date/calendar_date/day_name.sql index dc8b109..f015c94 100644 --- a/macros/dbt_date/calendar_date/day_name.sql +++ b/macros/dbt_date/calendar_date/day_name.sql @@ -2,7 +2,3 @@ {%- set f = 'ddd' if short else 'dddd' -%} format({{ date }}, '{{ f }}') {%- endmacro %} - -{% macro synapse__day_name(date, short) -%} - {% do return( tsql_utils.sqlserver__day_name(date, short)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/day_of_week.sql b/macros/dbt_date/calendar_date/day_of_week.sql index cce60e6..f1bf99d 100644 --- a/macros/dbt_date/calendar_date/day_of_week.sql +++ b/macros/dbt_date/calendar_date/day_of_week.sql @@ -14,7 +14,3 @@ {%- endif -%} {%- endmacro %} - -{% macro synapse__day_of_week(date, isoweek) -%} - {% do return( tsql_utils.sqlserver__day_of_week(date, isoweek)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/from_unixtimestamp.sql b/macros/dbt_date/calendar_date/from_unixtimestamp.sql index 50a2254..23cd802 100644 --- a/macros/dbt_date/calendar_date/from_unixtimestamp.sql +++ b/macros/dbt_date/calendar_date/from_unixtimestamp.sql @@ -16,7 +16,3 @@ dateadd({{ scale }}, {{ epochs }}, '1970-01-01') {%- endmacro %} - -{% macro synapse__from_unixtimestamp(epochs, format) -%} - {% do return( tsql_utils.sqlserver__from_unixtimestamp(epochs, format)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/iso_week_of_year.sql b/macros/dbt_date/calendar_date/iso_week_of_year.sql index a7ad142..c58dac3 100644 --- a/macros/dbt_date/calendar_date/iso_week_of_year.sql +++ b/macros/dbt_date/calendar_date/iso_week_of_year.sql @@ -1,7 +1,3 @@ {%- macro sqlserver__iso_week_of_year(date) -%} cast({{ dbt_date.date_part('iso_week', date) }} as {{ dbt_utils.type_int() }}) {%- endmacro %} - -{% macro synapse__iso_week_of_year(date) -%} - {% do return( tsql_utils.sqlserver__iso_week_of_year(date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/iso_week_start.sql b/macros/dbt_date/calendar_date/iso_week_start.sql index 4a67c36..14246a1 100644 --- a/macros/dbt_date/calendar_date/iso_week_start.sql +++ b/macros/dbt_date/calendar_date/iso_week_start.sql @@ -1,7 +1,3 @@ {%- macro sqlserver__iso_week_start(date) -%} cast(dateadd(week, datediff(week, 0, dateadd(day, -1, {{date}})), 0) as date) {%- endmacro %} - -{% macro synapse__iso_week_start(date) -%} - {% do return( tsql_utils.sqlserver__iso_week_start(date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/month_name.sql b/macros/dbt_date/calendar_date/month_name.sql index ce369b4..72c37e7 100644 --- a/macros/dbt_date/calendar_date/month_name.sql +++ b/macros/dbt_date/calendar_date/month_name.sql @@ -2,7 +2,3 @@ {%- set f = 'MMM' if short else 'MMMM' -%} format({{ date }}, '{{ f }}') {%- endmacro %} - -{% macro synapse__month_name(date, short) -%} - {% do return( tsql_utils.sqlserver__month_name(date, short)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/week_end.sql b/macros/dbt_date/calendar_date/week_end.sql index 4a19983..61cb071 100644 --- a/macros/dbt_date/calendar_date/week_end.sql +++ b/macros/dbt_date/calendar_date/week_end.sql @@ -2,7 +2,3 @@ {%- set dt = dbt_date.week_start(date) -%} {{ dbt_date.n_days_away(6, dt) }} {%- endmacro %} - -{% macro synapse__week_end(date) -%} - {% do return( tsql_utils.sqlserver__week_end(date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/week_of_year.sql b/macros/dbt_date/calendar_date/week_of_year.sql index 1d609bd..116322a 100644 --- a/macros/dbt_date/calendar_date/week_of_year.sql +++ b/macros/dbt_date/calendar_date/week_of_year.sql @@ -1,7 +1,3 @@ {%- macro sqlserver__week_of_year(date) -%} cast({{ dbt_date.date_part('week', date)}} as {{ dbt_utils.type_int() }}) {%- endmacro %} - -{% macro synapse__week_of_year(date) -%} - {% do return( tsql_utils.sqlserver__week_of_year(date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_date/calendar_date/week_start.sql b/macros/dbt_date/calendar_date/week_start.sql index 85fd51f..83b41a4 100644 --- a/macros/dbt_date/calendar_date/week_start.sql +++ b/macros/dbt_date/calendar_date/week_start.sql @@ -2,7 +2,3 @@ -- Sunday as week start date cast({{ dbt_utils.dateadd('day', -1, dbt_utils.date_trunc('week', dbt_utils.dateadd('day', 1, date))) }} as date) {%- endmacro %} - -{% macro synapse__week_start(date) -%} - {% do return( tsql_utils.sqlserver__week_start(date)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_expectations/math/log_natural.sql b/macros/dbt_expectations/math/log_natural.sql index e14beac..5a41a2e 100644 --- a/macros/dbt_expectations/math/log_natural.sql +++ b/macros/dbt_expectations/math/log_natural.sql @@ -3,8 +3,3 @@ log({{ x }}) {%- endmacro -%} - - -{% macro synapse__log_natural(x) -%} - {% do return( tsql_utils.sqlserver__log_natural(x)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/_generalized/equal_expression.sql b/macros/dbt_expectations/schema_tests/_generalized/equal_expression.sql index 9cc7aaa..1ea1a1d 100644 --- a/macros/dbt_expectations/schema_tests/_generalized/equal_expression.sql +++ b/macros/dbt_expectations/schema_tests/_generalized/equal_expression.sql @@ -84,25 +84,3 @@ expression_difference > {{ tolerance }} {% endif %} {%- endmacro -%} - -{%- macro synapse__test_equal_expression(model, expression, - compare_model, - compare_expression, - group_by, - compare_group_by, - row_condition, - compare_row_condition, - tolerance, - tolerance_percent, - return_difference) -%} - {% do return( tsql_utils.sqlserver__test_equal_expression(model, expression, - compare_model, - compare_expression, - group_by, - compare_group_by, - row_condition, - compare_row_condition, - tolerance, - tolerance_percent, - return_difference)) -%} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/_generalized/expression_is_true.sql b/macros/dbt_expectations/schema_tests/_generalized/expression_is_true.sql index f8523c2..b3fd2a7 100644 --- a/macros/dbt_expectations/schema_tests/_generalized/expression_is_true.sql +++ b/macros/dbt_expectations/schema_tests/_generalized/expression_is_true.sql @@ -42,7 +42,3 @@ select count(*) from validation_errors {% endmacro %} - -{% macro synapse__expression_is_true(model, expression, test_condition, group_by_columns, row_condition) %} - {% do return( tsql_utils.sqlserver__expression_is_true(model, expression, test_condition, group_by_columns, row_condition)) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_most_common_value_to_be_in_set.sql b/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_most_common_value_to_be_in_set.sql index a08c016..8b05133 100644 --- a/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_most_common_value_to_be_in_set.sql +++ b/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_most_common_value_to_be_in_set.sql @@ -82,19 +82,3 @@ select count(*) as validation_errors from validation_errors {% endmacro %} - -{% macro synapse__test_expect_column_most_common_value_to_be_in_set(model, column_name, - value_set, - top_n, - quote_values, - data_type, - row_condition - ) -%} - {% do return( tsql_utils.sqlserver__test_expect_column_most_common_value_to_be_in_set(model, column_name, - value_set, - top_n, - quote_values=False, - data_type="decimal", - row_condition=None - )) -%} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_stdev_to_be_between.sql b/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_stdev_to_be_between.sql index 34ead3f..f299af5 100644 --- a/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_stdev_to_be_between.sql +++ b/macros/dbt_expectations/schema_tests/aggregate_functions/expect_column_stdev_to_be_between.sql @@ -15,17 +15,3 @@ stdev({{ column_name }}) row_condition=row_condition ) }} {% endmacro %} - -{% macro synapse__test_expect_column_stdev_to_be_between(model, column_name, - min_value, - max_value, - group_by, - row_condition - ) -%} - {% do return( tsql_utils.sqlserver__test_expect_column_stdev_to_be_between(model, column_name, - min_value, - max_value, - group_by, - row_condition=None - )) -%} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql b/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql index 84f8834..5342e83 100644 --- a/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql +++ b/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_moving_stdevs.sql @@ -119,31 +119,3 @@ where ) {%- endmacro -%} - -{% macro synapse__test_expect_column_values_to_be_within_n_moving_stdevs(model, - column_name, - date_column_name, - period, - lookback_periods, - trend_periods, - test_periods, - sigma_threshold, - sigma_threshold_upper, - sigma_threshold_lower, - take_diffs, - take_logs - ) %} - {% do return( tsql_utils.sqlserver__test_expect_column_values_to_be_within_n_moving_stdevs(model, - column_name, - date_column_name, - period, - lookback_periods, - trend_periods, - test_periods, - sigma_threshold, - sigma_threshold_upper, - sigma_threshold_lower, - take_diffs, - take_logs - )) %} -{%- endmacro -%} diff --git a/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql b/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql index 3ac8d14..a9646c2 100644 --- a/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql +++ b/macros/dbt_expectations/schema_tests/distributional/expect_column_values_to_be_within_n_stdevs.sql @@ -48,16 +48,3 @@ from where abs({{ column_name }}_sigma) > {{ sigma_threshold }} {%- endmacro %} - - -{% macro synapse__test_expect_column_values_to_be_within_n_stdevs(model, - column_name, - group_by, - sigma_threshold - ) %} - {% do return( tsql_utils.sqlserver__test_expect_column_values_to_be_within_n_stdevs(model, - column_name, - group_by, - sigma_threshold - )) %} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/multi-column/expect_select_column_values_to_be_unique_within_record.sql b/macros/dbt_expectations/schema_tests/multi-column/expect_select_column_values_to_be_unique_within_record.sql index 7443ef8..0c9ec28 100644 --- a/macros/dbt_expectations/schema_tests/multi-column/expect_select_column_values_to_be_unique_within_record.sql +++ b/macros/dbt_expectations/schema_tests/multi-column/expect_select_column_values_to_be_unique_within_record.sql @@ -66,17 +66,3 @@ validation_errors as ( ) select count(*) from validation_errors {% endmacro %} - -{% macro synapse__test_expect_select_column_values_to_be_unique_within_record(model, - column_list, - quote_columns, - ignore_row_if, - row_condition - ) %} - {% do return( tsql_utils.sqlserver__test_expect_select_column_values_to_be_unique_within_record(model, - column_list, - quote_columns, - ignore_row_if, - row_condition - )) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_expectations/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql b/macros/dbt_expectations/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql index 91a751b..4192974 100644 --- a/macros/dbt_expectations/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql +++ b/macros/dbt_expectations/schema_tests/table_shape/expect_grouped_row_values_to_have_recent_data.sql @@ -25,7 +25,3 @@ validation_errors as ( ) select count(*) from validation_errors {% endmacro %} - -{% macro synapse__test_expect_grouped_row_values_to_have_recent_data(model, group_by, timestamp_column, datepart, interval) %} - {% do return( tsql_utils.sqlserver__test_expect_grouped_row_values_to_have_recent_data(model, group_by, timestamp_column, datepart, interval)) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/concat.sql b/macros/dbt_utils/cross_db_utils/concat.sql index 9950c7d..84ce889 100644 --- a/macros/dbt_utils/cross_db_utils/concat.sql +++ b/macros/dbt_utils/cross_db_utils/concat.sql @@ -1,7 +1,3 @@ {% macro sqlserver__concat(fields) -%} concat({{ fields|join(', ') }}, '') {%- endmacro %} - -{% macro synapse__concat(fields) -%} - {% do return( tsql_utils.sqlserver__concat(fields)) %} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/current_timestamp.sql b/macros/dbt_utils/cross_db_utils/current_timestamp.sql index 408b3af..ab1991b 100644 --- a/macros/dbt_utils/cross_db_utils/current_timestamp.sql +++ b/macros/dbt_utils/cross_db_utils/current_timestamp.sql @@ -2,14 +2,6 @@ getdate() {% endmacro %} -{% macro synapse__current_timestamp() %} - {% do return( tsql_utils.sqlserver__current_timestamp()) %} -{% endmacro %} - {% macro sqlserver__current_timestamp_in_utc() %} getutcdate() {% endmacro %} - -{% macro synapse__current_timestamp_in_utc() %} - {% do return( tsql_utils.sqlserver__current_timestamp_in_utc()) %} -{% endmacro %} diff --git a/macros/dbt_utils/cross_db_utils/datatypes.sql b/macros/dbt_utils/cross_db_utils/datatypes.sql index 0a5f680..6e18b24 100644 --- a/macros/dbt_utils/cross_db_utils/datatypes.sql +++ b/macros/dbt_utils/cross_db_utils/datatypes.sql @@ -8,20 +8,3 @@ {# https://docs.microsoft.com/en-us/sql/t-sql/functions/date-and-time-data-types-and-functions-transact-sql?view=sql-server-ver15#DateandTimeDataTypes #} DATETIMEOFFSET {% endmacro %} - -{# - Imagine an adapter plugin, dbt-synapse, that inherits from dbt-sqlserver. - For the time being, we need to explicitly reimplement sqlserver__ macros - as synapse__ macros. - - TODO: We can make a small change to dbt-core (https://github.com/fishtown-analytics/dbt/issues/2923) - that will make the inheritance of dispatched macros work just like the - inheritance of other adapter objects, and render the following code redundant. -#} -{% macro synapse__type_string() %} - {% do return( tsql_utils.sqlserver__type_string()) %} -{% endmacro %} - -{% macro synapse__type_timestamp() %} - {% do return( tsql_utils.sqlserver__type_timestamp()) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/date_trunc.sql b/macros/dbt_utils/cross_db_utils/date_trunc.sql index edb5b6f..05bc4ae 100644 --- a/macros/dbt_utils/cross_db_utils/date_trunc.sql +++ b/macros/dbt_utils/cross_db_utils/date_trunc.sql @@ -1,7 +1,3 @@ {% macro sqlserver__date_trunc(datepart, date) %} CAST(DATEADD({{datepart}}, DATEDIFF({{datepart}}, 0, {{date}}), 0) AS DATE) {% endmacro %} - -{% macro synapse__date_trunc(datepart, date) %} - {% do return( tsql_utils.sqlserver__date_trunc(datepart, date)) %} -{% endmacro %} diff --git a/macros/dbt_utils/cross_db_utils/dateadd.sql b/macros/dbt_utils/cross_db_utils/dateadd.sql index 0bcc529..605379e 100644 --- a/macros/dbt_utils/cross_db_utils/dateadd.sql +++ b/macros/dbt_utils/cross_db_utils/dateadd.sql @@ -7,7 +7,3 @@ ) {% endmacro %} - -{% macro synapse__dateadd(datepart, interval, from_date_or_timestamp) %} - {% do return( tsql_utils.sqlserver__dateadd(datepart, interval, from_date_or_timestamp)) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/hash.sql b/macros/dbt_utils/cross_db_utils/hash.sql index 7835758..11ef472 100644 --- a/macros/dbt_utils/cross_db_utils/hash.sql +++ b/macros/dbt_utils/cross_db_utils/hash.sql @@ -1,17 +1,3 @@ {% macro sqlserver__hash(field) %} convert(varchar(50), hashbytes('md5', {{field}}), 2) {% endmacro %} - - -{# - Imagine an adapter plugin, dbt-synapse, that inherits from dbt-sqlserver. - For the time being, we need to explicitly reimplement sqlserver__ macros - as synapse__ macros. - - TODO: We can make a small change to dbt-core (https://github.com/fishtown-analytics/dbt/issues/2923) - that will make the inheritance of dispatched macros work just like the - inheritance of other adapter objects, and render the following code redundant. -#} -{% macro synapse__hash(field) %} - {% do return( tsql_utils.sqlserver__hash(field)) %} -{% endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/last_day.sql b/macros/dbt_utils/cross_db_utils/last_day.sql index e01a8b8..01d9caa 100644 --- a/macros/dbt_utils/cross_db_utils/last_day.sql +++ b/macros/dbt_utils/cross_db_utils/last_day.sql @@ -11,7 +11,3 @@ {%- endif -%} {%- endmacro %} - -{% macro synapse__last_day(date, datepart) -%} - {% do return( tsql_utils.sqlserver__last_day(date, datepart)) %} -{%- endmacro %} diff --git a/macros/dbt_utils/cross_db_utils/length.sql b/macros/dbt_utils/cross_db_utils/length.sql index c5aa5cb..b4b64d7 100644 --- a/macros/dbt_utils/cross_db_utils/length.sql +++ b/macros/dbt_utils/cross_db_utils/length.sql @@ -3,7 +3,3 @@ len( {{ expression }} ) {%- endmacro -%} - -{% macro synapse__length(expression) %} - {% do return( tsql_utils.sqlserver__length(expression)) %} -{%- endmacro -%} \ No newline at end of file diff --git a/macros/dbt_utils/cross_db_utils/position.sql b/macros/dbt_utils/cross_db_utils/position.sql index ba3a142..8df439a 100644 --- a/macros/dbt_utils/cross_db_utils/position.sql +++ b/macros/dbt_utils/cross_db_utils/position.sql @@ -6,7 +6,3 @@ ) {%- endmacro -%} - -{% macro synapse__position(substring_text, string_text) %} - {% do return(tsql_utils.sqlserver__position(substring_text, string_text)) %} -{%- endmacro -%} diff --git a/macros/dbt_utils/cross_db_utils/safe_cast.sql b/macros/dbt_utils/cross_db_utils/safe_cast.sql index 63083aa..03f1529 100644 --- a/macros/dbt_utils/cross_db_utils/safe_cast.sql +++ b/macros/dbt_utils/cross_db_utils/safe_cast.sql @@ -1,7 +1,3 @@ {% macro sqlserver__safe_cast(field, type) %} try_cast({{field}} as {{type}}) {% endmacro %} - -{% macro synapse__safe_cast(field, type) %} - {% do return( tsql_utils.sqlserver__safe_cast(field, type)) %} -{% endmacro %} diff --git a/macros/dbt_utils/cross_db_utils/split_part.sql b/macros/dbt_utils/cross_db_utils/split_part.sql index 1f74ad2..021c781 100644 --- a/macros/dbt_utils/cross_db_utils/split_part.sql +++ b/macros/dbt_utils/cross_db_utils/split_part.sql @@ -7,17 +7,3 @@ LTRIM(CAST((''+REPLACE({{ string_text }},{{ delimiter_text }} ,'')+'') AS XML).value('(/X)[{{ part_number }}]', 'VARCHAR(128)')) {% endmacro %} - - -{# - Imagine an adapter plugin, dbt-synapse, that inherits from dbt-sqlserver. - For the time being, we need to explicitly reimplement sqlserver__ macros - as synapse__ macros. - - TODO: We can make a small change to dbt-core (https://github.com/fishtown-analytics/dbt/issues/2923) - that will make the inheritance of dispatched macros work just like the - inheritance of other adapter objects, and render the following code redundant. -#} -{% macro synapse__split_part(string_text, delimiter_text, part_number) %} - {% do return( tsql_utils.sqlserver__split_part(string_text, delimiter_text, part_number)) %} -{% endmacro %} diff --git a/macros/dbt_utils/cross_db_utils/width_bucket.sql b/macros/dbt_utils/cross_db_utils/width_bucket.sql index e8629f0..f33162f 100644 --- a/macros/dbt_utils/cross_db_utils/width_bucket.sql +++ b/macros/dbt_utils/cross_db_utils/width_bucket.sql @@ -24,7 +24,3 @@ end) {%- endmacro %} - -{% macro synapse__width_bucket(expr, min_value, max_value, num_buckets) -%} - {% do return( tsql_utils.sqlserver__width_bucket(expr, min_value, max_value, num_buckets)) %} -{%- endmacro %} \ No newline at end of file diff --git a/macros/dbt_utils/datetime/date_spine.sql b/macros/dbt_utils/datetime/date_spine.sql index dcd2faa..bb68e1e 100644 --- a/macros/dbt_utils/datetime/date_spine.sql +++ b/macros/dbt_utils/datetime/date_spine.sql @@ -112,8 +112,3 @@ {% endfor -%} {% endmacro %} - - -{% macro synapse__date_spine(start_date, end_date, datepart) -%} - {% do return( tsql_utils.sqlserver__date_spine(start_date, end_date, datepart)) %} -{%- endmacro %} diff --git a/macros/dbt_utils/schema_tests/test_not_null_where.sql b/macros/dbt_utils/schema_tests/test_not_null_where.sql index a910e54..5a5fcad 100644 --- a/macros/dbt_utils/schema_tests/test_not_null_where.sql +++ b/macros/dbt_utils/schema_tests/test_not_null_where.sql @@ -11,16 +11,3 @@ {{ return(dbt_utils.default__test_not_null_where(model, column_name, **kwargs)) }} {% endmacro %} - -{% macro synapse__test_not_null_where(model, column_name) %} - - {% set where = kwargs.get('where', kwargs.get('arg')) %} - {# override dbt-utils' integration tests args default see: #} - {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #} - {# TSQL has no bool type #} - {% if where == '_deleted = false' %} - {% set where = '_deleted = 0' %} - {% endif %} - - {% do return( tsql_utils.sqlserver__test_not_null_where(model, column_name, **kwargs)) %} -{% endmacro %} diff --git a/macros/dbt_utils/schema_tests/test_unique_where.sql b/macros/dbt_utils/schema_tests/test_unique_where.sql index b31c1e7..d3e9f34 100644 --- a/macros/dbt_utils/schema_tests/test_unique_where.sql +++ b/macros/dbt_utils/schema_tests/test_unique_where.sql @@ -10,16 +10,3 @@ {{ return(dbt_utils.default__test_unique_where(model, column_name=column_name)) }} {% endmacro %} - -{% macro synapse__test_unique_where(model, column_name) %} - - {% set where = kwargs.get('where', kwargs.get('arg')) %} - {# override dbt-utils' integration tests args default see: #} - {# https://github.com/fishtown-analytics/dbt-utils/blob/bbba960726667abc66b42624f0d36bbb62c37593/integration_tests/models/schema_tests/schema.yml#L53-L65 #} - {# TSQL has no bool type #} - {% if where == '_deleted = false' %} - {% set where = '_deleted = 0' %} - {% endif %} - - {% do return( tsql_utils.sqlserver__test_unique_where(model, column_name)) %} -{% endmacro %} diff --git a/macros/dbt_utils/sql/generate_series.sql b/macros/dbt_utils/sql/generate_series.sql index 2357459..5dfc6e4 100644 --- a/macros/dbt_utils/sql/generate_series.sql +++ b/macros/dbt_utils/sql/generate_series.sql @@ -31,7 +31,3 @@ {# order by generated_number #} {% endmacro %} - -{% macro synapse__generate_series(upper_bound) %} - {% do return( tsql_utils.sqlserver__generate_series(upper_bound)) %} -{% endmacro %} diff --git a/macros/dbt_utils/sql/get_tables_by_pattern_sql.sql b/macros/dbt_utils/sql/get_tables_by_pattern_sql.sql index 16c709f..27e0f7f 100644 --- a/macros/dbt_utils/sql/get_tables_by_pattern_sql.sql +++ b/macros/dbt_utils/sql/get_tables_by_pattern_sql.sql @@ -9,16 +9,3 @@ AND table_name NOT LIKE '{{ exclude }}' {% endmacro %} - -{# - Imagine an adapter plugin, dbt-synapse, that inherits from dbt-sqlserver. - For the time being, we need to explicitly reimplement sqlserver__ macros - as synapse__ macros. - - TODO: We can make a small change to dbt-core (https://github.com/fishtown-analytics/dbt/issues/2923) - that will make the inheritance of dispatched macros work just like the - inheritance of other adapter objects, and render the following code redundant. -#} -{% macro synapse__get_tables_by_pattern_sql(field) %} - {% do return( tsql_utils.sqlserver__get_tables_by_pattern_sql(schema_pattern, table_pattern, exclude='', database=target.database)) %} -{% endmacro %}