@@ -241,7 +241,7 @@ def read_sql_table(
241
241
try :
242
242
meta .reflect (only = [table_name ], views = True )
243
243
except sqlalchemy .exc .InvalidRequestError :
244
- raise ValueError ("Table {name } not found" . format ( name = table_name ) )
244
+ raise ValueError (f "Table { table_name } not found" )
245
245
246
246
pandas_sql = SQLDatabase (con , meta = meta )
247
247
table = pandas_sql .read_table (
@@ -256,7 +256,7 @@ def read_sql_table(
256
256
if table is not None :
257
257
return table
258
258
else :
259
- raise ValueError ("Table {name } not found" . format ( name = table_name ) , con )
259
+ raise ValueError (f "Table { table_name } not found" , con )
260
260
261
261
262
262
def read_sql_query (
@@ -498,7 +498,7 @@ def to_sql(
498
498
.. versionadded:: 0.24.0
499
499
"""
500
500
if if_exists not in ("fail" , "replace" , "append" ):
501
- raise ValueError ("'{0 }' is not valid for if_exists" . format ( if_exists ) )
501
+ raise ValueError (f "'{ if_exists } ' is not valid for if_exists" )
502
502
503
503
pandas_sql = pandasSQL_builder (con , schema = schema )
504
504
@@ -625,7 +625,7 @@ def __init__(
625
625
self .table = self .pd_sql .get_table (self .name , self .schema )
626
626
627
627
if self .table is None :
628
- raise ValueError ("Could not init table '{name}'" . format ( name = name ) )
628
+ raise ValueError (f "Could not init table '{ name } '" )
629
629
630
630
def exists (self ):
631
631
return self .pd_sql .has_table (self .name , self .schema )
@@ -643,18 +643,14 @@ def _execute_create(self):
643
643
def create (self ):
644
644
if self .exists ():
645
645
if self .if_exists == "fail" :
646
- raise ValueError (
647
- "Table '{name}' already exists." .format (name = self .name )
648
- )
646
+ raise ValueError (f"Table '{ self .name } ' already exists." )
649
647
elif self .if_exists == "replace" :
650
648
self .pd_sql .drop_table (self .name , self .schema )
651
649
self ._execute_create ()
652
650
elif self .if_exists == "append" :
653
651
pass
654
652
else :
655
- raise ValueError (
656
- "'{0}' is not valid for if_exists" .format (self .if_exists )
657
- )
653
+ raise ValueError (f"'{ self .if_exists } ' is not valid for if_exists" )
658
654
else :
659
655
self ._execute_create ()
660
656
@@ -689,7 +685,7 @@ def insert_data(self):
689
685
try :
690
686
temp .reset_index (inplace = True )
691
687
except ValueError as err :
692
- raise ValueError ("duplicate name in index/columns: {0}" . format ( err ) )
688
+ raise ValueError (f "duplicate name in index/columns: { err } " )
693
689
else :
694
690
temp = self .frame
695
691
@@ -732,7 +728,7 @@ def insert(self, chunksize=None, method=None):
732
728
elif callable (method ):
733
729
exec_insert = partial (method , self )
734
730
else :
735
- raise ValueError ("Invalid parameter `method`: {}" . format ( method ) )
731
+ raise ValueError (f "Invalid parameter `method`: { method } " )
736
732
737
733
keys , data_list = self .insert_data ()
738
734
@@ -826,7 +822,7 @@ def _index_name(self, index, index_label):
826
822
if len (index_label ) != nlevels :
827
823
raise ValueError (
828
824
"Length of 'index_label' should match number of "
829
- "levels, which is {0}" . format ( nlevels )
825
+ f "levels, which is { nlevels } "
830
826
)
831
827
else :
832
828
return index_label
@@ -839,7 +835,7 @@ def _index_name(self, index, index_label):
839
835
return ["index" ]
840
836
else :
841
837
return [
842
- l if l is not None else "level_{0}" . format ( i )
838
+ l if l is not None else f "level_{ i } "
843
839
for i , l in enumerate (self .frame .index .names )
844
840
]
845
841
@@ -1304,10 +1300,7 @@ def to_sql(
1304
1300
1305
1301
for col , my_type in dtype .items ():
1306
1302
if not isinstance (to_instance (my_type ), TypeEngine ):
1307
- raise ValueError (
1308
- "The type of {column} is not a "
1309
- "SQLAlchemy type " .format (column = col )
1310
- )
1303
+ raise ValueError (f"The type of { col } is not a SQLAlchemy type" )
1311
1304
1312
1305
table = SQLTable (
1313
1306
name ,
@@ -1331,11 +1324,11 @@ def to_sql(
1331
1324
)
1332
1325
if name not in table_names :
1333
1326
msg = (
1334
- "The provided table name '{0 }' is not found exactly as "
1327
+ f "The provided table name '{ name } ' is not found exactly as "
1335
1328
"such in the database after writing the table, possibly "
1336
1329
"due to case sensitivity issues. Consider using lower "
1337
1330
"case table names."
1338
- ). format ( name )
1331
+ )
1339
1332
warnings .warn (msg , UserWarning )
1340
1333
1341
1334
@property
@@ -1395,9 +1388,7 @@ def _get_unicode_name(name):
1395
1388
try :
1396
1389
uname = str (name ).encode ("utf-8" , "strict" ).decode ("utf-8" )
1397
1390
except UnicodeError :
1398
- raise ValueError (
1399
- "Cannot convert identifier to UTF-8: '{name}'" .format (name = name )
1400
- )
1391
+ raise ValueError (f"Cannot convert identifier to UTF-8: '{ name } '" )
1401
1392
return uname
1402
1393
1403
1394
@@ -1461,8 +1452,8 @@ def insert_statement(self):
1461
1452
bracketed_names = [escape (column ) for column in names ]
1462
1453
col_names = "," .join (bracketed_names )
1463
1454
wildcards = "," .join ([wld ] * len (names ))
1464
- insert_statement = "INSERT INTO {table} ({columns}) VALUES ({wld})" . format (
1465
- table = escape (self .name ), columns = col_names , wld = wildcards
1455
+ insert_statement = (
1456
+ f"INSERT INTO { escape (self .name )} ( { col_names } ) VALUES ( { wildcards } )"
1466
1457
)
1467
1458
return insert_statement
1468
1459
@@ -1496,9 +1487,7 @@ def _create_table_setup(self):
1496
1487
keys = self .keys
1497
1488
cnames_br = ", " .join (escape (c ) for c in keys )
1498
1489
create_tbl_stmts .append (
1499
- "CONSTRAINT {tbl}_pk PRIMARY KEY ({cnames_br})" .format (
1500
- tbl = self .name , cnames_br = cnames_br
1501
- )
1490
+ f"CONSTRAINT { self .name } _pk PRIMARY KEY ({ cnames_br } )"
1502
1491
)
1503
1492
1504
1493
create_stmts = [
@@ -1599,14 +1588,11 @@ def execute(self, *args, **kwargs):
1599
1588
self .con .rollback ()
1600
1589
except Exception as inner_exc : # pragma: no cover
1601
1590
ex = DatabaseError (
1602
- "Execution failed on sql: {sql}\n {exc}\n unable "
1603
- "to rollback" .format (sql = args [0 ], exc = exc )
1591
+ f"Execution failed on sql: { args [0 ]} \n { exc } \n unable to rollback"
1604
1592
)
1605
1593
raise ex from inner_exc
1606
1594
1607
- ex = DatabaseError (
1608
- "Execution failed on sql '{sql}': {exc}" .format (sql = args [0 ], exc = exc )
1609
- )
1595
+ ex = DatabaseError (f"Execution failed on sql '{ args [0 ]} ': { exc } " )
1610
1596
raise ex from exc
1611
1597
1612
1598
@staticmethod
@@ -1731,11 +1717,7 @@ def to_sql(
1731
1717
if dtype is not None :
1732
1718
for col , my_type in dtype .items ():
1733
1719
if not isinstance (my_type , str ):
1734
- raise ValueError (
1735
- "{column} ({type!s}) not a string" .format (
1736
- column = col , type = my_type
1737
- )
1738
- )
1720
+ raise ValueError (f"{ col } ({ my_type } ) not a string" )
1739
1721
1740
1722
table = SQLiteTable (
1741
1723
name ,
@@ -1755,17 +1737,15 @@ def has_table(self, name, schema=None):
1755
1737
# esc_name = escape(name)
1756
1738
1757
1739
wld = "?"
1758
- query = (
1759
- "SELECT name FROM sqlite_master WHERE type='table' AND name={wld};"
1760
- ).format (wld = wld )
1740
+ query = f"SELECT name FROM sqlite_master WHERE type='table' AND name={ wld } ;"
1761
1741
1762
1742
return len (self .execute (query , [name ]).fetchall ()) > 0
1763
1743
1764
1744
def get_table (self , table_name , schema = None ):
1765
1745
return None # not supported in fallback mode
1766
1746
1767
1747
def drop_table (self , name , schema = None ):
1768
- drop_sql = "DROP TABLE {name}" . format ( name = _get_valid_sqlite_name (name ))
1748
+ drop_sql = f "DROP TABLE { _get_valid_sqlite_name (name )} "
1769
1749
self .execute (drop_sql )
1770
1750
1771
1751
def _create_sql_schema (self , frame , table_name , keys = None , dtype = None ):
0 commit comments