Skip to content

Commit b690b78

Browse files
authored
Merge pull request #481 from johejo/revert-472-iofs_source_driver
Revert "Add io/fs#FS Driver #471"
2 parents 1593164 + 67546bf commit b690b78

16 files changed

+22
-317
lines changed

source/file/file.go

+22-5
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,31 @@
11
package file
22

33
import (
4+
"net/http"
45
nurl "net/url"
56
"os"
67
"path/filepath"
78

89
"github.com/golang-migrate/migrate/v4/source"
10+
"github.com/golang-migrate/migrate/v4/source/httpfs"
911
)
1012

1113
func init() {
1214
source.Register("file", &File{})
1315
}
1416

15-
func parseURL(url string) (string, error) {
17+
type File struct {
18+
httpfs.PartialDriver
19+
url string
20+
path string
21+
}
22+
23+
func (f *File) Open(url string) (source.Driver, error) {
1624
u, err := nurl.Parse(url)
1725
if err != nil {
18-
return "", err
26+
return nil, err
1927
}
28+
2029
// concat host and path to restore full path
2130
// host might be `.`
2231
p := u.Opaque
@@ -28,17 +37,25 @@ func parseURL(url string) (string, error) {
2837
// default to current directory if no path
2938
wd, err := os.Getwd()
3039
if err != nil {
31-
return "", err
40+
return nil, err
3241
}
3342
p = wd
3443

3544
} else if p[0:1] == "." || p[0:1] != "/" {
3645
// make path absolute if relative
3746
abs, err := filepath.Abs(p)
3847
if err != nil {
39-
return "", err
48+
return nil, err
4049
}
4150
p = abs
4251
}
43-
return p, nil
52+
53+
nf := &File{
54+
url: url,
55+
path: p,
56+
}
57+
if err := nf.Init(http.Dir(p), ""); err != nil {
58+
return nil, err
59+
}
60+
return nf, nil
4461
}

source/file/file_go115.go

-32
This file was deleted.

source/file/file_go116.go

-31
This file was deleted.

source/iofs/README.md

-3
This file was deleted.

source/iofs/doc.go

-10
This file was deleted.

source/iofs/example_test.go

-31
This file was deleted.

source/iofs/iofs.go

-175
This file was deleted.

source/iofs/iofs_test.go

-22
This file was deleted.

source/iofs/testdata/migrations/1_foobar.down.sql

-1
This file was deleted.

source/iofs/testdata/migrations/1_foobar.up.sql

-1
This file was deleted.

source/iofs/testdata/migrations/3_foobar.up.sql

-1
This file was deleted.

source/iofs/testdata/migrations/4_foobar.down.sql

-1
This file was deleted.

source/iofs/testdata/migrations/4_foobar.up.sql

-1
This file was deleted.

source/iofs/testdata/migrations/5_foobar.down.sql

-1
This file was deleted.

source/iofs/testdata/migrations/7_foobar.down.sql

-1
This file was deleted.

source/iofs/testdata/migrations/7_foobar.up.sql

-1
This file was deleted.

0 commit comments

Comments
 (0)