test: add key_hash clearing logic in account dirty state tests

Author: ToeiRei

internal/db/isdirty_manager_extra_test.go

@@ -5,6 +5,7 @@
 package db
 
 import (
+	"context"
 	"testing"
 	"time"
 )
@@ -34,9 +35,15 @@ func TestToggleAndDeleteMarkDirtyViaManagers(t *testing.T) {
 		if err := UpdateAccountIsDirty(a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), s.bun, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirty(a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), s.bun, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a2); err != nil {
+			t.Fatalf("clear key_hash a2 failed: %v", err)
+		}
 
 		// Add non-global key, assign to a1
 		pk, err := km.AddPublicKeyAndGetModel("ssh-ed25519", "AAAAB3", "t-assign", false, time.Time{})
@@ -51,9 +58,15 @@ func TestToggleAndDeleteMarkDirtyViaManagers(t *testing.T) {
 		if err := UpdateAccountIsDirty(a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), s.bun, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirty(a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), s.bun, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a2); err != nil {
+			t.Fatalf("clear key_hash a2 failed: %v", err)
+		}
 		if err := km.TogglePublicKeyGlobal(pk.ID); err != nil {
 			t.Fatalf("TogglePublicKeyGlobal failed: %v", err)
 		}
@@ -67,6 +80,9 @@ func TestToggleAndDeleteMarkDirtyViaManagers(t *testing.T) {
 		if err := UpdateAccountIsDirty(a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), s.bun, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirty(a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}

internal/db/isdirty_test.go

@@ -5,6 +5,7 @@
 package db
 
 import (
+	"context"
 	"testing"
 	"time"
 )
@@ -28,9 +29,16 @@ func TestIsDirtyFlags(t *testing.T) {
 		if err := UpdateAccountIsDirtyBun(bdb, a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		// Ensure fingerprint starts empty so subsequent operations deterministically mark dirty
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirtyBun(bdb, a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a2); err != nil {
+			t.Fatalf("clear key_hash a2 failed: %v", err)
+		}
 
 		// Add a public key (non-global) and assign to a1
 		if err := AddPublicKeyBun(bdb, "ed25519", "AAAAB3", "k1", false, time.Time{}); err != nil {
@@ -57,6 +65,9 @@ func TestIsDirtyFlags(t *testing.T) {
 		if err := UpdateAccountIsDirtyBun(bdb, a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UnassignKeyFromAccountBun(bdb, pk.ID, a1); err != nil {
 			t.Fatalf("UnassignKeyFromAccountBun failed: %v", err)
 		}
@@ -72,6 +83,9 @@ func TestIsDirtyFlags(t *testing.T) {
 		if err := UpdateAccountIsDirtyBun(bdb, a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a2); err != nil {
+			t.Fatalf("clear key_hash a2 failed: %v", err)
+		}
 		if err := AddPublicKeyBun(bdb, "ed25519", "GGGG", "gk", true, time.Time{}); err != nil {
 			t.Fatalf("AddPublicKeyBun global failed: %v", err)
 		}
@@ -85,9 +99,15 @@ func TestIsDirtyFlags(t *testing.T) {
 		if err := UpdateAccountIsDirtyBun(bdb, a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirtyBun(bdb, a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a2); err != nil {
+			t.Fatalf("clear key_hash a2 failed: %v", err)
+		}
 		// Create a non-global key then toggle it to global
 		if err := AddPublicKeyBun(bdb, "ed25519", "HHHH", "tk", false, time.Time{}); err != nil {
 			t.Fatalf("AddPublicKeyBun tk failed: %v", err)
@@ -109,6 +129,9 @@ func TestIsDirtyFlags(t *testing.T) {
 		if err := UpdateAccountIsDirtyBun(bdb, a1, false); err != nil {
 			t.Fatalf("clear dirty a1 failed: %v", err)
 		}
+		if _, err := ExecRaw(context.Background(), bdb, "UPDATE accounts SET key_hash = NULL WHERE id = ?", a1); err != nil {
+			t.Fatalf("clear key_hash a1 failed: %v", err)
+		}
 		if err := UpdateAccountIsDirtyBun(bdb, a2, false); err != nil {
 			t.Fatalf("clear dirty a2 failed: %v", err)
 		}