Skip to content

Commit 0246e2d

Browse files
committed
Fix TypeError: BaseUtils.interpolate_macro_namespace() missing 1 required positional argument: 'macro_name'
1 parent 893076d commit 0246e2d

15 files changed

Lines changed: 19 additions & 28 deletions

tests/functional/adapter/incremental_materialization/quotes/test_quote_special_characters_and_keywords.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,3 @@ def test_run_dbt(self, project):
138138

139139
result = project.run_sql(used_id_5_query, fetch="all")
140140
assert result == expected_result
141-

tests/functional/adapter/incremental_materialization/quotes/test_quoted_columns_incremental_insert.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,4 +131,3 @@ def test_run_dbt(self, project):
131131

132132
result = project.run_sql(used_id_5_query, fetch="all")
133133
assert result == expected_result
134-

tests/functional/adapter/incremental_materialization/quotes/test_quotes_enabled_in_model.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,3 @@ def test_run_dbt(self, project):
145145

146146
result = project.run_sql(used_id_5_query, fetch="all")
147147
assert result == expected_result
148-

tests/functional/adapter/incremental_materialization/sync_schema/test_quote_special_characters_and_keywords.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,3 @@ def test_run_dbt(self, project):
158158

159159
result = project.run_sql(used_id_5_query, fetch="all")
160160
assert result == expected_result
161-

tests/functional/adapter/incremental_materialization/test_merge_update_columns.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,3 @@ def test_run_dbt(self, project):
137137

138138

139139

140-

tests/functional/adapter/incremental_materialization/test_quotes_with_merge_update_columns.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,3 @@ def test_run_dbt(self, project):
138138

139139
result = project.run_sql(used_id_5_query, fetch="all")
140140
assert result == expected_result
141-

tests/functional/adapter/macros/test_alter_column_type.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,3 @@ def test_run_macro(self, project):
8383
('NAME', 'CLOB', 0),
8484
('SOME_DATE', 'TIMESTAMP(6)', 0)]
8585
assert expected_columns == columns
86-

tests/functional/adapter/snapshots/test_invalidate_deletes.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,3 @@ def test_run_dbt(self, project):
129129
snapshot_of_deleted_rows = project.run_sql(f"select * from cc_all_snapshot where id=2", fetch="all")
130130
assert len(snapshot_of_deleted_rows) == 1
131131

132-

tests/functional/adapter/test_data_types.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,32 +60,32 @@ class TestTypeBigIntOracle(BaseTypeBigInt):
6060
def models(self):
6161
return {
6262
"expected.sql": models__bigint_expected_sql,
63-
"actual.sql": self.interpolate_macro_namespace(models__bigint_actual_sql, "type_bigint"),
63+
"actual.sql": self().interpolate_macro_namespace(models__bigint_actual_sql, "type_bigint"),
6464
}
6565

6666

6767
class TestTypeFloatOracle(BaseTypeFloat):
6868

6969
@pytest.fixture(scope="class")
7070
@classmethod
71-
def models(self):
72-
return {"actual.sql": self.interpolate_macro_namespace(models__float_actual_sql, "type_float")}
71+
def models(cls):
72+
return {"actual.sql": cls().interpolate_macro_namespace(models__float_actual_sql, "type_float")}
7373

7474

7575
class TestTypeIntOracle(BaseTypeInt):
7676

7777
@pytest.fixture(scope="class")
7878
@classmethod
79-
def models(self):
80-
return {"actual.sql": self.interpolate_macro_namespace(models__int_actual_sql, "type_int")}
79+
def models(cls):
80+
return {"actual.sql": cls().interpolate_macro_namespace(models__int_actual_sql, "type_int")}
8181

8282

8383
class TestTypeNumericOracle(BaseTypeNumeric):
8484

8585
@pytest.fixture(scope="class")
8686
@classmethod
87-
def models(self):
88-
return {"actual.sql": self.interpolate_macro_namespace(models__numeric_actual_sql, "type_numeric")}
87+
def models(cls):
88+
return {"actual.sql": cls().interpolate_macro_namespace(models__numeric_actual_sql, "type_numeric")}
8989

9090

9191
class TestTypeBooleanOracle(BaseTypeBoolean):
@@ -98,4 +98,4 @@ def seeds(self):
9898
@pytest.fixture(scope="class")
9999
@classmethod
100100
def models(self):
101-
return {"actual.sql": self.interpolate_macro_namespace(models__boolean_actual_sql, "type_boolean")}
101+
return {"actual.sql": self().interpolate_macro_namespace(models__boolean_actual_sql, "type_boolean")}

tests/functional/adapter/test_grants.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class TestModelGrantsOracle(BaseModelGrants):
5555
@pytest.fixture(scope="class")
5656
@classmethod
5757
def models(self):
58-
updated_schema = self.interpolate_name_overrides(model_schema_yml)
58+
updated_schema = self().interpolate_name_overrides(model_schema_yml)
5959

6060
return {
6161
"my_model.sql": my_model_sql,
@@ -68,7 +68,7 @@ class TestIncrementalGrantsOracle(BaseIncrementalGrants):
6868
@pytest.fixture(scope="class")
6969
@classmethod
7070
def models(self):
71-
updated_schema = self.interpolate_name_overrides(incremental_model_schema_yml)
71+
updated_schema = self().interpolate_name_overrides(incremental_model_schema_yml)
7272
return {
7373
"my_incremental_model.sql": my_incremental_model_sql,
7474
"schema.yml": updated_schema,
@@ -98,5 +98,5 @@ class TestSnapshotGrantsOracle(BaseSnapshotGrants):
9898
def snapshots(self):
9999
return {
100100
"my_snapshot.sql": my_snapshot_sql,
101-
"schema.yml": self.interpolate_name_overrides(snapshot_schema_yml),
101+
"schema.yml": self().interpolate_name_overrides(snapshot_schema_yml),
102102
}

0 commit comments

Comments
 (0)