Skip to content

Commit 36c9f0a

Browse files
refactor: move imports to top of integration test files
- Move firebolt.db and firebolt.async_db imports to top of test files - Remove local import statements from inside test functions - Use full module names instead of local aliases Addresses final PR feedback from ptiurin on #463 Co-Authored-By: petro.tiurin@firebolt.io <petro.tiurin@firebolt.io>
1 parent 2b5bb71 commit 36c9f0a

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

tests/integration/dbapi/async/V2/test_queries_async.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
from pytest import mark, raises
88

9+
import firebolt.async_db
910
from firebolt.async_db import Binary, Connection, Cursor, OperationalError
1011
from firebolt.async_db.connection import connect
1112
from firebolt.client.auth.base import Auth
@@ -285,12 +286,10 @@ async def test_parameterized_query_with_special_chars(connection: Connection) ->
285286
@mark.parametrize("paramstyle", ["qmark", "fb_numeric"])
286287
async def test_executemany_bulk_insert(connection: Connection, paramstyle: str) -> None:
287288
"""executemany with bulk_insert=True inserts data correctly."""
288-
import firebolt.async_db as db_module
289-
290-
original_paramstyle = db_module.paramstyle
289+
original_paramstyle = firebolt.async_db.paramstyle
291290

292291
try:
293-
db_module.paramstyle = paramstyle
292+
firebolt.async_db.paramstyle = paramstyle
294293

295294
async with connection.cursor() as c:
296295
await c.execute('DROP TABLE IF EXISTS "test_bulk_insert_async"')
@@ -320,7 +319,7 @@ async def test_executemany_bulk_insert(connection: Connection, paramstyle: str)
320319

321320
await c.execute('DROP TABLE "test_bulk_insert_async"')
322321
finally:
323-
db_module.paramstyle = original_paramstyle
322+
firebolt.async_db.paramstyle = original_paramstyle
324323

325324

326325
async def test_multi_statement_query(connection: Connection) -> None:

tests/integration/dbapi/sync/V2/test_queries.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
from pytest import mark, raises
99

10+
import firebolt.db
1011
from firebolt.client.auth import Auth
1112
from firebolt.common._types import ColType
1213
from firebolt.common.row_set.types import Column
@@ -286,12 +287,10 @@ def test_empty_query(c: Cursor, query: str, params: tuple) -> None:
286287
@mark.parametrize("paramstyle", ["qmark", "fb_numeric"])
287288
def test_executemany_bulk_insert(connection: Connection, paramstyle: str) -> None:
288289
"""executemany with bulk_insert=True inserts data correctly."""
289-
import firebolt.db as db_module
290-
291-
original_paramstyle = db_module.paramstyle
290+
original_paramstyle = firebolt.db.paramstyle
292291

293292
try:
294-
db_module.paramstyle = paramstyle
293+
firebolt.db.paramstyle = paramstyle
295294

296295
with connection.cursor() as c:
297296
c.execute('DROP TABLE IF EXISTS "test_bulk_insert"')
@@ -321,7 +320,7 @@ def test_executemany_bulk_insert(connection: Connection, paramstyle: str) -> Non
321320

322321
c.execute('DROP TABLE "test_bulk_insert"')
323322
finally:
324-
db_module.paramstyle = original_paramstyle
323+
firebolt.db.paramstyle = original_paramstyle
325324

326325

327326
def test_multi_statement_query(connection: Connection) -> None:

0 commit comments

Comments
 (0)