Fixed some small bugs after merge

internal/db/migration_test.go

@@ -1,7 +1,6 @@
 package db
 
 import (
-	"context"
 	"database/sql"
 	"fmt"
 	"os"
@@ -80,9 +79,9 @@ func TestMigrationsStepByStep(t *testing.T) {
 		}
 
 		for _, s := range songs {
-			_, err := db.Exec(`INSERT INTO song (game_id, song_name, path) 
-				VALUES ($1, $2, $3)`,
-				s.gameID, s.name, s.path)
+			_, err := db.Exec(`INSERT INTO song (game_id, song_name, path, hash) 
+				VALUES ($1, $2, $3, $4)`,
+				s.gameID, s.name, s.path, fmt.Sprintf("song-hash-%s", s.name))
 			require.NoError(t, err, "Failed to insert song %s", s.name)
 		}
 
@@ -95,9 +94,9 @@ func TestMigrationsStepByStep(t *testing.T) {
 		var songCount int
 		err = db.QueryRow("SELECT COUNT(*) FROM song").Scan(&songCount)
 		require.NoError(t, err)
-		require.Equal(t, 8, songCount, "Expected 8 songs")
+		require.Equal(t, 9, songCount, "Expected 9 songs")
 
-		t.Log("✓ Manually inserted 5 games with 8 songs")
+		t.Log("✓ Manually inserted 5 games with 9 songs")
 	})
 
 	// Step 3: Apply migration 5 (rename game→soundtrack)
@@ -126,7 +125,7 @@ func TestMigrationsStepByStep(t *testing.T) {
 		var songCount int
 		err = db.QueryRow("SELECT COUNT(*) FROM song").Scan(&songCount)
 		require.NoError(t, err)
-		require.Equal(t, 8, songCount, "Expected 8 songs after migration")
+		require.Equal(t, 9, songCount, "Expected 9 songs after migration")
 
 		// Verify data integrity: soundtrack_name values
 		rows, err := db.Query("SELECT soundtrack_name FROM soundtrack ORDER BY id")
@@ -215,13 +214,18 @@ func applyMigrations(t *testing.T, host, port, user, password, dbname string, st
 	require.NoError(t, err)
 
 	m, err := migrate.NewWithDatabaseInstance(
-		"file://internal/db/migrations",
+		"file://migrations",
 		"postgres", driver)
 	require.NoError(t, err)
 
 	// Get current version
 	version, _, err := m.Version()
-	require.NoError(t, err)
+	if err != nil && err != migrate.ErrNilVersion {
+		require.NoError(t, err)
+	}
+	if err == migrate.ErrNilVersion {
+		version = 0
+	}
 	t.Logf("Current migration version: %d", version)
 
 	// Apply exactly 'steps' migrations
@@ -237,6 +241,11 @@ func applyMigrations(t *testing.T, host, port, user, password, dbname string, st
 
 	// Get new version
 	newVersion, _, err := m.Version()
-	require.NoError(t, err)
+	if err != nil && err != migrate.ErrNilVersion {
+		require.NoError(t, err)
+	}
+	if err == migrate.ErrNilVersion {
+		newVersion = 0
+	}
 	t.Logf("Migration version after applying %d steps: %d", steps, newVersion)
 }