diff --git a/database/database_table.py b/database/database_table.py index 8771c75e627fb065a303bceef289c93aa8c0cfc7..64ef5eed17f1e71c68f46ef1234cd02fcc623b78 100644 --- a/database/database_table.py +++ b/database/database_table.py @@ -574,6 +574,7 @@ class DatabaseTable(Table): 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..7c18f5d52c20e33363dde66045438e92243161d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,33 @@ -astroid==1.5.3 -coverage==4.4.1 -decorator==4.0.11 -ipython==6.1.0 +astroid==2.2.5 +coverage==4.5.3 +decorator==4.4.0 +ipython==7.5.0 ipython-genutils==0.2.0 -isort==4.2.15 -jedi==0.10.2 -lazy-object-proxy==1.3.1 +isort==4.3.20 +jedi==0.13.3 +lazy-object-proxy==1.4.1 manage.py==0.2.10 mccabe==0.6.1 -numpy==1.13.0 -pandas==0.20.2 -pexpect==4.2.1 -pickleshare==0.7.4 -prompt-toolkit==1.0.14 -ptyprocess==0.5.1 -py==1.4.34 -Pygments==2.2.0 -pylint==1.7.1 -pymonetdb==1.0.6 -PyMySQL==0.7.11 -pytest==3.2.3 -python-dateutil==2.6.0 -pytz==2017.2 +numpy==1.16.3 +pandas==0.24.2 +pexpect==4.7.0 +pickleshare==0.7.5 +prompt-toolkit==2.0.9 +ptyprocess==0.6.0 +py==1.8.0 +Pygments==2.4.1 +pylint==2.3.1 +pymonetdb==1.1.1 +PyMySQL==0.9.3 +pytest==4.5.0 +python-dateutil==2.8.0 +pytz==2019.1 simplegeneric==0.8.1 -six==1.11.0 -SQLAlchemy==1.1.14 -sqlalchemy-monetdb==0.9.3 +six==1.12.0 +SQLAlchemy==1.2.19 +-e git://github.com/jvwinandy/sqlalchemy-monetdb.git@1.0.1#egg=sqlalchemy-monetdb traitlets==4.3.2 wcwidth==0.1.7 -wrapt==1.10.10 -xlrd==1.0.0 -XlsxWriter==0.9.8 +wrapt==1.11.1 +xlrd==1.2.0 +XlsxWriter==1.1.8