From c95494fdc67d0f9130929dbec7df3f62b187d557 Mon Sep 17 00:00:00 2001 From: Petro Tiurin <93913847+ptiurin@users.noreply.github.com> Date: Wed, 7 Sep 2022 10:18:37 +0100 Subject: [PATCH 1/4] chore: unpin SDK version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index ded2459..e76d6b5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -25,7 +25,7 @@ project_urls = [options] packages = find: install_requires = - firebolt-sdk==0.9.2 + firebolt-sdk>=0.9.2 sqlalchemy>=1.0.0 python_requires = >=3.7 package_dir = From 89e083ee732205aedca165c1c0aef4fd5db15b74 Mon Sep 17 00:00:00 2001 From: Petro Tiurin <93913847+ptiurin@users.noreply.github.com> Date: Wed, 7 Sep 2022 10:24:24 +0100 Subject: [PATCH 2/4] Remove old set parameter functionality from async --- src/firebolt_db/firebolt_async_dialect.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/firebolt_db/firebolt_async_dialect.py b/src/firebolt_db/firebolt_async_dialect.py index 0a5c1e5..be80424 100644 --- a/src/firebolt_db/firebolt_async_dialect.py +++ b/src/firebolt_db/firebolt_async_dialect.py @@ -57,19 +57,17 @@ def execute( self, operation: str, parameters: Optional[Tuple] = None, - set_parameters: Optional[Dict] = None, ) -> None: - self.await_(self._execute(operation, parameters, set_parameters=set_parameters)) + self.await_(self._execute(operation, parameters)) async def _execute( self, operation: str, parameters: Optional[Tuple] = None, - set_parameters: Optional[Dict] = None, ) -> None: async with self._adapt_connection._execute_mutex: await self._cursor.execute( - operation, parameters, set_parameters=set_parameters + operation, parameters ) if self._cursor.description: self._rows = await self._cursor.fetchall() From 7cca6d2dc36c3f97b28b27f689b688e1d7424003 Mon Sep 17 00:00:00 2001 From: Petro Tiurin <93913847+ptiurin@users.noreply.github.com> Date: Wed, 7 Sep 2022 10:31:58 +0100 Subject: [PATCH 3/4] Remove set parameters from tests --- tests/unit/test_firebolt_async_dialect.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test_firebolt_async_dialect.py b/tests/unit/test_firebolt_async_dialect.py index 6c5e06b..d6a49cb 100644 --- a/tests/unit/test_firebolt_async_dialect.py +++ b/tests/unit/test_firebolt_async_dialect.py @@ -80,7 +80,7 @@ def test_cursor() -> AsyncCursorWrapper: assert wrapper.description == "dummy" assert wrapper.rowcount == -1 async_cursor.execute.assert_awaited_once_with( - "INSERT INTO test(a, b) VALUES (?, ?)", [(1, "a")], set_parameters=None + "INSERT INTO test(a, b) VALUES (?, ?)", [(1, "a")] ) async_cursor.fetchall.assert_awaited_once() @@ -105,7 +105,7 @@ def test_cursor() -> AsyncCursorWrapper: assert wrapper.description is None assert wrapper.rowcount == 100 async_cursor.execute.assert_awaited_once_with( - "INSERT INTO test(a, b) VALUES (?, ?)", [(1, "a")], set_parameters=None + "INSERT INTO test(a, b) VALUES (?, ?)", [(1, "a")] ) async_cursor.fetchall.assert_not_awaited() From 761337b76d56495dae3e707795def67de10c1dd7 Mon Sep 17 00:00:00 2001 From: Petro Tiurin <93913847+ptiurin@users.noreply.github.com> Date: Wed, 7 Sep 2022 10:36:49 +0100 Subject: [PATCH 4/4] mypy fix --- src/firebolt_db/firebolt_async_dialect.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/firebolt_db/firebolt_async_dialect.py b/src/firebolt_db/firebolt_async_dialect.py index be80424..8ceeca0 100644 --- a/src/firebolt_db/firebolt_async_dialect.py +++ b/src/firebolt_db/firebolt_async_dialect.py @@ -66,9 +66,7 @@ async def _execute( parameters: Optional[Tuple] = None, ) -> None: async with self._adapt_connection._execute_mutex: - await self._cursor.execute( - operation, parameters - ) + await self._cursor.execute(operation, parameters) if self._cursor.description: self._rows = await self._cursor.fetchall() else: