Skip to content

Commit

Permalink
Merge branch 'u/fritzm/smig-fixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
fritzm committed Feb 1, 2023
2 parents 6ca702f + 3a6a9cc commit d26bc06
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions admin/tools/docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ RUN pip3 install \
ltd-conveyor \
"sphinx-rtd-theme>=1.2.0rc3" \
mypy \
mysql-connector-python \
"mysql-connector-python==8.0.31" \
numpy \
pybind11[global] \
pyyaml \
Expand Down Expand Up @@ -230,7 +230,7 @@ RUN pip3 install \
click \
deprecated \
jinja2 \
mysql-connector-python \
"mysql-connector-python==8.0.31" \
pyyaml \
requests \
sqlalchemy
3 changes: 2 additions & 1 deletion src/schema/python/schemaMigMgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,8 @@ def apply_migrations(self, migrations: List[Migration]) -> Optional[Version]:
_log.debug(f"Migration statement: {stmt}")
if stmt:
for result in cursor.execute(stmt, multi=True):
pass
if result.with_rows:
result.fetchall()
else:
_log.warn(
"Migration statement was empty, nothing to execute."
Expand Down

0 comments on commit d26bc06

Please sign in to comment.