From 05a3d5b993ff21e8147de295786a339aa877c4b4 Mon Sep 17 00:00:00 2001 From: Sebastian Haas Date: Sat, 25 Jun 2022 15:53:17 +0200 Subject: [PATCH 1/2] fix DB migration remove unnecessary placeholder in moveAccounts --- cmd/signaldctl/cmd/db/migrate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/signaldctl/cmd/db/migrate.go b/cmd/signaldctl/cmd/db/migrate.go index 5bac893..1aee283 100644 --- a/cmd/signaldctl/cmd/db/migrate.go +++ b/cmd/signaldctl/cmd/db/migrate.go @@ -269,7 +269,7 @@ func moveAccounts(source *sql.DB, dest *sql.DB) error { if err != nil { return err } - _, err = dest.Exec("INSERT INTO signald_accounts (uuid, e164, server) VALUES ($1, $2, $3, $4)", accountUUID, e164, server) + _, err = dest.Exec("INSERT INTO signald_accounts (uuid, e164, server) VALUES ($1, $2, $3)", accountUUID, e164, server) if err != nil { return err } From 0c1d0c5f2fed31a7594f261a5e37b1ec41cbe648 Mon Sep 17 00:00:00 2001 From: Sebastian Haas Date: Sat, 25 Jun 2022 17:09:47 +0200 Subject: [PATCH 2/2] update list of migrations --- cmd/signaldctl/cmd/db/migrate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/signaldctl/cmd/db/migrate.go b/cmd/signaldctl/cmd/db/migrate.go index 1aee283..cf1b4e4 100644 --- a/cmd/signaldctl/cmd/db/migrate.go +++ b/cmd/signaldctl/cmd/db/migrate.go @@ -32,6 +32,7 @@ var ( {InstalledRank: 3, Version: "13", Description: "recipient registration status", Script: "V13__recipient_registration_status.sql", Checksum: 405376321}, {InstalledRank: 4, Version: "14", Description: "multiple identity keys per account", Script: "V14__multiple_identity_keys_per_account.sql", Checksum: -1635788950}, {InstalledRank: 5, Version: "15", Description: "profiles tables", Script: "V15__profiles_tables.sql", Checksum: 809686180}, + {InstalledRank: 6, Version: "16", Description: "destination uuid in envelope", Script: "V16__destination_uuid_in_envelope.sql", Checksum: 357656854}, } sqlitePath string