Skip to content

Commit c2cd90a

Browse files
committed
compat fixups
1 parent 7223e63 commit c2cd90a

File tree

1 file changed

+42
-10
lines changed

1 file changed

+42
-10
lines changed

pandas/tests/io/test_sql.py

+42-10
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ def create_and_load_iris_postgresql(conn, iris_file: Path):
203203
def create_and_load_iris(conn, iris_file: Path, dialect: str):
204204
from sqlalchemy import insert
205205

206-
import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
207206
iris = iris_table_metadata(dialect)
208207

209208
with iris_file.open(newline=None, encoding="utf-8") as csvfile:
@@ -223,7 +222,12 @@ def create_and_load_iris_view(conn):
223222
cur = conn.cursor()
224223
cur.execute(stmt)
225224
else:
226-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
225+
if pa_version_under8p0:
226+
adbc = None
227+
else:
228+
adbc = import_optional_dependency(
229+
"adbc_driver_manager.dbapi", errors="ignore"
230+
)
227231
if adbc and isinstance(conn, adbc.Connection):
228232
with conn.cursor() as cur:
229233
cur.execute(stmt)
@@ -301,8 +305,12 @@ def create_and_load_types_sqlite3(conn, types_data: list[dict]):
301305

302306
def create_and_load_types_postgresql(conn, types_data: list[dict]):
303307
# Boolean support not added until 0.8.0
304-
adbc = import_optional_dependency("adbc_driver_manager")
305-
if Version(adbc.__version__) < Version("0.8.0"):
308+
if pa_version_under8p0:
309+
adbc = None
310+
else:
311+
adbc = import_optional_dependency("adbc_driver_manager", errors="ignore")
312+
313+
if adbc and Version(adbc.__version__) < Version("0.8.0"):
306314
bool_type = "INTEGER"
307315
else:
308316
bool_type = "BOOLEAN"
@@ -363,7 +371,10 @@ def check_iris_frame(frame: DataFrame):
363371

364372
def count_rows(conn, table_name: str):
365373
stmt = f"SELECT count(*) AS count_1 FROM {table_name}"
366-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
374+
if pa_version_under8p0:
375+
adbc = None
376+
else:
377+
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
367378
if isinstance(conn, sqlite3.Connection):
368379
cur = conn.cursor()
369380
return cur.execute(stmt).fetchone()[0]
@@ -495,7 +506,12 @@ def get_all_views(conn):
495506
c = conn.execute("SELECT name FROM sqlite_master WHERE type='view'")
496507
return [view[0] for view in c.fetchall()]
497508
else:
498-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
509+
if pa_version_under8p0:
510+
adbc = None
511+
else:
512+
adbc = import_optional_dependency(
513+
"adbc_driver_manager.dbapi", errors="ignore"
514+
)
499515
if adbc and isinstance(conn, adbc.Connection):
500516
results = []
501517
info = conn.adbc_get_objects().read_all().to_pylist()
@@ -520,7 +536,13 @@ def get_all_tables(conn):
520536
c = conn.execute("SELECT name FROM sqlite_master WHERE type='table'")
521537
return [table[0] for table in c.fetchall()]
522538
else:
523-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
539+
if pa_version_under8p0:
540+
adbc = None
541+
else:
542+
adbc = import_optional_dependency(
543+
"adbc_driver_manager.dbapi", errors="ignore"
544+
)
545+
524546
if adbc and isinstance(conn, adbc.Connection):
525547
results = []
526548
info = conn.adbc_get_objects().read_all().to_pylist()
@@ -547,7 +569,12 @@ def drop_table(
547569
conn.commit()
548570

549571
else:
550-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
572+
if pa_version_under8p0:
573+
adbc = None
574+
else:
575+
adbc = import_optional_dependency(
576+
"adbc_driver_manager.dbapi", errors="ignore"
577+
)
551578
if adbc and isinstance(conn, adbc.Connection):
552579
with conn.cursor() as cur:
553580
cur.execute(f'DROP TABLE IF EXISTS "{table_name}"')
@@ -564,7 +591,12 @@ def drop_view(
564591
conn.execute(f"DROP VIEW IF EXISTS {sql._get_valid_sqlite_name(view_name)}")
565592
conn.commit()
566593
else:
567-
adbc = import_optional_dependency("adbc_driver_manager.dbapi", errors="ignore")
594+
if pa_version_under8p0:
595+
adbc = None
596+
else:
597+
adbc = import_optional_dependency(
598+
"adbc_driver_manager.dbapi", errors="ignore"
599+
)
568600
if adbc and isinstance(conn, adbc.Connection):
569601
with conn.cursor() as cur:
570602
cur.execute(f'DROP VIEW IF EXISTS "{view_name}"')
@@ -1796,7 +1828,7 @@ def test_api_timedelta(conn, request):
17961828
)
17971829

17981830
if "adbc" in conn_name:
1799-
exp_warning = None
1831+
exp_warning = FutureWarning # pyarrow warns is_sparse is deprecated
18001832
else:
18011833
exp_warning = UserWarning
18021834

0 commit comments

Comments
 (0)