Skip to content

Commit

Permalink
Use conn_name_attr for SqliteHook connection (#10156)
Browse files Browse the repository at this point in the history
The DbApiHook allows for a conn_name_attr to be changed in subclasses,
however SqliteHook's `get_conn` method is always calling the main class
attribute. Find the correct attribute and use this to establish the
connection.

Allow attr setting outside init for test case

Closes #10147
  • Loading branch information
coopergillan committed Aug 4, 2020
1 parent dd2dec0 commit 4a0fdb6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
6 changes: 3 additions & 3 deletions airflow/providers/sqlite/hooks/sqlite.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class SqliteHook(DbApiHook):

conn_name_attr = 'sqlite_conn_id'
default_conn_name = 'sqlite_default'
supports_autocommit = False

def get_conn(self):
"""
Returns a sqlite connection object
"""
conn = self.get_connection(self.sqlite_conn_id) # pylint: disable=no-member
conn = sqlite3.connect(conn.host)
conn_id = getattr(self, self.conn_name_attr)
airflow_conn = self.get_connection(conn_id)
conn = sqlite3.connect(airflow_conn.host)
return conn
9 changes: 8 additions & 1 deletion tests/providers/sqlite/hooks/test_sqlite.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def setUp(self):
self.connection = Connection(host='host')

class UnitTestSqliteHook(SqliteHook):
conn_name_attr = 'sqlite_conn_id'
conn_name_attr = 'test_conn_id'

self.db_hook = UnitTestSqliteHook()
self.db_hook.get_connection = mock.Mock()
Expand All @@ -43,6 +43,13 @@ def test_get_conn(self, mock_connect):
self.db_hook.get_conn()
mock_connect.assert_called_once_with('host')

@patch('airflow.providers.sqlite.hooks.sqlite.sqlite3.connect')
def test_get_conn_non_default_id(self, mock_connect):
self.db_hook.test_conn_id = 'non_default' # pylint: disable=attribute-defined-outside-init
self.db_hook.get_conn()
mock_connect.assert_called_once_with('host')
self.db_hook.get_connection.assert_called_once_with('non_default')


class TestSqliteHook(unittest.TestCase):

Expand Down

0 comments on commit 4a0fdb6

Please sign in to comment.