From ece7612f9d47ce9ea934ebade75d607441dd2523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sun, 18 Jun 2023 00:49:29 +0200 Subject: [PATCH] more migration fixes --- scnserver/cmd/migrate/main.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scnserver/cmd/migrate/main.go b/scnserver/cmd/migrate/main.go index 2bb38e5..c443533 100644 --- a/scnserver/cmd/migrate/main.go +++ b/scnserver/cmd/migrate/main.go @@ -377,8 +377,8 @@ func migrateUser(ctx context.Context, dbnew sq.DB, dbold sq.DB, user OldUser, ap _, err = dbnew.Exec(ctx, "INSERT INTO subscriptions (subscription_id, subscriber_user_id, channel_owner_user_id, channel_internal_name, channel_id, timestamp_created, confirmed) VALUES (:sid, :suid, :ouid, :cnam, :cid, :ts, :conf)", sq.PP{ "sid": models.NewSubscriptionID(), - "suid": user.UserId, - "ouid": user.UserId, + "suid": userid, + "ouid": userid, "cnam": intName, "cid": channelID, "ts": oldmessage.TimestampReal.UnixMilli(), @@ -473,7 +473,7 @@ func migrateUser(ctx context.Context, dbnew sq.DB, dbold sq.DB, user OldUser, ap _, err = dbnew.Exec(ctx, "INSERT INTO deliveries (delivery_id, message_id, receiver_user_id, receiver_client_id, timestamp_created, timestamp_finalized, status, fcm_message_id, next_delivery) VALUES (:did, :mid, :ruid, :rcid, :tsc, :tsf, :stat, :fcm, :next)", sq.PP{ "did": models.NewDeliveryID(), "mid": messageid, - "ruid": user.UserId, + "ruid": userid, "rcid": *clientid, "tsc": oldmessage.TimestampReal.UnixMilli(), "tsf": oldmessage.TimestampReal.UnixMilli(), @@ -500,7 +500,7 @@ func migrateUser(ctx context.Context, dbnew sq.DB, dbold sq.DB, user OldUser, ap _, err = dbnew.Exec(ctx, "INSERT INTO deliveries (delivery_id, message_id, receiver_user_id, receiver_client_id, timestamp_created, timestamp_finalized, status, fcm_message_id, next_delivery) VALUES (:did, :mid, :ruid, :rcid, :tsc, :tsf, :stat, :fcm, :next)", sq.PP{ "did": models.NewDeliveryID(), "mid": messageid, - "ruid": user.UserId, + "ruid": userid, "rcid": *clientid, "tsc": oldmessage.TimestampReal.UnixMilli(), "tsf": oldmessage.TimestampReal.UnixMilli(),