From 9138ef81f6c80dccba4b4ab2e952cfcbcabb2ae9 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Sun, 19 Apr 2026 17:35:45 +0200
Subject: [PATCH] Fix metrics table migration (#29250)

---
 core/metrics/db.go | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/core/metrics/db.go b/core/metrics/db.go
index 06809f30f..d84fcdffa 100644
--- a/core/metrics/db.go
+++ b/core/metrics/db.go
@@ -182,23 +182,24 @@ func SetupSchema() error {
 		}
 	}
 
+	rename := func(from, to string) error {
+		if table := new(meter); m.HasColumn(table, from) && !m.HasColumn(table, to) {
+			return m.RenameColumn(table, from, to)
+		}
+		return nil
+	}
+
 	// meter: split energy direction
-	if old := "val"; m.HasColumn(new(meter), old) {
-		if err := m.RenameColumn(new(meter), old, "import"); err != nil {
-			return err
-		}
-	} else {
-		// meter: split energy direction #2
-		if old := "pos"; m.HasColumn(new(meter), old) {
-			if err := m.RenameColumn(new(meter), old, "import"); err != nil {
-				return err
-			}
-		}
-		if old := "neg"; m.HasColumn(new(meter), old) {
-			if err := m.RenameColumn(new(meter), old, "export"); err != nil {
-				return err
-			}
-		}
+	if err := rename("val", "import"); err != nil {
+		return err
+	}
+
+	// meter: split energy direction #2
+	if err := rename("pos", "import"); err != nil {
+		return err
+	}
+	if err := rename("neg", "export"); err != nil {
+		return err
 	}
 
 	return db.Instance.AutoMigrate(new(meter))