Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit ea8a6fd

Browse files
authored
Merge pull request #651 from hivedspace/DATA-489
fix profile_dir argument overwritten by legacy dir for DBT < 1.3.0
2 parents bf9b83f + 7fb463d commit ea8a6fd

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

data_diff/dbt_parser.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ def __init__(
103103
) -> None:
104104
try_set_dbt_flags()
105105
self.dbt_runner = try_get_dbt_runner()
106-
self.profiles_dir = Path(profiles_dir_override or default_profiles_dir())
107106
self.project_dir = Path(project_dir_override or default_project_dir())
108107
self.connection = {}
109108
self.project_dict = self.get_project_dict()
@@ -119,6 +118,13 @@ def __init__(
119118
self.threads = None
120119
self.unique_columns = self.get_unique_columns()
121120

121+
if profiles_dir_override:
122+
self.profiles_dir = Path(profiles_dir_override)
123+
elif parse_version(self.dbt_version) < parse_version("1.3.0"):
124+
self.profiles_dir = legacy_profiles_dir()
125+
else:
126+
self.profiles_dir = default_profiles_dir()
127+
122128
def get_datadiff_config(self) -> TDatadiffConfig:
123129
data_diff_vars = self.project_dict.get("vars", {}).get("data_diff", {})
124130
prod_database = data_diff_vars.get("prod_database")
@@ -211,9 +217,6 @@ def get_run_results_models(self):
211217

212218
dbt_version = parse_version(run_results_obj.metadata.dbt_version)
213219

214-
if dbt_version < parse_version("1.3.0"):
215-
self.profiles_dir = legacy_profiles_dir()
216-
217220
if dbt_version < parse_version(LOWER_DBT_V):
218221
raise DataDiffDbtRunResultsVersionError(
219222
f"Found dbt: v{dbt_version} Expected the dbt project's version to be >= {LOWER_DBT_V}"

0 commit comments

Comments
 (0)