From 9eaa8dd04919893a27f33ab7db75494767287bb5 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Wed, 18 Jan 2023 17:23:37 +0100 Subject: [PATCH] Migrate DB: rename table is plural, order matters The calls to AutoMigrate to other classes that refer to users will create the table and it will break, it needs to be done before everything else. Signed-off-by: Kristoffer Dalby --- db.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/db.go b/db.go index e3bc5523..da966fcc 100644 --- a/db.go +++ b/db.go @@ -41,6 +41,13 @@ func (h *Headscale) initDB() error { db.Exec(`create extension if not exists "uuid-ossp";`) } + _ = db.Migrator().RenameTable("namespaces", "users") + + err = db.AutoMigrate(&User{}) + if err != nil { + return err + } + _ = db.Migrator().RenameColumn(&Machine{}, "ip_address", "ip_addresses") _ = db.Migrator().RenameColumn(&Machine{}, "name", "hostname") @@ -187,13 +194,6 @@ func (h *Headscale) initDB() error { return err } - _ = db.Migrator().RenameTable("Namespace", "User") - - err = db.AutoMigrate(&User{}) - if err != nil { - return err - } - err = db.AutoMigrate(&PreAuthKey{}) if err != nil { return err