Refactor to remove duplicate code

Browse Source
This commit is contained in:
Abdurrahmaan Iqbal 2019-07-08 17:52:06 +01:00
parent 70874a2501
commit 85d974b0c3
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dataset/table.py
View File

@ -173,6 +173,9 @@ class Table(object):
See :py:meth:`update() <dataset.Table.update>` for details on See :py:meth:`update() <dataset.Table.update>` for details on
the other parameters. the other parameters.
""" """
# Convert keys to a list if not a list or tuple.
keys = keys if type(keys) in (list, tuple) else [keys]
chunk = [] chunk = []
columns = set() columns = set()
for row in rows: for row in rows:
@ -183,7 +186,8 @@ class Table(object):
for key in keys: for key in keys:
row[f'_{key}'] = row[f'{key}'] row[f'_{key}'] = row[f'{key}']
if len(chunk) == chunk_size: # Update when chunksize is fulfilled or this is the last row
if len(chunk) == chunk_size or rows.index(row) == len(rows)-1:
stmt = self.table.update( stmt = self.table.update(
whereclause=and_( whereclause=and_(
*[self.table.c[key] == bindparam(f'_{key}') for key in keys] *[self.table.c[key] == bindparam(f'_{key}') for key in keys]
@ -196,18 +200,6 @@ class Table(object):
chunk = [] chunk = []
columns = set() columns = set()
if len(chunk):
stmt = self.table.update(
whereclause=and_(
*[self.table.c[key] == bindparam(f'_{key}') for key in keys]
),
values={
column: bindparam(column, required=False) for column in columns
}
)
self.db.executable.execute(stmt, chunk)
def upsert(self, row, keys, ensure=None, types=None): def upsert(self, row, keys, ensure=None, types=None):
"""An UPSERT is a smart combination of insert and update. """An UPSERT is a smart combination of insert and update.
@ -253,7 +245,6 @@ class Table(object):
# Update existing rows. # Update existing rows.
self.update_many(to_update, keys, chunk_size, ensure, types) self.update_many(to_update, keys, chunk_size, ensure, types)
def delete(self, *clauses, **filters): def delete(self, *clauses, **filters):
"""Delete rows from the table. """Delete rows from the table.