Merge branch 'main' into talkwithkeyboard/faster-caching

# Conflicts: # .bumpversion.cfg # dbt/adapters/spark/__version__.py # setup.py
dbt-labs · May 3, 2022 · a9f5573 · a9f5573
2 parents ba1c87b + fbf9abe
commit a9f5573
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.2.0a1
 parse = (?P<major>\d+)
 	\.(?P<minor>\d+)
 	\.(?P<patch>\d+)

diff --git 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
@@ -1 +1 @@
-version = "1.1.0"
+version = "1.2.0a1"
diff --git 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
@@ -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
@@ -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"""