Skip to content

fstring in io.sql #30026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 31, 2019
Merged

fstring in io.sql #30026

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6c921a
fstring in io.sql
lexy-lixinyu Dec 4, 2019
0391a78
commit suggestions
jbrockmendel Dec 24, 2019
4db15db
address comments
jbrockmendel Dec 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 23 additions & 43 deletions pandas/io/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ def read_sql_table(
try:
meta.reflect(only=[table_name], views=True)
except sqlalchemy.exc.InvalidRequestError:
raise ValueError("Table {name} not found".format(name=table_name))
raise ValueError(f"Table {table_name} not found")

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


def read_sql_query(
Expand Down Expand Up @@ -498,7 +498,7 @@ def to_sql(
.. versionadded:: 0.24.0
"""
if if_exists not in ("fail", "replace", "append"):
raise ValueError("'{0}' is not valid for if_exists".format(if_exists))
raise ValueError(f"'{if_exists}' is not valid for if_exists")

pandas_sql = pandasSQL_builder(con, schema=schema)

Expand Down Expand Up @@ -625,7 +625,7 @@ def __init__(
self.table = self.pd_sql.get_table(self.name, self.schema)

if self.table is None:
raise ValueError("Could not init table '{name}'".format(name=name))
raise ValueError(f"Could not init table '{name}'")

def exists(self):
return self.pd_sql.has_table(self.name, self.schema)
Expand All @@ -643,18 +643,14 @@ def _execute_create(self):
def create(self):
if self.exists():
if self.if_exists == "fail":
raise ValueError(
"Table '{name}' already exists.".format(name=self.name)
)
raise ValueError(f"Table '{self.name}' already exists.")
elif self.if_exists == "replace":
self.pd_sql.drop_table(self.name, self.schema)
self._execute_create()
elif self.if_exists == "append":
pass
else:
raise ValueError(
"'{0}' is not valid for if_exists".format(self.if_exists)
)
raise ValueError(f"'{self.if_exists}' is not valid for if_exists")
else:
self._execute_create()

Expand Down Expand Up @@ -689,7 +685,7 @@ def insert_data(self):
try:
temp.reset_index(inplace=True)
except ValueError as err:
raise ValueError("duplicate name in index/columns: {0}".format(err))
raise ValueError(f"duplicate name in index/columns: {err}")
else:
temp = self.frame

Expand Down Expand Up @@ -732,7 +728,7 @@ def insert(self, chunksize=None, method=None):
elif callable(method):
exec_insert = partial(method, self)
else:
raise ValueError("Invalid parameter `method`: {}".format(method))
raise ValueError(f"Invalid parameter `method`: {method}")

keys, data_list = self.insert_data()

Expand Down Expand Up @@ -825,8 +821,8 @@ def _index_name(self, index, index_label):
index_label = [index_label]
if len(index_label) != nlevels:
raise ValueError(
"Length of 'index_label' should match number of "
"levels, which is {0}".format(nlevels)
f"Length of 'index_label' should match number of "
"levels, which is {nlevels}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line needs an f

)
else:
return index_label
Expand All @@ -839,7 +835,7 @@ def _index_name(self, index, index_label):
return ["index"]
else:
return [
l if l is not None else "level_{0}".format(i)
l if l is not None else f"level_{i}"
for i, l in enumerate(self.frame.index.names)
]

Expand Down Expand Up @@ -1304,10 +1300,7 @@ def to_sql(

for col, my_type in dtype.items():
if not isinstance(to_instance(my_type), TypeEngine):
raise ValueError(
"The type of {column} is not a "
"SQLAlchemy type ".format(column=col)
)
raise ValueError(f"The type of {col} is not a " "SQLAlchemy type ")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
raise ValueError(f"The type of {col} is not a " "SQLAlchemy type ")
raise ValueError(f"The type of {col} is not a SQLAlchemy type ")

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove trailing space?


table = SQLTable(
name,
Expand All @@ -1331,11 +1324,11 @@ def to_sql(
)
if name not in table_names:
msg = (
"The provided table name '{0}' is not found exactly as "
f"The provided table name '{name}' is not found exactly as "
"such in the database after writing the table, possibly "
"due to case sensitivity issues. Consider using lower "
"case table names."
).format(name)
)
warnings.warn(msg, UserWarning)

@property
Expand Down Expand Up @@ -1395,9 +1388,7 @@ def _get_unicode_name(name):
try:
uname = str(name).encode("utf-8", "strict").decode("utf-8")
except UnicodeError:
raise ValueError(
"Cannot convert identifier to UTF-8: '{name}'".format(name=name)
)
raise ValueError(f"Cannot convert identifier to UTF-8: '{name}'")
return uname


Expand Down Expand Up @@ -1461,8 +1452,8 @@ def insert_statement(self):
bracketed_names = [escape(column) for column in names]
col_names = ",".join(bracketed_names)
wildcards = ",".join([wld] * len(names))
insert_statement = "INSERT INTO {table} ({columns}) VALUES ({wld})".format(
table=escape(self.name), columns=col_names, wld=wildcards
insert_statement = (
f"INSERT INTO {escape(self.name)} ({col_names}) VALUES ({wildcards})"
)
return insert_statement

Expand Down Expand Up @@ -1496,9 +1487,7 @@ def _create_table_setup(self):
keys = self.keys
cnames_br = ", ".join(escape(c) for c in keys)
create_tbl_stmts.append(
"CONSTRAINT {tbl}_pk PRIMARY KEY ({cnames_br})".format(
tbl=self.name, cnames_br=cnames_br
)
f"CONSTRAINT {self.name}_pk PRIMARY KEY ({cnames_br})"
)

create_stmts = [
Expand Down Expand Up @@ -1599,14 +1588,11 @@ def execute(self, *args, **kwargs):
self.con.rollback()
except Exception as inner_exc: # pragma: no cover
ex = DatabaseError(
"Execution failed on sql: {sql}\n{exc}\nunable "
"to rollback".format(sql=args[0], exc=exc)
f"Execution failed on sql: {args[0]}\n{exc}\nunable " "to rollback"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
f"Execution failed on sql: {args[0]}\n{exc}\nunable " "to rollback"
f"Execution failed on sql: {args[0]}\n{exc}\nunable to rollback"

)
raise ex from inner_exc

ex = DatabaseError(
"Execution failed on sql '{sql}': {exc}".format(sql=args[0], exc=exc)
)
ex = DatabaseError(f"Execution failed on sql '{args[0]}': {exc}")
raise ex from exc

@staticmethod
Expand Down Expand Up @@ -1731,11 +1717,7 @@ def to_sql(
if dtype is not None:
for col, my_type in dtype.items():
if not isinstance(my_type, str):
raise ValueError(
"{column} ({type!s}) not a string".format(
column=col, type=my_type
)
)
raise ValueError(f"{col} ({my_type!s}) not a string")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the !s required here?


table = SQLiteTable(
name,
Expand All @@ -1755,17 +1737,15 @@ def has_table(self, name, schema=None):
# esc_name = escape(name)

wld = "?"
query = (
"SELECT name FROM sqlite_master WHERE type='table' AND name={wld};"
).format(wld=wld)
query = f"SELECT name FROM sqlite_master WHERE type='table' AND name={wld};"

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

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

def drop_table(self, name, schema=None):
drop_sql = "DROP TABLE {name}".format(name=_get_valid_sqlite_name(name))
drop_sql = f"DROP TABLE {_get_valid_sqlite_name(name)}"
self.execute(drop_sql)

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