diff --git a/dbt/adapters/maxcompute/__version__.py b/dbt/adapters/maxcompute/__version__.py index da9c747..fb12f22 100644 --- a/dbt/adapters/maxcompute/__version__.py +++ b/dbt/adapters/maxcompute/__version__.py @@ -1 +1 @@ -version = "1.9.0-alpha" +version = "1.9.0-alpha.1" diff --git a/dbt/adapters/maxcompute/impl.py b/dbt/adapters/maxcompute/impl.py index 9301f2a..012a165 100644 --- a/dbt/adapters/maxcompute/impl.py +++ b/dbt/adapters/maxcompute/impl.py @@ -20,7 +20,6 @@ from dbt.adapters.contracts.relation import RelationType from dbt.adapters.protocol import AdapterConfig from dbt.adapters.sql import SQLAdapter -from dbt.context.providers import RuntimeConfigObject from dbt_common.contracts.constraints import ConstraintType from dbt_common.exceptions import DbtRuntimeError from dbt_common.utils import AttrDict @@ -557,7 +556,7 @@ def mc_render_raw_columns_constraints( return rendered_column_constraints @available - def run_raw_sql(self, sql: str, configs: RuntimeConfigObject) -> None: + def run_raw_sql(self, sql: str, configs: Any) -> None: hints = {} default_schema = None if configs is not None: @@ -565,4 +564,4 @@ def run_raw_sql(self, sql: str, configs: RuntimeConfigObject) -> None: sql_hints = configs.get("sql_hints") if sql_hints: hints.update(sql_hints) - self.get_odps_client().execute_sql(sql=sql, hints=hints, default_schema=default_schema) \ No newline at end of file + self.get_odps_client().execute_sql(sql=sql, hints=hints, default_schema=default_schema) diff --git a/dbt/adapters/maxcompute/wrapper.py b/dbt/adapters/maxcompute/wrapper.py index 6635473..01d3c94 100644 --- a/dbt/adapters/maxcompute/wrapper.py +++ b/dbt/adapters/maxcompute/wrapper.py @@ -62,20 +62,21 @@ def remove_comments(input_string): # operation = remove_comments(operation) parameters = param_normalization(parameters) operation = replace_sql_placeholders(operation, parameters) + def parse_settings(sql): properties = {} index = 0 while True: - end = sql.find(';', index) + end = sql.find(";", index) if end == -1: break s = sql[index:end] - if re.match(r'(?i)^\s*SET\s+.*=.*?\s*$', s): + if re.match(r"(?i)^\s*SET\s+.*=.*?\s*$", s): # handle one setting - i = s.lower().find('set') - pair_string = s[i + 3:] - pair = pair_string.split('=') + i = s.lower().find("set") + pair_string = s[i + 3 :] + pair = pair_string.split("=") properties[pair[0].strip()] = pair[1].strip() index = end + 1 else: diff --git a/dbt/include/maxcompute/macros/materializations/incremental/bq_incremental_strategy/insert_overwrite.sql b/dbt/include/maxcompute/macros/materializations/incremental/bq_incremental_strategy/insert_overwrite.sql index 269e7ca..d5dd543 100644 --- a/dbt/include/maxcompute/macros/materializations/incremental/bq_incremental_strategy/insert_overwrite.sql +++ b/dbt/include/maxcompute/macros/materializations/incremental/bq_incremental_strategy/insert_overwrite.sql @@ -68,4 +68,4 @@ SELECT * FROM {{ source }} ) -{% endmacro %} \ No newline at end of file +{% endmacro %}