Skip to content

Commit

Permalink
feat(sql): files update
Browse files Browse the repository at this point in the history
  • Loading branch information
ArielHAlba committed Sep 19, 2022
1 parent 1235ee3 commit e267f22
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions sql/file/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ func mustReadFiles(root string, queriesFS embed.FS, query interface{}) {

// MustLoad loads queries
// that are located in the default sql directory
//
// Deprecated: MustLoadSQLFiles offers more functionality
func MustLoad(queriesFS embed.FS, query interface{}) {
f, err := fs.ReadDir(queriesFS, ".")
if err != nil {
Expand All @@ -80,16 +78,6 @@ func MustLoad(queriesFS embed.FS, query interface{}) {
}
}

// MustLoadSQLFiles queries loads queries that are located on `dir`
func MustLoadSQLFiles(dir string, queriesFS embed.FS, dest interface{}) {
v := reflect.Indirect(reflect.ValueOf(dest))
for i := 0; i < v.NumField(); i++ {
sField := v.Type().Field(i)
vField := v.FieldByName(sField.Name)
setFile(dir+sField.Tag.Get("sql"), queriesFS, vField)
}
}

func setFile(dir string, queriesFS embed.FS, v reflect.Value) {
if v.Kind() == reflect.Struct {
MustLoadSQLFiles(dir+"/", queriesFS, v.Addr().Interface())
Expand All @@ -99,3 +87,13 @@ func setFile(dir string, queriesFS embed.FS, v reflect.Value) {
agerr.Assert(err)
v.SetString(string(file))
}

// MustLoadSQLFiles queries loads queries that are located on `dir`
func MustLoadSQLFiles(dir string, queriesFS embed.FS, dest interface{}) {
v := reflect.Indirect(reflect.ValueOf(dest))
for i := 0; i < v.NumField(); i++ {
sField := v.Type().Field(i)
vField := v.FieldByName(sField.Name)
setFile(dir+sField.Tag.Get("sql"), queriesFS, vField)
}
}

0 comments on commit e267f22

Please sign in to comment.