diff --git a/database/database_table.py b/database/database_table.py index 8771c75e627fb065a303bceef289c93aa8c0cfc7..d97bf5427ff6989bcdac01a72c09bc2ae43e493a 100644 --- a/database/database_table.py +++ b/database/database_table.py @@ -570,10 +570,10 @@ class DatabaseTable(Table): values = {} for item in transfer_list: - values[item['new_name']] = ttable.columns.get(item['new_name']) + temp_columns = [column for column in ttable.columns if column.key == item['new_name']] + values[item['new_name']] = select(temp_columns).where(list(self.primary_key.columns) == temp_pk_columns) base_update = update(self).values(**values) - for original_pk, temp_pk in zip(list(self.primary_key.columns), temp_pk_columns): - base_update = base_update.where(original_pk == temp_pk) + connection.execute(base_update) trans.commit() diff --git a/database/types.py b/database/types.py index 7cac079ea337de5316869258c8cb83fc248169c6..a9e5be8c5ea20ab3c0fc485008e922c6a634d2ee 100644 --- a/database/types.py +++ b/database/types.py @@ -19,7 +19,7 @@ along with HOTMapper. If not, see <https://www.gnu.org/licenses/>. ''' import re -from sqlalchemy_monetdb.types import MONETDB_TYPE_MAP, TINYINT, DOUBLE_PRECISION +from sqlalchemy_monetdb.monetdb_types import MONETDB_TYPE_MAP, TINYINT, DOUBLE_PRECISION from sqlalchemy.ext.compiler import compiles diff --git a/requirements.txt b/requirements.txt index a244f0b24a3cacbe2a52b3be80c85a8c490859a8..4ed7cb99c7a9d4805755f1838cefdb35ecb14536 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,8 @@ jedi==0.10.2 lazy-object-proxy==1.3.1 manage.py==0.2.10 mccabe==0.6.1 -numpy==1.13.0 -pandas==0.20.2 +numpy==1.16.1 +pandas==0.24.2 pexpect==4.2.1 pickleshare==0.7.4 prompt-toolkit==1.0.14 @@ -17,15 +17,15 @@ ptyprocess==0.5.1 py==1.4.34 Pygments==2.2.0 pylint==1.7.1 -pymonetdb==1.0.6 +pymonetdb==1.1.1 PyMySQL==0.7.11 pytest==3.2.3 python-dateutil==2.6.0 pytz==2017.2 simplegeneric==0.8.1 six==1.11.0 -SQLAlchemy==1.1.14 -sqlalchemy-monetdb==0.9.3 +SQLAlchemy==1.2.19 +sqlalchemy-monetdb==1.0.0 traitlets==4.3.2 wcwidth==0.1.7 wrapt==1.10.10