Skip to content

Commit

Permalink
Merge branch 'dbt-labs:main' into extendGrantPrivilege_test
Browse files Browse the repository at this point in the history
  • Loading branch information
soksamnanglim authored Oct 27, 2023
2 parents f691812 + 2d19711 commit de7da53
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 17 deletions.
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20231010-195348.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Bump mypy from 1.5.1 to 1.6.0"
time: 2023-10-10T19:53:48.00000Z
custom:
Author: dependabot[bot]
PR: 629
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20231013-190517.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update pre-commit requirement from ~=3.4 to ~=3.5"
time: 2023-10-13T19:05:17.00000Z
custom:
Author: dependabot[bot]
PR: 634
6 changes: 6 additions & 0 deletions .changes/unreleased/Dependencies-20231017-191545.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: "Dependencies"
body: "Update black requirement from ~=23.9 to ~=23.10"
time: 2023-10-17T19:15:45.00000Z
custom:
Author: dependabot[bot]
PR: 636
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20231025-203732.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: Fix parsing of database results for materialized view auto refresh
time: 2023-10-25T20:37:32.191259-04:00
custom:
Author: mikealfare
Issue: "643"
6 changes: 5 additions & 1 deletion dbt/adapters/redshift/relation_configs/materialized_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,10 +182,14 @@ def parse_relation_results(cls, relation_results: RelationResults) -> dict:
"mv_name": materialized_view.get("table"),
"schema_name": materialized_view.get("schema"),
"database_name": materialized_view.get("database"),
"autorefresh": materialized_view.get("autorefresh"),
"query": cls._parse_query(query.get("definition")),
}

autorefresh_value = materialized_view.get("autorefresh")
if autorefresh_value is not None:
bool_filter = {"t": True, "f": False}
config_dict["autorefresh"] = bool_filter.get(autorefresh_value, autorefresh_value)

# the default for materialized views differs from the default for diststyle in general
# only set it if we got a value
if materialized_view.get("diststyle"):
Expand Down
6 changes: 3 additions & 3 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ git+https://github.com/dbt-labs/dbt-core.git#egg=dbt-postgres&subdirectory=plugi

# if version 1.x or greater -> pin to major version
# if version 0.x -> pin to minor
black~=23.9
black~=23.10
bumpversion~=0.6.0
click~=8.1
ddtrace~=1.19
flake8~=6.1
flaky~=3.7
freezegun~=1.2
ipdb~=0.13.13
mypy==1.5.1 # patch updates have historically introduced breaking changes
mypy==1.6.0 # patch updates have historically introduced breaking changes
pip-tools~=7.3
pre-commit~=3.4
pre-commit~=3.5
pre-commit-hooks~=4.4
pytest~=7.4
pytest-csv~=3.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,6 @@ def test_change_is_applied_via_alter_str_true(self, project, my_materialized_vie
assert_message_in_logs(f"Applying ALTER to: {my_materialized_view}", logs)
assert_message_in_logs(f"Applying REPLACE to: {my_materialized_view}", logs, False)

def test_change_is_applied_via_alter_str_false(self, project, my_materialized_view):
self.check_start_state(project, my_materialized_view)

self.change_config_via_alter_str_false(project, my_materialized_view)
_, logs = run_dbt_and_capture_with_retries_redshift_mv(
["--debug", "run", "--models", my_materialized_view.name]
)

self.check_state_alter_change_is_applied_str_false(project, my_materialized_view)

assert_message_in_logs(f"Applying ALTER to: {my_materialized_view}", logs)
assert_message_in_logs(f"Applying REPLACE to: {my_materialized_view}", logs, False)

def test_change_is_applied_via_replace(self, project, my_materialized_view):
self.check_start_state(project, my_materialized_view)

Expand Down

0 comments on commit de7da53

Please sign in to comment.