From b2d20d30629f6c3921ff65d2489e7e156614c95b Mon Sep 17 00:00:00 2001 From: Martin Mares <mj@ucw.cz> Date: Sat, 12 Nov 2022 15:59:57 +0100 Subject: [PATCH] =?UTF-8?q?merge-users=20um=C3=AD=20p=C5=99en=C3=A1=C5=A1e?= =?UTF-8?q?t=20i=20p=C5=99ihl=C3=A1=C5=A1ky=20do=20ro=C4=8Dn=C3=ADku?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #286. --- bin/merge-users | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/merge-users b/bin/merge-users index 6a06e5bd..7b7b36f8 100755 --- a/bin/merge-users +++ b/bin/merge-users @@ -55,9 +55,10 @@ sess.flush() conn.execute(db.Log.__table__.update().where(db.Log.changed_by == suid).values(changed_by=duid)) -conn.execute(db.Participant.__table__.delete().where(db.Participant.user_id == suid)) +conn.execute(db.Participant.__table__.update().where(db.Participant.user_id == suid).values(user_id=duid)) -conn.execute(db.Participation.__table__.delete().where(and_(db.Participation.user_id == suid, db.Participation.contest_id == test_contest_id))) +if test_contest: + conn.execute(db.Participation.__table__.delete().where(and_(db.Participation.user_id == suid, db.Participation.contest_id == test_contest_id))) conn.execute(db.Participation.__table__.update().where(db.Participation.user_id == suid).values(user_id=duid)) -- GitLab