Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix split part negative part number #689

Merged
merged 13 commits into from
Jul 11, 2023
Merged

Fix split part negative part number #689

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9de0417
pin dev branch for tests
dave-connors-3 Mar 19, 2023
51823e2
update split part
dave-connors-3 Mar 19, 2023
33f5853
changie
dave-connors-3 Mar 19, 2023
90f3e76
Merge branch 'main' into fix-split-part-negative-part-number
dave-connors-3 Mar 19, 2023
2c7b913
update to delimiter text for replace
dave-connors-3 Mar 19, 2023
8d28c43
merge main
dave-connors-3 Mar 19, 2023
09c805f
whitespace
dave-connors-3 Mar 20, 2023
20ab7c3
update to new core branch
dave-connors-3 Mar 20, 2023
70c0638
Merge branch 'main' into fix-split-part-negative-part-number
dave-connors-3 Mar 20, 2023
3ef83b0
Merge branch 'main' into fix-split-part-negative-part-number
dbeatty10 Jul 10, 2023
d817da3
Add a negative number (rather than subtract a positive number)
dbeatty10 Jul 11, 2023
c71adce
Expected negative test case
dbeatty10 Jul 11, 2023
33ebbf3
Restore original dev-requirements.txt
dbeatty10 Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20230319-155618.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: allow negative args for spark split part
time: 2023-03-19T15:56:18.630146-05:00
custom:
Author: dave-connors-3
Issue: "688"
32 changes: 26 additions & 6 deletions dbt/include/spark/macros/utils/split_part.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,34 @@

{% endset %}

{% set split_part_expr %}
{% if part_number >= 0 %}

split(
{{ string_text }},
{{ delimiter_expr }}
)[({{ part_number - 1 }})]
{% set split_part_expr %}

{% endset %}
split(
{{ string_text }},
{{ delimiter_expr }}
)[({{ part_number - 1 if part_number > 0 else part_number }})]

{% endset %}

{% else %}
dbeatty10 marked this conversation as resolved.
Show resolved Hide resolved

{% set split_part_expr %}

split(
{{ string_text }},
{{ delimiter_expr }}
)[(
length({{ string_text }})
- length(
replace({{ string_text }}, {{ delimiter_text }}, '')
) + 1 + {{ part_number }}
)]

{% endset %}

{% endif %}

{{ return(split_part_expr) }}

Expand Down
4 changes: 2 additions & 2 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# install latest changes in dbt-core
# TODO: how to automate switching from develop to version branches?
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-core&subdirectory=core
git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-tests-adapter&subdirectory=tests/adapter
git+https://github.com/dbt-labs/dbt-core.git@split-part-negative-part-number#egg=dbt-core&subdirectory=core
dbeatty10 marked this conversation as resolved.
Show resolved Hide resolved
git+https://github.com/dbt-labs/dbt-core.git@split-part-negative-part-number#egg=dbt-tests-adapter&subdirectory=tests/adapter
dbeatty10 marked this conversation as resolved.
Show resolved Hide resolved

# if version 1.x or greater -> pin to major version
# if version 0.x -> pin to minor
Expand Down
8 changes: 4 additions & 4 deletions tests/functional/adapter/utils/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
from dbt.tests.adapter.utils.fixture_listagg import models__test_listagg_yml
from tests.functional.adapter.utils.fixture_listagg import models__test_listagg_no_order_by_sql

seeds__data_split_part_csv = """parts,split_on,result_1,result_2,result_3
a|b|c,|,a,b,c
1|2|3,|,1,2,3
EMPTY|EMPTY|EMPTY,|,EMPTY,EMPTY,EMPTY
seeds__data_split_part_csv = """parts,split_on,result_1,result_2,result_3,result_4
a|b|c,|,a,b,c,c
1|2|3,|,1,2,3,3
EMPTY|EMPTY|EMPTY,|,EMPTY,EMPTY,EMPTY,EMPTY
"""

seeds__data_last_day_csv = """date_day,date_part,result
Expand Down