Skip to content

Commit

Permalink
Rebasing develop for latest 0.21.0 RC release (#216)
Browse files Browse the repository at this point in the history
* Show more detailed feedback when pyodbc import fails (#192)

* Use exception chaining to get more detailed feedback when pyodbc is not installed

* Remove pyodbc referenced before assignment

* Set back try except

* Add flake ignore

* Add error message to RunTimeException

Error chaining does not show the message in `dbt debug`. Therefore we
explicitly add the message to the dbt.exceptions.RunTimeException

* Update change log

Add to change log that we print the import error when pyodbc can not be imported

* Fix parenthesis in change log

* Update changelog [skip ci]

* Update changelog [skip ci]

* Update changelog [skip ci]

* Add support for ODBC Server Side Parameters (#201)

* Add support for ODBC Server Side Parameters

* Update CHANGELOG

* Feature/able to retry all connections (#194)

* Code changes

* README changes

* Improve error message default

* Changelog

* Changelog corrections

* Restore accidental deletion

* Update dbt/adapters/spark/connections.py

Co-authored-by: Jeremy Cohen <jtcohen6@gmail.com>

* Add myself to Contributors

Co-authored-by: Jeremy Cohen <jtcohen6@gmail.com>

* fixed get_columns_in_relation for open source delta table (#207)

* fixed get_columns_in_relation for open source delta table

* fixed E501 linting error and added change log

* fix issue parsing structs (#204)

* fix issue parsing structs

* include contributor in changelog

* better error explanation

Co-authored-by: Jeremy Cohen <jeremy@fishtownanalytics.com>

* Add adapter unique_field (#211)

* Add adapter unique_field

* Fix flake8. Add changelog entry

* [Snyk] Fix for 2 vulnerabilities (#214)

* fix: requirements.txt to reduce vulnerabilities


The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-SQLPARSE-1584201
- https://snyk.io/vuln/SNYK-PYTHON-THRIFT-474615

* Removing Thrift conflict with versions over 12

Co-authored-by: leahwicz <60146280+leahwicz@users.noreply.github.com>

* 0.21.0b1 Release

* Bumping version to 0.21.0b1

* Bumping to 0.21.0b2

* Bumping version to 0.21.0b2

Co-authored-by: Cor <jczuurmond@protonmail.com>
Co-authored-by: Jeremy Cohen <jeremy@fishtownanalytics.com>
Co-authored-by: Jethro Nederhof <jethro@jethron.id.au>
Co-authored-by: gregingenii <80900458+gregingenii@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jtcohen6@gmail.com>
Co-authored-by: Hariharan Banukumar <hariharan.banukumar@gmail.com>
Co-authored-by: Sergio <ingscc00@gmail.com>
Co-authored-by: Snyk bot <github+bot@snyk.io>
Co-authored-by: Ian Knox <ian.knox@fishtownanalytics.com>
Co-authored-by: Leah Antkiewicz <leah.antkiewicz@dbtlabs.com>
  • Loading branch information
11 people authored Sep 17, 2021
1 parent c74b4f3 commit 4607be4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
- Enhanced get_columns_in_relation method to handle a bug in open source deltalake which doesnt return schema details in `show table extended in databasename like '*'` query output. This impacts dbt snapshots if file format is open source deltalake ([#207](https://github.com/dbt-labs/dbt-spark/pull/207))
- Parse properly columns when there are struct fields to avoid considering inner fields: Issue ([#202](https://github.com/dbt-labs/dbt-spark/issues/202))

### Under the hood
- Add `unique_field` to better understand adapter adoption in anonymous usage tracking ([#211](https://github.com/dbt-labs/dbt-spark/pull/211))

### Contributors
- [@harryharanb](https://github.com/harryharanb) ([#207](https://github.com/dbt-labs/dbt-spark/pull/207))
- [@SCouto](https://github.com/Scouto) ([#204](https://github.com/dbt-labs/dbt-spark/pull/204))
Expand Down
4 changes: 4 additions & 0 deletions dbt/adapters/spark/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ def __post_init__(self):
def type(self):
return 'spark'

@property
def unique_field(self):
return self.host

def _connection_keys(self):
return ('host', 'port', 'cluster',
'endpoint', 'schema', 'organization')
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ dbt-core==0.21.0b2
PyHive[hive]>=0.6.0,<0.7.0
pyodbc>=4.0.30
sqlparams>=3.0.0
thrift>=0.11.0,<0.12.0
thrift>=0.13.0
sqlparse>=0.4.2 # not directly required, pinned by Snyk to avoid a vulnerability

0 comments on commit 4607be4

Please sign in to comment.