From 3bc79068d5d7bae4bb4ecd3a50ff1c7cade4a3a7 Mon Sep 17 00:00:00 2001 From: Andrew Date: Sun, 21 Jul 2019 13:39:12 +0400 Subject: =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?= =?UTF-8?q?=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D1=81=D0=B5=D1=85=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=BD=D0=B0=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B4?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- day9/task5_vue/backend/database/wrappers.py | 34 +++++++++++------------------ 1 file changed, 13 insertions(+), 21 deletions(-) (limited to 'day9/task5_vue/backend/database/wrappers.py') diff --git a/day9/task5_vue/backend/database/wrappers.py b/day9/task5_vue/backend/database/wrappers.py index 824d19e..30d34d9 100644 --- a/day9/task5_vue/backend/database/wrappers.py +++ b/day9/task5_vue/backend/database/wrappers.py @@ -16,7 +16,7 @@ class Wrapper(ABC): pass @abstractmethod - def insert_one(self, table_name, row, field_names=None): + def insert_one(self, table_name, data_row: dict): pass @abstractmethod @@ -58,32 +58,24 @@ class MySQLWrapper(Wrapper): table_headers = [field[0] for field in table_structure] return table_headers - def insert_one(self, table_name, row, field_names=None): + def insert_one(self, table_name, data_row: dict): cursor = self.connection.cursor() + scheme = self.schemes[table_name] - if field_names is not None: - field_names_formatted = [] - for name in field_names: - if name != 'NULL' or not name.isnumeric(): - name = f'`{name}`' - field_names_formatted.append(name) - field_names_formatted = f'({",".join(field_names_formatted)})' - else: - field_names_formatted = '' - - row_formatted = [] - for value in row: - if value == 'NULL' or value.isnumeric(): - row_formatted.append(value) + field_names = [] + values = [] + + for field_name, value in data_row.items(): + field_names.append(f'`{field_name}`') + if scheme.fields[field_name].data_type == str: + values.append(f'"{value}"') else: - row_formatted.append(f'"{value}"') + values.append(value) - request = "START TRANSACTION; INSERT INTO `{}` {} VALUES ({}); COMMIT;".format( - table_name, field_names_formatted, ",".join(row_formatted) + request = "START TRANSACTION; INSERT INTO `{}` ({}) VALUES ({}); COMMIT;".format( + table_name, ",".join(field_names), ",".join(values) ) - print(request) - cursor.execute(request) cursor.close() -- cgit v1.2.3