Skip to content

Commit 1c3d080

Browse files
author
Jesse Whitehouse
committed
Format tests
Signed-off-by: Jesse Whitehouse <[email protected]>
1 parent f606e59 commit 1c3d080

File tree

1 file changed

+30
-17
lines changed

1 file changed

+30
-17
lines changed

tests/e2e/sqlalchemy/test_basic.py

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,28 @@
1616

1717
USER_AGENT_TOKEN = "PySQL e2e Tests"
1818

19+
1920
def sqlalchemy_1_3():
2021
import sqlalchemy
22+
2123
return sqlalchemy.__version__.startswith("1.3")
2224

25+
2326
def version_agnostic_select(object_to_select, *args, **kwargs):
2427
"""
2528
SQLAlchemy==1.3.x requires arguments to select() to be a Python list
26-
29+
2730
https://docs.sqlalchemy.org/en/20/changelog/migration_14.html#orm-query-is-internally-unified-with-select-update-delete-2-0-style-execution-available
2831
"""
2932

3033
if sqlalchemy_1_3():
3134
return select([object_to_select], *args, **kwargs)
3235
else:
3336
return select(object_to_select, *args, **kwargs)
34-
37+
38+
3539
def version_agnostic_connect_arguments(catalog=None, schema=None) -> Tuple[str, dict]:
36-
40+
3741
HOST = os.environ.get("host")
3842
HTTP_PATH = os.environ.get("http_path")
3943
ACCESS_TOKEN = os.environ.get("access_token")
@@ -44,29 +48,34 @@ def version_agnostic_connect_arguments(catalog=None, schema=None) -> Tuple[str,
4448

4549
if sqlalchemy_1_3():
4650
conn_string = f"databricks://token:{ACCESS_TOKEN}@{HOST}"
47-
connect_args = {**ua_connect_args,
51+
connect_args = {
52+
**ua_connect_args,
4853
"http_path": HTTP_PATH,
4954
"server_hostname": HOST,
5055
"catalog": CATALOG,
51-
"schema": SCHEMA
56+
"schema": SCHEMA,
5257
}
5358

5459
return conn_string, connect_args
5560
else:
56-
return f"databricks://token:{ACCESS_TOKEN}@{HOST}?http_path={HTTP_PATH}&catalog={CATALOG}&schema={SCHEMA}", ua_connect_args
57-
58-
61+
return (
62+
f"databricks://token:{ACCESS_TOKEN}@{HOST}?http_path={HTTP_PATH}&catalog={CATALOG}&schema={SCHEMA}",
63+
ua_connect_args,
64+
)
5965

6066

6167
@pytest.fixture
6268
def db_engine() -> Engine:
6369
conn_string, connect_args = version_agnostic_connect_arguments()
6470
return create_engine(conn_string, connect_args=connect_args)
6571

72+
6673
@pytest.fixture
6774
def samples_engine() -> Engine:
6875

69-
conn_string, connect_args = version_agnostic_connect_arguments(catalog="samples", schema="nyctaxi")
76+
conn_string, connect_args = version_agnostic_connect_arguments(
77+
catalog="samples", schema="nyctaxi"
78+
)
7079
return create_engine(conn_string, connect_args=connect_args)
7180

7281

@@ -130,7 +139,7 @@ def test_pandas_upload(db_engine, metadata_obj):
130139
db_engine.execute("DROP TABLE mock_data")
131140

132141

133-
def test_create_table_not_null(db_engine, metadata_obj:MetaData):
142+
def test_create_table_not_null(db_engine, metadata_obj: MetaData):
134143

135144
table_name = "PySQLTest_{}".format(datetime.datetime.utcnow().strftime("%s"))
136145

@@ -301,29 +310,33 @@ def test_dialect_type_mappings(base, db_engine, metadata_obj: MetaData):
301310

302311
metadata_obj.drop_all()
303312

313+
304314
def test_inspector_smoke_test(samples_engine: Engine):
305-
"""It does not appear that 3L namespace is supported here
306-
"""
315+
"""It does not appear that 3L namespace is supported here"""
307316

308317
from sqlalchemy.engine.reflection import Inspector
309-
schema, table = "nyctaxi", "trips"
310-
318+
319+
schema, table = "nyctaxi", "trips"
320+
311321
try:
312322
inspector = Inspector.from_engine(samples_engine)
313323
except Exception as e:
314324
assert False, f"Could not build inspector: {e}"
315325

316326
# Expect six columns
317327
columns = inspector.get_columns(table, schema=schema)
318-
328+
319329
# Expect zero views, but the method should return
320330
views = inspector.get_view_names(schema=schema)
321331

322-
assert len(columns) == 6, "Dialect did not find the expected number of columns in samples.nyctaxi.trips"
332+
assert (
333+
len(columns) == 6
334+
), "Dialect did not find the expected number of columns in samples.nyctaxi.trips"
323335
assert len(views) == 0, "Views could not be fetched"
324336

337+
325338
def test_get_table_names_smoke_test(samples_engine: Engine):
326-
339+
327340
with samples_engine.connect() as conn:
328341
_names = samples_engine.table_names(schema="nyctaxi", connection=conn)
329342
_names is not None, "get_table_names did not succeed"

0 commit comments

Comments
 (0)