diff --git a/controller/store/sql/embed.go b/controller/store/sql/embed.go deleted file mode 100644 index 72b1e972..00000000 --- a/controller/store/sql/embed.go +++ /dev/null @@ -1,6 +0,0 @@ -package sql - -import "embed" - -//go:embed *.sql -var Fs embed.FS diff --git a/controller/store/sql/000_base.sql b/controller/store/sql/sqlite3/000_base.sql similarity index 100% rename from controller/store/sql/000_base.sql rename to controller/store/sql/sqlite3/000_base.sql diff --git a/controller/store/sql/sqlite3/embed.go b/controller/store/sql/sqlite3/embed.go new file mode 100644 index 00000000..67db55f7 --- /dev/null +++ b/controller/store/sql/sqlite3/embed.go @@ -0,0 +1,6 @@ +package sqlite3_schema + +import "embed" + +//go:embed *.sql +var FS embed.FS diff --git a/controller/store/store.go b/controller/store/store.go index 1981065e..fbe2439c 100644 --- a/controller/store/store.go +++ b/controller/store/store.go @@ -5,7 +5,7 @@ import ( "github.com/iancoleman/strcase" "github.com/jmoiron/sqlx" _ "github.com/mattn/go-sqlite3" - "github.com/openziti-test-kitchen/zrok/controller/store/sql" + sqlite3_schema "github.com/openziti-test-kitchen/zrok/controller/store/sql/sqlite3" "github.com/pkg/errors" migrate "github.com/rubenv/sql-migrate" "github.com/sirupsen/logrus" @@ -52,7 +52,7 @@ func (self *Store) Close() error { func (self *Store) migrate() error { migrations := &migrate.EmbedFileSystemMigrationSource{ - FileSystem: sql.Fs, + FileSystem: sqlite3_schema.FS, Root: "/", } migrate.SetTable("migrations")