From 33890ed8606cdfcff4920a749e36a57c4661fe4e Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 22 Feb 2022 11:23:51 +0530 Subject: [PATCH] refactor: use f-strings instead of .format and % --- frappe/database/postgres/schema.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/frappe/database/postgres/schema.py b/frappe/database/postgres/schema.py index f6235b6ff5..bb7ff20a26 100644 --- a/frappe/database/postgres/schema.py +++ b/frappe/database/postgres/schema.py @@ -5,29 +5,29 @@ from frappe.database.schema import DBTable, get_definition class PostgresTable(DBTable): def create(self): - add_text = "" + varchar_len = frappe.db.VARCHAR_LEN + additional_definitions = "" # columns column_defs = self.get_column_definitions() if column_defs: - add_text += ",\n".join(column_defs) + additional_definitions += ",\n".join(column_defs) # child table columns if self.meta.get("istable") or 0: if column_defs: - add_text += ",\n" + additional_definitions += ",\n" - add_text += ",\n".join( + additional_definitions += ",\n".join( ( - "parent varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), - "parentfield varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN), - "parenttype varchar({varchar_len})".format(varchar_len=frappe.db.VARCHAR_LEN) + f"parent varchar({varchar_len})", + f"parentfield varchar({varchar_len})", + f"parenttype varchar({varchar_len})", ) ) - # TODO: set docstatus length # create table - frappe.db.sql("""create table `%s` ( + frappe.db.sql(f"""create table `{self.table_name}` ( name varchar({varchar_len}) not null primary key, creation timestamp(6), modified timestamp(6), @@ -35,7 +35,9 @@ class PostgresTable(DBTable): owner varchar({varchar_len}), docstatus smallint not null default '0', idx bigint not null default '0', - %s)""".format(varchar_len=frappe.db.VARCHAR_LEN) % (self.table_name, add_text)) + {additional_definitions} + )""" + ) self.create_indexes() frappe.db.commit()