Skip to content

Commit 71e0d24

Browse files
committed
using base exceptions
1 parent 97939df commit 71e0d24

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

pandas/io/sql.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ def run_transaction(self):
16511651

16521652
def execute(self, sql: str | Select | TextClause, params=None):
16531653
"""Simple passthrough to SQLAlchemy connectable"""
1654-
from sqlalchemy.exc import DBAPIError as SQLAlchemyDatabaseError
1654+
from sqlalchemy.exc import SQLAlchemyError
16551655

16561656
args = [] if params is None else [params]
16571657
if isinstance(sql, str):
@@ -1661,7 +1661,7 @@ def execute(self, sql: str | Select | TextClause, params=None):
16611661

16621662
try:
16631663
return execute_function(sql, *args)
1664-
except SQLAlchemyDatabaseError as exc:
1664+
except SQLAlchemyError as exc:
16651665
raise DatabaseError(f"Execution failed on sql '{sql}': {exc}") from exc
16661666

16671667
def read_table(
@@ -2116,7 +2116,7 @@ def run_transaction(self):
21162116
self.con.commit()
21172117

21182118
def execute(self, sql: str | Select | TextClause, params=None):
2119-
from adbc_driver_manager import DatabaseError as ADBCDatabaseError
2119+
from adbc_driver_manager import Error
21202120

21212121
if not isinstance(sql, str):
21222122
raise TypeError("Query must be a string unless using sqlalchemy.")
@@ -2125,10 +2125,10 @@ def execute(self, sql: str | Select | TextClause, params=None):
21252125
try:
21262126
cur.execute(sql, *args)
21272127
return cur
2128-
except ADBCDatabaseError as exc:
2128+
except Error as exc:
21292129
try:
21302130
self.con.rollback()
2131-
except ADBCDatabaseError as inner_exc: # pragma: no cover
2131+
except Error as inner_exc: # pragma: no cover
21322132
ex = DatabaseError(
21332133
f"Execution failed on sql: {sql}\n{exc}\nunable to rollback"
21342134
)
@@ -2343,7 +2343,7 @@ def to_sql(
23432343
engine : {'auto', 'sqlalchemy'}, default 'auto'
23442344
Raises NotImplementedError if not set to 'auto'
23452345
"""
2346-
from adbc_driver_manager import DatabaseError as ADBCDatabaseError
2346+
from adbc_driver_manager import Error
23472347
import pyarrow as pa
23482348

23492349
if index_label:
@@ -2390,7 +2390,7 @@ def to_sql(
23902390
total_inserted = cur.adbc_ingest(
23912391
table_name=name, data=tbl, mode=mode, db_schema_name=schema
23922392
)
2393-
except ADBCDatabaseError as exc:
2393+
except Error as exc:
23942394
raise DatabaseError(
23952395
f"Failed to insert records on table={name} with {mode=}"
23962396
) from exc
@@ -2534,12 +2534,12 @@ def insert_statement(self, *, num_rows: int) -> str:
25342534
return insert_statement
25352535

25362536
def _execute_insert(self, conn, keys, data_iter) -> int:
2537-
from sqlite3 import DatabaseError as SQLiteDatabaseError
2537+
from sqlite3 import Error
25382538

25392539
data_list = list(data_iter)
25402540
try:
25412541
conn.executemany(self.insert_statement(num_rows=1), data_list)
2542-
except SQLiteDatabaseError as exc:
2542+
except Error as exc:
25432543
raise DatabaseError("Execution failed") from exc
25442544
return conn.rowcount
25452545

@@ -2662,7 +2662,7 @@ def run_transaction(self):
26622662
cur.close()
26632663

26642664
def execute(self, sql: str | Select | TextClause, params=None):
2665-
from sqlite3 import DatabaseError as SQLiteDatabaseError
2665+
from sqlite3 import Error
26662666

26672667
if not isinstance(sql, str):
26682668
raise TypeError("Query must be a string unless using sqlalchemy.")
@@ -2671,10 +2671,10 @@ def execute(self, sql: str | Select | TextClause, params=None):
26712671
try:
26722672
cur.execute(sql, *args)
26732673
return cur
2674-
except SQLiteDatabaseError as exc:
2674+
except Error as exc:
26752675
try:
26762676
self.con.rollback()
2677-
except SQLiteDatabaseError as inner_exc: # pragma: no cover
2677+
except Error as inner_exc: # pragma: no cover
26782678
ex = DatabaseError(
26792679
f"Execution failed on sql: {sql}\n{exc}\nunable to rollback"
26802680
)

0 commit comments

Comments
 (0)