diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 88442026c..b4b8c0b10 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0 +current_version = 1.2.0a1 parse = (?P\d+) \.(?P\d+) \.(?P\d+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4574f5a34..f9a094942 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## dbt-spark 1.1.0 (April 28, 2022) +## dbt-spark 1.1.0 (TBD) ### Features - Add session connection method ([#272](https://github.com/dbt-labs/dbt-spark/issues/272), [#279](https://github.com/dbt-labs/dbt-spark/pull/279)) diff --git a/dbt/adapters/spark/__version__.py b/dbt/adapters/spark/__version__.py index b2b60a550..a6b977228 100644 --- a/dbt/adapters/spark/__version__.py +++ b/dbt/adapters/spark/__version__.py @@ -1 +1 @@ -version = "1.1.0" +version = "1.2.0a1" diff --git a/dbt/adapters/spark/impl.py b/dbt/adapters/spark/impl.py index 254600dcc..e3ed6c69b 100644 --- a/dbt/adapters/spark/impl.py +++ b/dbt/adapters/spark/impl.py @@ -146,15 +146,14 @@ def list_relations_without_caching( logger.debug(f"{description} {schema_relation}: {e.msg}") return [] - relations = [] view_names = views.columns["viewName"].values() for tbl in tables: rel_type = RelationType('view' if tbl['tableName'] in view_names else 'table') - schema = tbl['namespace'] if 'namespace' in tbl else tbl['database'] + _schema = tbl['namespace'] if 'namespace' in tbl else tbl['database'] relation = self.Relation.create( - schema=schema, + schema=_schema, identifier=tbl['tableName'], type=rel_type, ) diff --git a/dev_requirements.txt b/dev_requirements.txt index 60f36c6ef..0f84cbd5d 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -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@1.1.latest#egg=dbt-core&subdirectory=core -git+https://github.com/dbt-labs/dbt-core.git@1.1.latest#egg=dbt-tests-adapter&subdirectory=tests/adapter +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 freezegun==0.3.9 pytest>=6.0.2 diff --git a/setup.py b/setup.py index 094b96a7b..12ecbacde 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ def _get_dbt_core_version(): package_name = "dbt-spark" -package_version = "1.1.0" +package_version = "1.2.0a1" dbt_core_version = _get_dbt_core_version() description = """The Apache Spark adapter plugin for dbt"""