mirror of
https://github.com/lordmathis/lemma.git
synced 2025-11-07 00:14:25 +00:00
Fix tests for db type
This commit is contained in:
@@ -119,10 +119,31 @@ type database struct {
|
||||
}
|
||||
|
||||
// Init initializes the database connection
|
||||
func Init(dbPath string, secretsService secrets.Service) (Database, error) {
|
||||
log := getLogger()
|
||||
func Init(dbType DBType, dbURL string, secretsService secrets.Service) (Database, error) {
|
||||
|
||||
db, err := sql.Open("sqlite3", dbPath)
|
||||
switch dbType {
|
||||
case DBTypeSQLite:
|
||||
db, err := initSQLite(dbURL)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to initialize SQLite database: %w", err)
|
||||
}
|
||||
|
||||
database := &database{
|
||||
DB: db,
|
||||
secretsService: secretsService,
|
||||
dbType: dbType,
|
||||
}
|
||||
return database, nil
|
||||
case DBTypePostgres:
|
||||
return nil, fmt.Errorf("postgres database not supported yet")
|
||||
}
|
||||
|
||||
return nil, fmt.Errorf("unsupported database type: %s", dbType)
|
||||
}
|
||||
|
||||
func initSQLite(dbURL string) (*sql.DB, error) {
|
||||
log := getLogger()
|
||||
db, err := sql.Open("sqlite3", dbURL)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to open database: %w", err)
|
||||
}
|
||||
@@ -136,13 +157,7 @@ func Init(dbPath string, secretsService secrets.Service) (Database, error) {
|
||||
return nil, fmt.Errorf("failed to enable foreign keys: %w", err)
|
||||
}
|
||||
log.Debug("foreign keys enabled")
|
||||
|
||||
database := &database{
|
||||
DB: db,
|
||||
secretsService: secretsService,
|
||||
}
|
||||
|
||||
return database, nil
|
||||
return db, nil
|
||||
}
|
||||
|
||||
// Close closes the database connection
|
||||
|
||||
@@ -25,9 +25,8 @@ func (db *database) Migrate() error {
|
||||
|
||||
var m *migrate.Migrate
|
||||
|
||||
driverName := db.dbType
|
||||
switch driverName {
|
||||
case "postgres":
|
||||
switch db.dbType {
|
||||
case DBTypePostgres:
|
||||
driver, err := postgres.WithInstance(db.DB, &postgres.Config{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create postgres driver: %w", err)
|
||||
@@ -37,7 +36,7 @@ func (db *database) Migrate() error {
|
||||
return fmt.Errorf("failed to create migrate instance: %w", err)
|
||||
}
|
||||
|
||||
case "sqlite3":
|
||||
case DBTypeSQLite:
|
||||
driver, err := sqlite3.WithInstance(db.DB, &sqlite3.Config{})
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to create sqlite driver: %w", err)
|
||||
@@ -48,7 +47,7 @@ func (db *database) Migrate() error {
|
||||
}
|
||||
|
||||
default:
|
||||
return fmt.Errorf("unsupported database driver: %s", driverName)
|
||||
return fmt.Errorf("unsupported database driver: %s", db.dbType)
|
||||
}
|
||||
|
||||
if err := m.Up(); err != nil && err != migrate.ErrNoChange {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
-- 001_initial_schema.up.sql
|
||||
-- Create users table
|
||||
CREATE TABLE IF NOT EXISTS users (
|
||||
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
email TEXT NOT NULL UNIQUE,
|
||||
display_name TEXT,
|
||||
password_hash TEXT NOT NULL,
|
||||
@@ -12,7 +12,7 @@ CREATE TABLE IF NOT EXISTS users (
|
||||
|
||||
-- Create workspaces table with integrated settings
|
||||
CREATE TABLE IF NOT EXISTS workspaces (
|
||||
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
user_id INTEGER NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
|
||||
@@ -1,53 +1,36 @@
|
||||
package db_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"lemma/internal/db"
|
||||
|
||||
_ "lemma/internal/testenv"
|
||||
"testing"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
func TestMigrate(t *testing.T) {
|
||||
database, err := db.NewTestDB(":memory:", &mockSecrets{})
|
||||
database, err := db.NewTestDB(&mockSecrets{})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to initialize database: %v", err)
|
||||
}
|
||||
defer database.Close()
|
||||
|
||||
t.Run("migrations are applied in order", func(t *testing.T) {
|
||||
if err := database.Migrate(); err != nil {
|
||||
t.Fatalf("failed to run initial migrations: %v", err)
|
||||
}
|
||||
|
||||
// Check migration version
|
||||
var version int
|
||||
err := database.TestDB().QueryRow("SELECT MAX(version) FROM migrations").Scan(&version)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to get migration version: %v", err)
|
||||
}
|
||||
|
||||
if version != 1 { // Current number of migrations in production code
|
||||
t.Errorf("expected migration version 1, got %d", version)
|
||||
}
|
||||
|
||||
// Verify number of migration entries matches versions applied
|
||||
var count int
|
||||
err = database.TestDB().QueryRow("SELECT COUNT(*) FROM migrations").Scan(&count)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to count migrations: %v", err)
|
||||
}
|
||||
|
||||
if count != 1 {
|
||||
t.Errorf("expected 1 migration entries, got %d", count)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("migrations create expected schema", func(t *testing.T) {
|
||||
// Run migrations
|
||||
if err := database.Migrate(); err != nil {
|
||||
t.Fatalf("failed to run migrations: %v", err)
|
||||
}
|
||||
|
||||
// Verify tables exist
|
||||
tables := []string{"users", "workspaces", "sessions", "system_settings", "migrations"}
|
||||
tables := []string{
|
||||
"users",
|
||||
"workspaces",
|
||||
"sessions",
|
||||
"system_settings",
|
||||
// Note: golang-migrate uses its own migrations table
|
||||
"schema_migrations",
|
||||
}
|
||||
|
||||
for _, table := range tables {
|
||||
if !tableExists(t, database, table) {
|
||||
t.Errorf("table %q does not exist", table)
|
||||
@@ -63,91 +46,32 @@ func TestMigrate(t *testing.T) {
|
||||
{"sessions", "idx_sessions_expires_at"},
|
||||
{"sessions", "idx_sessions_refresh_token"},
|
||||
}
|
||||
|
||||
for _, idx := range indexes {
|
||||
if !indexExists(t, database, idx.table, idx.name) {
|
||||
t.Errorf("index %q on table %q does not exist", idx.name, idx.table)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("migrations are idempotent", func(t *testing.T) {
|
||||
// Run migrations again
|
||||
if err := database.Migrate(); err != nil {
|
||||
t.Fatalf("failed to re-run migrations: %v", err)
|
||||
}
|
||||
|
||||
// Verify migration count hasn't changed
|
||||
var count int
|
||||
err = database.TestDB().QueryRow("SELECT COUNT(*) FROM migrations").Scan(&count)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to count migrations: %v", err)
|
||||
}
|
||||
|
||||
if count != 1 {
|
||||
t.Errorf("expected 1 migration entries, got %d", count)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("rollback on migration failure", func(t *testing.T) {
|
||||
// Create a test table that would conflict with a failing migration
|
||||
_, err := database.TestDB().Exec("CREATE TABLE test_rollback (id INTEGER PRIMARY KEY)")
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create test table: %v", err)
|
||||
}
|
||||
|
||||
// Start transaction
|
||||
tx, err := database.Begin()
|
||||
if err != nil {
|
||||
t.Fatalf("failed to start transaction: %v", err)
|
||||
}
|
||||
|
||||
// Try operations that should fail and rollback
|
||||
_, err = tx.Exec(`
|
||||
CREATE TABLE test_rollback (id INTEGER PRIMARY KEY);
|
||||
INSERT INTO nonexistent_table VALUES (1);
|
||||
`)
|
||||
if err == nil {
|
||||
tx.Rollback()
|
||||
t.Fatal("expected migration to fail")
|
||||
}
|
||||
tx.Rollback()
|
||||
|
||||
// Verify the migration version hasn't changed
|
||||
var version int
|
||||
err = database.TestDB().QueryRow("SELECT MAX(version) FROM migrations").Scan(&version)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to get migration version: %v", err)
|
||||
}
|
||||
|
||||
if version != 1 {
|
||||
t.Errorf("expected migration version to remain at 1, got %d", version)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func tableExists(t *testing.T, database db.TestDatabase, tableName string) bool {
|
||||
t.Helper()
|
||||
|
||||
var name string
|
||||
err := database.TestDB().QueryRow(`
|
||||
SELECT name FROM sqlite_master
|
||||
WHERE type='table' AND name=?`,
|
||||
SELECT name FROM sqlite_master
|
||||
WHERE type='table' AND name=?`,
|
||||
tableName,
|
||||
).Scan(&name)
|
||||
|
||||
return err == nil
|
||||
}
|
||||
|
||||
func indexExists(t *testing.T, database db.TestDatabase, tableName, indexName string) bool {
|
||||
t.Helper()
|
||||
|
||||
var name string
|
||||
err := database.TestDB().QueryRow(`
|
||||
SELECT name FROM sqlite_master
|
||||
WHERE type='index' AND tbl_name=? AND name=?`,
|
||||
SELECT name FROM sqlite_master
|
||||
WHERE type='index' AND tbl_name=? AND name=?`,
|
||||
tableName, indexName,
|
||||
).Scan(&name)
|
||||
|
||||
return err == nil
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSessionOperations(t *testing.T) {
|
||||
database, err := db.NewTestDB(":memory:", &mockSecrets{})
|
||||
database, err := db.NewTestDB(&mockSecrets{})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create test database: %v", err)
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ import (
|
||||
)
|
||||
|
||||
func TestSystemOperations(t *testing.T) {
|
||||
database, err := db.NewTestDB(":memory:", &mockSecrets{})
|
||||
database, err := db.NewTestDB(&mockSecrets{})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create test database: %v", err)
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@ type TestDatabase interface {
|
||||
TestDB() *sql.DB
|
||||
}
|
||||
|
||||
func NewTestDB(dbPath string, secretsService secrets.Service) (TestDatabase, error) {
|
||||
db, err := Init(dbPath, secretsService)
|
||||
func NewTestDB(secretsService secrets.Service) (TestDatabase, error) {
|
||||
db, err := Init(DBTypeSQLite, ":memory:", secretsService)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestUserOperations(t *testing.T) {
|
||||
database, err := db.NewTestDB(":memory:", &mockSecrets{})
|
||||
database, err := db.NewTestDB(&mockSecrets{})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create test database: %v", err)
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
)
|
||||
|
||||
func TestWorkspaceOperations(t *testing.T) {
|
||||
database, err := db.NewTestDB(":memory:", &mockSecrets{})
|
||||
database, err := db.NewTestDB(&mockSecrets{})
|
||||
if err != nil {
|
||||
t.Fatalf("failed to create test database: %v", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user