sql/sqltool: wrap flyway dir with fs #1642

datdao · 2023-05-09T17:25:39Z

Extending FlywayDir Functionality with fs.FS

By wrapping FlywayDir with fs.FS, we can extend its functionality to include local directories and directories in memory or remote directories.

sql/sqltool/tool.go

sql/sqltool/tool_test.go

giautm

LGTM, @masseelch wdyt?

sql/sqltool/tool.go

Co-authored-by: Ariel Mashraki <7413593+a8m@users.noreply.github.com>

masseelch · 2023-05-10T07:06:12Z

sql/sqltool/tool.go

 	// FlywayDir wraps migrate.LocalDir and provides a migrate.Scanner implementation able to understand files
 	// generated by the FlywayFormatter for migration directory replaying.
-	FlywayDir struct{ *migrate.LocalDir }
+	FlywayDir struct{ fs.FS }


Edit comment as well

sql/sqltool/tool.go

masseelch

Like the idea. However, I suggest to wrap migrate.Dir instead of fs.FS.

giautm · 2023-05-10T07:18:33Z

Like the idea. However, I suggest to wrap migrate.Dir instead of fs.FS.

Because migrate.Dir has more methods than fs.FS so we can't use FlywayDir with os.DirFS or other file-system. The target of this PR is able to use with fs.FS.

sql/sqltool/tool.go

sql/sqltool/tool_test.go

Co-authored-by: Jannik Clausen <12862103+masseelch@users.noreply.github.com>

datdaotest added 6 commits May 9, 2023 19:11

sql/sqltool: wrap flyway dir with fs

4f56f4e

add unittest

f5640f6

fmt code

4a171a8

update unittest

5b9c5b5

update unittest

2da5f7e

change rootpath

ee2ac9c

giautm self-assigned this May 9, 2023

giautm requested review from masseelch and giautm May 9, 2023 17:26

giautm reviewed May 9, 2023

View reviewed changes

sql/sqltool/tool.go Outdated Show resolved Hide resolved

sql/sqltool/tool_test.go Outdated Show resolved Hide resolved

datdaotest added 2 commits May 10, 2023 00:37

update unittest

38b1d27

add more testdata

5874fc9

datdao requested a review from giautm May 10, 2023 02:03

giautm approved these changes May 10, 2023

View reviewed changes

a8m reviewed May 10, 2023

View reviewed changes