Skip to content

Commit cfffad9

Browse files
lexy-lixinyusimonjayhawkins
authored andcommitted
fstring in io.sql (#30026)
1 parent fd7db98 commit cfffad9

File tree

1 file changed

+22
-42
lines changed

1 file changed

+22
-42
lines changed

pandas/io/sql.py

+22-42
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ def read_sql_table(
241241
try:
242242
meta.reflect(only=[table_name], views=True)
243243
except sqlalchemy.exc.InvalidRequestError:
244-
raise ValueError("Table {name} not found".format(name=table_name))
244+
raise ValueError(f"Table {table_name} not found")
245245

246246
pandas_sql = SQLDatabase(con, meta=meta)
247247
table = pandas_sql.read_table(
@@ -256,7 +256,7 @@ def read_sql_table(
256256
if table is not None:
257257
return table
258258
else:
259-
raise ValueError("Table {name} not found".format(name=table_name), con)
259+
raise ValueError(f"Table {table_name} not found", con)
260260

261261

262262
def read_sql_query(
@@ -498,7 +498,7 @@ def to_sql(
498498
.. versionadded:: 0.24.0
499499
"""
500500
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")
502502

503503
pandas_sql = pandasSQL_builder(con, schema=schema)
504504

@@ -625,7 +625,7 @@ def __init__(
625625
self.table = self.pd_sql.get_table(self.name, self.schema)
626626

627627
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}'")
629629

630630
def exists(self):
631631
return self.pd_sql.has_table(self.name, self.schema)
@@ -643,18 +643,14 @@ def _execute_create(self):
643643
def create(self):
644644
if self.exists():
645645
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.")
649647
elif self.if_exists == "replace":
650648
self.pd_sql.drop_table(self.name, self.schema)
651649
self._execute_create()
652650
elif self.if_exists == "append":
653651
pass
654652
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")
658654
else:
659655
self._execute_create()
660656

@@ -689,7 +685,7 @@ def insert_data(self):
689685
try:
690686
temp.reset_index(inplace=True)
691687
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}")
693689
else:
694690
temp = self.frame
695691

@@ -732,7 +728,7 @@ def insert(self, chunksize=None, method=None):
732728
elif callable(method):
733729
exec_insert = partial(method, self)
734730
else:
735-
raise ValueError("Invalid parameter `method`: {}".format(method))
731+
raise ValueError(f"Invalid parameter `method`: {method}")
736732

737733
keys, data_list = self.insert_data()
738734

@@ -826,7 +822,7 @@ def _index_name(self, index, index_label):
826822
if len(index_label) != nlevels:
827823
raise ValueError(
828824
"Length of 'index_label' should match number of "
829-
"levels, which is {0}".format(nlevels)
825+
f"levels, which is {nlevels}"
830826
)
831827
else:
832828
return index_label
@@ -839,7 +835,7 @@ def _index_name(self, index, index_label):
839835
return ["index"]
840836
else:
841837
return [
842-
l if l is not None else "level_{0}".format(i)
838+
l if l is not None else f"level_{i}"
843839
for i, l in enumerate(self.frame.index.names)
844840
]
845841

@@ -1304,10 +1300,7 @@ def to_sql(
13041300

13051301
for col, my_type in dtype.items():
13061302
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")
13111304

13121305
table = SQLTable(
13131306
name,
@@ -1331,11 +1324,11 @@ def to_sql(
13311324
)
13321325
if name not in table_names:
13331326
msg = (
1334-
"The provided table name '{0}' is not found exactly as "
1327+
f"The provided table name '{name}' is not found exactly as "
13351328
"such in the database after writing the table, possibly "
13361329
"due to case sensitivity issues. Consider using lower "
13371330
"case table names."
1338-
).format(name)
1331+
)
13391332
warnings.warn(msg, UserWarning)
13401333

13411334
@property
@@ -1395,9 +1388,7 @@ def _get_unicode_name(name):
13951388
try:
13961389
uname = str(name).encode("utf-8", "strict").decode("utf-8")
13971390
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}'")
14011392
return uname
14021393

14031394

@@ -1461,8 +1452,8 @@ def insert_statement(self):
14611452
bracketed_names = [escape(column) for column in names]
14621453
col_names = ",".join(bracketed_names)
14631454
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})"
14661457
)
14671458
return insert_statement
14681459

@@ -1496,9 +1487,7 @@ def _create_table_setup(self):
14961487
keys = self.keys
14971488
cnames_br = ", ".join(escape(c) for c in keys)
14981489
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})"
15021491
)
15031492

15041493
create_stmts = [
@@ -1599,14 +1588,11 @@ def execute(self, *args, **kwargs):
15991588
self.con.rollback()
16001589
except Exception as inner_exc: # pragma: no cover
16011590
ex = DatabaseError(
1602-
"Execution failed on sql: {sql}\n{exc}\nunable "
1603-
"to rollback".format(sql=args[0], exc=exc)
1591+
f"Execution failed on sql: {args[0]}\n{exc}\nunable to rollback"
16041592
)
16051593
raise ex from inner_exc
16061594

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}")
16101596
raise ex from exc
16111597

16121598
@staticmethod
@@ -1731,11 +1717,7 @@ def to_sql(
17311717
if dtype is not None:
17321718
for col, my_type in dtype.items():
17331719
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")
17391721

17401722
table = SQLiteTable(
17411723
name,
@@ -1755,17 +1737,15 @@ def has_table(self, name, schema=None):
17551737
# esc_name = escape(name)
17561738

17571739
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};"
17611741

17621742
return len(self.execute(query, [name]).fetchall()) > 0
17631743

17641744
def get_table(self, table_name, schema=None):
17651745
return None # not supported in fallback mode
17661746

17671747
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)}"
17691749
self.execute(drop_sql)
17701750

17711751
def _create_sql_schema(self, frame, table_name, keys=None, dtype=None):

0 commit comments

Comments
 (0)