From ad8ce50f690948dbce8194b942f67ebaff436b05 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Thu, 18 Nov 2021 15:01:01 -0500 Subject: [PATCH] Fix Windows (#1733) The embed package always uses Unix-style forward slashes. filepath.Join utilization looking for files would cause the slashes to be the wrong direction on Windows and result in the files not being found. --- internal/db/schema/migrations/base.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/db/schema/migrations/base.go b/internal/db/schema/migrations/base.go index 98bd6ae957..ed1b7308b6 100644 --- a/internal/db/schema/migrations/base.go +++ b/internal/db/schema/migrations/base.go @@ -5,7 +5,7 @@ package migrations import ( "embed" - "path/filepath" + "fmt" "strings" ) @@ -38,12 +38,12 @@ func stripBeginCommit(c []byte) string { } func newBase(root string, m embed.FS) base { - schemaVersion, err := m.ReadFile(filepath.Join(root, "01_boundary_schema_version.up.sql")) + schemaVersion, err := m.ReadFile(fmt.Sprintf("%s/%s", root, "01_boundary_schema_version.up.sql")) if err != nil { panic("missing base migration file 01_boundary_schema_version.up.sql") } - logMigration, err := m.ReadFile(filepath.Join(root, "02_log_migration.up.sql")) + logMigration, err := m.ReadFile(fmt.Sprintf("%s/%s", root, "02_log_migration.up.sql")) if err != nil { panic("missing base migration file 02_log_migration.up.sql") }