go.mod

@@ -1,3 +0,0 @@
-module git.fuyu.moe/Fuyu/migrate/v2
-
-go 1.16

migrate.go

@@ -5,14 +5,14 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"io/fs"
 	"strconv"
 )
 
 // Options contains all settings
 type Options struct {
 	TableName   string // Name used for version info table; defaults to DefaultTableName if not set
-	Schema    string // Schema used for version info table; In PostgreSQL the current schema is changed to the one specified here
+	Schema      string // Schema used for version info table; For PostgreSQL, ignored if not set
+	AssetPrefix string
 }
 
 // DefaultTableName is the name used when no TableName is specified in Options
@@ -26,15 +26,26 @@ const fileFormat = `%04d.sql`
 // AssetFunc is a function that returns the data for the given name
 type AssetFunc func(string) ([]byte, error)
 
-// Migrate executes all migrations
+// Migrate executes migrations to get to the desired version
-// Filenames need to have incrementing numbers
 // Downgrading is not supported as it could result in data loss
-func Migrate(db *sql.DB, o Options, assets fs.FS) error {
+func Migrate(db *sql.DB, version int, o Options, asset AssetFunc) error {
-	entries, err := fs.ReadDir(assets, `.`)
+	if o.TableName == `` {
-	if err != nil {
+		o.TableName = DefaultTableName
-		panic(`failed to read list of files`)
+	}
+
+	var err error
+
+	searchPath := `public`
+	_ = db.QueryRow(`SHOW search_path`).Scan(&searchPath)
+
+	if o.Schema != `` {
+		_, _ = db.Exec(`CREATE SCHEMA IF NOT EXISTS ` + o.Schema)
+
+		_, err = db.Exec(`SET search_path TO ` + o.Schema)
+		if err != nil {
+			return err
+		}
 	}
-	version := len(entries)
 
 	tx, err := db.Begin()
 	if err != nil {
@@ -42,34 +53,12 @@ func Migrate(db *sql.DB, o Options, assets fs.FS) error {
 	}
 	defer tx.Rollback()
 
-	dbType := getDbType(db)
+	_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS ` + o.TableName + ` (Version integer NOT NULL PRIMARY KEY)`)
-	searchPath := `public`
-	if o.TableName == `` {
-		o.TableName = DefaultTableName
-	}
-
-	if o.Schema != `` {
-		err = createSchemaIfNotExists(tx, o.Schema)
 	if err != nil {
 		return err
 	}
 
-		if dbType == `pq` {
+	row := tx.QueryRow(`SELECT Version FROM ` + o.TableName + ` ORDER BY Version DESC`)
-			_ = tx.QueryRow(`SHOW search_path`).Scan(&searchPath)
-
-			_, err = tx.Exec(`SET search_path TO ` + o.Schema)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	versionTable, err := createTableIfNotExists(tx, o.Schema, o.TableName)
-	if err != nil {
-		return err
-	}
-
-	row := tx.QueryRow(`SELECT version FROM ` + versionTable + ` ORDER BY Version DESC`)
 
 	var v int
 	err = row.Scan(&v)
@@ -78,10 +67,10 @@ func Migrate(db *sql.DB, o Options, assets fs.FS) error {
 	}
 
 	for i := v + 1; i <= version; i++ {
-		fileName := fmt.Sprintf(fileFormat, i)
+		fileName := fmt.Sprintf(o.AssetPrefix+fileFormat, i)
 		errorf := func(e error) error { return fmt.Errorf(`migration "%s" failed: %w`, fileName, e) }
 
-		script, err := fs.ReadFile(assets, fileName)
+		script, err := asset(fileName)
 		if err != nil {
 			return errorf(ErrUpdatesMissing)
 		}
@@ -91,13 +80,13 @@ func Migrate(db *sql.DB, o Options, assets fs.FS) error {
 			return errorf(err)
 		}
 
-		_, err = tx.Exec(`INSERT INTO ` + versionTable + ` (version) VALUES (` + strconv.Itoa(i) + `)`)
+		_, err = tx.Exec(`INSERT INTO ` + o.TableName + ` VALUES (` + strconv.Itoa(i) + `)`)
 		if err != nil {
 			return errorf(err)
 		}
 	}
 
-	if dbType == `pq` && o.Schema != `` {
+	if o.Schema != `` {
 		_, err = tx.Exec(`SET search_path TO ` + searchPath)
 		if err != nil {
 			return err

query.go

@@ -1,35 +0,0 @@
-package migrate
-
-import "database/sql"
-
-func createSchemaIfNotExists(tx *sql.Tx, schema string) error {
-	row := tx.QueryRow(`SELECT 1 FROM information_schema.schemata WHERE schema_name = '` + schema + `'`)
-	err := row.Scan(new(int))
-	if err == sql.ErrNoRows {
-		_, err = tx.Exec(`CREATE SCHEMA ` + schema)
-		if err != nil {
-			return err
-		}
-	}
-	return err
-}
-
-func createTableIfNotExists(tx *sql.Tx, schema, table string) (string, error) {
-	versionTable := table
-	var schemaCond string
-
-	if schema != `` {
-		versionTable = schema + `.` + table
-		schemaCond = ` AND table_schema = '` + schema + `'`
-	}
-
-	row := tx.QueryRow(`SELECT 1 FROM information_schema.tables WHERE table_name = '` + table + `'` + schemaCond)
-	err := row.Scan(new(int))
-	if err == sql.ErrNoRows {
-		_, err = tx.Exec(`CREATE TABLE ` + versionTable + ` (version integer NOT NULL PRIMARY KEY)`)
-		if err != nil {
-			return ``, err
-		}
-	}
-	return versionTable, err
-}

util.go

@@ -1,29 +0,0 @@
-package migrate
-
-import (
-	"database/sql"
-	"reflect"
-	"strings"
-)
-
-func getPkgName(db *sql.DB) string {
-	t := reflect.TypeOf(db.Driver())
-	if t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	path := t.PkgPath()
-	parts := strings.Split(path, `/vendor/`)
-	return parts[len(parts)-1]
-}
-
-func getDbType(db *sql.DB) string {
-	switch getPkgName(db) {
-	case `github.com/lib/pq`, `github.com/jackc/pgx/stdlib`:
-		return `pq`
-	case `github.com/go-sql-driver/mysql`, `github.com/ziutek/mymysql/godrv`:
-		return `my`
-	case `github.com/denisenkom/go-mssqldb`:
-		return `ms`
-	}
-	return ``
-}