Skip to content

Commit e267f22

Browse files
committed
feat(sql): files update
1 parent 1235ee3 commit e267f22

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

sql/file/reader.go

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ func mustReadFiles(root string, queriesFS embed.FS, query interface{}) {
6868

6969
// MustLoad loads queries
7070
// that are located in the default sql directory
71-
//
72-
// Deprecated: MustLoadSQLFiles offers more functionality
7371
func MustLoad(queriesFS embed.FS, query interface{}) {
7472
f, err := fs.ReadDir(queriesFS, ".")
7573
if err != nil {
@@ -80,16 +78,6 @@ func MustLoad(queriesFS embed.FS, query interface{}) {
8078
}
8179
}
8280

83-
// MustLoadSQLFiles queries loads queries that are located on `dir`
84-
func MustLoadSQLFiles(dir string, queriesFS embed.FS, dest interface{}) {
85-
v := reflect.Indirect(reflect.ValueOf(dest))
86-
for i := 0; i < v.NumField(); i++ {
87-
sField := v.Type().Field(i)
88-
vField := v.FieldByName(sField.Name)
89-
setFile(dir+sField.Tag.Get("sql"), queriesFS, vField)
90-
}
91-
}
92-
9381
func setFile(dir string, queriesFS embed.FS, v reflect.Value) {
9482
if v.Kind() == reflect.Struct {
9583
MustLoadSQLFiles(dir+"/", queriesFS, v.Addr().Interface())
@@ -99,3 +87,13 @@ func setFile(dir string, queriesFS embed.FS, v reflect.Value) {
9987
agerr.Assert(err)
10088
v.SetString(string(file))
10189
}
90+
91+
// MustLoadSQLFiles queries loads queries that are located on `dir`
92+
func MustLoadSQLFiles(dir string, queriesFS embed.FS, dest interface{}) {
93+
v := reflect.Indirect(reflect.ValueOf(dest))
94+
for i := 0; i < v.NumField(); i++ {
95+
sField := v.Type().Field(i)
96+
vField := v.FieldByName(sField.Name)
97+
setFile(dir+sField.Tag.Get("sql"), queriesFS, vField)
98+
}
99+
}

0 commit comments

Comments
 (0)