Enable override of migrations folder (#52)

database/migration.go

@@ -10,11 +10,13 @@ import (
 )
 
 const (
-	MigrationDir = "migrations" // Default directory for migration files (in the embed.FS)
+	// TODO: This should be configurable or removeable
+	MigrationDir = "migrations" // Default directory for migration files (in the passed FS)
 )
 
 var (
-	ErrNoMigrationFS = fmt.Errorf("migration filesystem is not set")
+	ErrNoMigrationFS     = fmt.Errorf("migration filesystem is not set")
+	ErrNoMigrationsFound = fmt.Errorf("could not find any migrations")
 )
 
 // Execute an up migration using goose.
@@ -137,5 +139,5 @@ func findMigrationsDir(fsys fs.FS, currentPath string) (fs.FS, string, error) {
 		}
 	}
 
-	return nil, "", ErrNoMigrationFS
+	return nil, "", ErrNoMigrationsFound
 }

database/mysql/mysql.go

@@ -10,6 +10,9 @@ import (
 
 const MySQLDriver = "mysql"
 
+//go:embed migrations/*.sql
+var migrationFS embed.FS
+
 type MySQL struct {
 	config Config
 }
@@ -21,6 +24,9 @@ func New(options ...Option) (*MySQL, error) {
 			return nil, err
 		}
 	}
+	if config.migrationFS == nil {
+		config.migrationFS = migrationFS
+	}
 	s := &MySQL{
 		config: config,
 	}
@@ -43,11 +49,8 @@ func (s MySQL) DSNSource() database.DataSource {
 	return s.config
 }
 
-//go:embed migrations/*.sql
-var migrationFS embed.FS
-
 func (s MySQL) MigrationFS() fs.FS {
-	return migrationFS
+	return s.config.migrationFS
 }
 
 func (s MySQL) MigrationEnv() []string {

database/mysql/options.go

@@ -3,6 +3,7 @@ package mysql
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"strconv"
 	"strings"
 	"time"
@@ -106,12 +107,20 @@ func WithQueryTimeout(timeout time.Duration) Option {
 	}
 }
 
+func WithMigrationFS(fs fs.FS) Option {
+	return func(c *Config) error {
+		c.migrationFS = fs
+		return nil
+	}
+}
+
 type Config struct {
 	mysql.Config
 	TargetSchema    string // here for schema-less conns, e.g. for create
 	queryTimeout    time.Duration
 	maxConns        int
 	connMaxLifetime time.Duration
+	migrationFS     fs.FS
 }
 
 func defaultConfig() Config {

database/sqlite/options.go

@@ -3,6 +3,7 @@ package sqlite
 import (
 	"errors"
 	"fmt"
+	"io/fs"
 	"time"
 
 	"github.com/efixler/scrape/database"
@@ -27,6 +28,20 @@ const (
 	AccessModeMemory    AccessMode  = "memory"
 )
 
+type config struct {
+	filename        string
+	busyTimeout     time.Duration // SQLite's busy timeout specifies the time to wait if a table is locked
+	queryTimeout    time.Duration
+	journalMode     JournalMode
+	cacheSize       int
+	synchronous     SyncMode
+	accessMode      AccessMode
+	maxConnections  int           // 0 = use driver defaults
+	connMaxLifetime time.Duration // 0 = use driver defaults
+	noAutoCreate    bool
+	migrationFS     fs.FS
+}
+
 func InMemoryDB() Option {
 	return func(c *config) error {
 		c.filename = InMemoryDBName
@@ -90,17 +105,11 @@ func WithoutAutoCreate() Option {
 	}
 }
 
-type config struct {
-	filename        string
-	busyTimeout     time.Duration // SQLite's busy timeout specifies the time to wait if a table is locked
-	queryTimeout    time.Duration
-	journalMode     JournalMode
-	cacheSize       int
-	synchronous     SyncMode
-	accessMode      AccessMode
-	maxConnections  int           // 0 = use driver defaults
-	connMaxLifetime time.Duration // 0 = use driver defaults
-	noAutoCreate    bool
+func WithMigrationFS(fs fs.FS) Option {
+	return func(c *config) error {
+		c.migrationFS = fs
+		return nil
+	}
 }
 
 func (o config) DSN() string {

database/sqlite/sqlite.go

@@ -12,6 +12,9 @@ import (
 
 const SQLiteDriver = "sqlite3"
 
+//go:embed migrations/*.sql
+var migrationFS embed.FS
+
 type SQLite struct {
 	config config
 	stats  *Stats
@@ -33,6 +36,15 @@ func New(options ...Option) (*SQLite, error) {
 			return nil, err
 		}
 	}
+	// If the migrationFS is not set, use the embedded migrations
+	// This would make the embedded migrations in this package redundant --
+	// it would be good to remove these to keep the engine implementation (reusable)
+	// totally separate from migrations (not reusable().
+	// However, that requires too many changes in too many places
+	// (particularly in the tests) to be worth it right now, so leaving it hardwired/as-is.
+	if c.migrationFS == nil {
+		c.migrationFS = migrationFS
+	}
 	s := &SQLite{
 		config: *c,
 	}
@@ -47,11 +59,8 @@ func (s SQLite) DSNSource() database.DataSource {
 	return s.config
 }
 
-//go:embed migrations/*.sql
-var migrationFS embed.FS
-
-func (s SQLite) MigrationFS() fs.FS {
-	return migrationFS
+func (s *SQLite) MigrationFS() fs.FS {
+	return s.config.migrationFS
 }
 
 func (s *SQLite) AfterOpen(dbh *database.DBHandle) error {

internal/cmd/database.go

@@ -146,9 +146,9 @@ func database(spec DatabaseSpec, username string, password string, migration Mig
 			mysql.Username(username),
 			mysql.Password(password),
 		}
-		// For MySQL we need special handling only when it's possible that the db doesn't
-		// exist yet.
 		if migration == Up {
+			// For MySQL we need special handling only when it's possible
+			// that the db doesn't exist yet.
 			options = append(options, mysql.ForMigration())
 		}
 		engine, err := mysql.New(options...)

internal/server/version/version.go

@@ -1,7 +1,7 @@
 package version
 
 const (
-	Commit  = "87b5e32"
+	Commit  = "81bd03a"
 	Tag     = "v0.8.6"
 	RepoURL = "https://github.com/efixler/scrape"
 )