Skip to content

Commit 1a1a9ab

Browse files
authored
Merge pull request #270 from microsoft/v1.9.3
split part fix for -ve part numbers and removed generate_custom_schema macro in the adapter
2 parents fefdc8c + eddd1b1 commit 1a1a9ab

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

dbt/adapters/fabric/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "1.9.2"
1+
version = "1.9.3"

dbt/include/fabric/macros/materializations/tests/helpers.sql

-11
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,3 @@
5252
SELECT * FROM dbt_internal_unit_test_expected
5353

5454
{%- endmacro %}
55-
56-
57-
{% macro fabric__generate_schema_name(custom_schema_name, node) -%}
58-
59-
{%- set default_schema = target.schema -%}
60-
{%- if custom_schema_name is none -%}
61-
{{ default_schema }}
62-
{%- else -%}
63-
{{ custom_schema_name | trim }}
64-
{%- endif -%}
65-
{%- endmacro %}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
{% macro fabric__split_part(string_text, delimiter_text, part_number) %}
2-
{% if part_number >= 0 %}
3-
(select value from string_split({{ string_text }}, {{ delimiter_text }}, 1) where ordinal = {{ part_number }})
2+
WITH SplitData AS (
3+
SELECT value,
4+
{% if part_number > 0 %}
5+
, ROW_NUMBER() OVER (ORDER BY ordinal ASC) AS forward_index
6+
{% else %}
7+
, ROW_NUMBER() OVER (ORDER BY ordinal DESC) AS backward_index
8+
{% endif %}
9+
FROM string_split({{ string_text }}, {{ delimiter_text }}, 1)
10+
)
11+
SELECT value
12+
FROM SplitData
13+
WHERE
14+
{% if part_number > 0 %}
15+
forward_index = {{ part_number }}
416
{% else %}
5-
(select value from string_split({{ string_text }}, {{ delimiter_text }}, 1)
6-
where ordinal = len(replace({{ string_text }}, {{delimiter_text}}, '')) + 1 + {{ part_number }})
17+
backward_index = {{ abs(part_number) }}
718
{% endif %}
819
{% endmacro %}

0 commit comments

Comments
 (0)