Skip to content

Commit ff5e41e

Browse files
Fixed an issue where pgAdmin config db migration was failing on application upgrade. #9095
1 parent 09bc544 commit ff5e41e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

web/migrations/versions/e6ed5dac37c2_.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"""
1818
from alembic import op
1919
from sqlalchemy.orm.session import Session
20+
from sqlalchemy import update
2021
from pgadmin.model import Preferences, ModulePreference, PreferenceCategory,\
2122
UserPreference
2223
from pgadmin.browser import register_editor_preferences
@@ -85,14 +86,11 @@ def upgrade():
8586
pref_map[pref.id] = new_pref.id
8687

8788
for key, val in pref_map.items():
88-
record_to_update = session.query(UserPreference).filter_by(
89-
pid=key).first()
90-
if record_to_update:
91-
record_to_update.pid = val
89+
stmt = update(UserPreference).where(UserPreference.pid == key).values(pid=val)
90+
session.execute(stmt)
9291

9392
# Delete the old preferences and categories
94-
session.query(Preferences).filter(Preferences.name.in_(prefs),
95-
Preferences.cid.in_(category_ids)
93+
session.query(Preferences).filter(Preferences.cid.in_(category_ids)
9694
).delete(synchronize_session=False)
9795

9896
session.query(PreferenceCategory).filter(

0 commit comments

Comments
 (0)