@@ -1651,7 +1651,7 @@ def run_transaction(self):
1651
1651
1652
1652
def execute (self , sql : str | Select | TextClause , params = None ):
1653
1653
"""Simple passthrough to SQLAlchemy connectable"""
1654
- from sqlalchemy .exc import DBAPIError as SQLAlchemyDatabaseError
1654
+ from sqlalchemy .exc import SQLAlchemyError
1655
1655
1656
1656
args = [] if params is None else [params ]
1657
1657
if isinstance (sql , str ):
@@ -1661,7 +1661,7 @@ def execute(self, sql: str | Select | TextClause, params=None):
1661
1661
1662
1662
try :
1663
1663
return execute_function (sql , * args )
1664
- except SQLAlchemyDatabaseError as exc :
1664
+ except SQLAlchemyError as exc :
1665
1665
raise DatabaseError (f"Execution failed on sql '{ sql } ': { exc } " ) from exc
1666
1666
1667
1667
def read_table (
@@ -2116,7 +2116,7 @@ def run_transaction(self):
2116
2116
self .con .commit ()
2117
2117
2118
2118
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
2120
2120
2121
2121
if not isinstance (sql , str ):
2122
2122
raise TypeError ("Query must be a string unless using sqlalchemy." )
@@ -2125,10 +2125,10 @@ def execute(self, sql: str | Select | TextClause, params=None):
2125
2125
try :
2126
2126
cur .execute (sql , * args )
2127
2127
return cur
2128
- except ADBCDatabaseError as exc :
2128
+ except Error as exc :
2129
2129
try :
2130
2130
self .con .rollback ()
2131
- except ADBCDatabaseError as inner_exc : # pragma: no cover
2131
+ except Error as inner_exc : # pragma: no cover
2132
2132
ex = DatabaseError (
2133
2133
f"Execution failed on sql: { sql } \n { exc } \n unable to rollback"
2134
2134
)
@@ -2343,7 +2343,7 @@ def to_sql(
2343
2343
engine : {'auto', 'sqlalchemy'}, default 'auto'
2344
2344
Raises NotImplementedError if not set to 'auto'
2345
2345
"""
2346
- from adbc_driver_manager import DatabaseError as ADBCDatabaseError
2346
+ from adbc_driver_manager import Error
2347
2347
import pyarrow as pa
2348
2348
2349
2349
if index_label :
@@ -2390,7 +2390,7 @@ def to_sql(
2390
2390
total_inserted = cur .adbc_ingest (
2391
2391
table_name = name , data = tbl , mode = mode , db_schema_name = schema
2392
2392
)
2393
- except ADBCDatabaseError as exc :
2393
+ except Error as exc :
2394
2394
raise DatabaseError (
2395
2395
f"Failed to insert records on table={ name } with { mode = } "
2396
2396
) from exc
@@ -2534,12 +2534,12 @@ def insert_statement(self, *, num_rows: int) -> str:
2534
2534
return insert_statement
2535
2535
2536
2536
def _execute_insert (self , conn , keys , data_iter ) -> int :
2537
- from sqlite3 import DatabaseError as SQLiteDatabaseError
2537
+ from sqlite3 import Error
2538
2538
2539
2539
data_list = list (data_iter )
2540
2540
try :
2541
2541
conn .executemany (self .insert_statement (num_rows = 1 ), data_list )
2542
- except SQLiteDatabaseError as exc :
2542
+ except Error as exc :
2543
2543
raise DatabaseError ("Execution failed" ) from exc
2544
2544
return conn .rowcount
2545
2545
@@ -2662,7 +2662,7 @@ def run_transaction(self):
2662
2662
cur .close ()
2663
2663
2664
2664
def execute (self , sql : str | Select | TextClause , params = None ):
2665
- from sqlite3 import DatabaseError as SQLiteDatabaseError
2665
+ from sqlite3 import Error
2666
2666
2667
2667
if not isinstance (sql , str ):
2668
2668
raise TypeError ("Query must be a string unless using sqlalchemy." )
@@ -2671,10 +2671,10 @@ def execute(self, sql: str | Select | TextClause, params=None):
2671
2671
try :
2672
2672
cur .execute (sql , * args )
2673
2673
return cur
2674
- except SQLiteDatabaseError as exc :
2674
+ except Error as exc :
2675
2675
try :
2676
2676
self .con .rollback ()
2677
- except SQLiteDatabaseError as inner_exc : # pragma: no cover
2677
+ except Error as inner_exc : # pragma: no cover
2678
2678
ex = DatabaseError (
2679
2679
f"Execution failed on sql: { sql } \n { exc } \n unable to rollback"
2680
2680
)
0 commit comments