@@ -68,8 +68,6 @@ func mustReadFiles(root string, queriesFS embed.FS, query interface{}) {
68
68
69
69
// MustLoad loads queries
70
70
// that are located in the default sql directory
71
- //
72
- // Deprecated: MustLoadSQLFiles offers more functionality
73
71
func MustLoad (queriesFS embed.FS , query interface {}) {
74
72
f , err := fs .ReadDir (queriesFS , "." )
75
73
if err != nil {
@@ -80,16 +78,6 @@ func MustLoad(queriesFS embed.FS, query interface{}) {
80
78
}
81
79
}
82
80
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
-
93
81
func setFile (dir string , queriesFS embed.FS , v reflect.Value ) {
94
82
if v .Kind () == reflect .Struct {
95
83
MustLoadSQLFiles (dir + "/" , queriesFS , v .Addr ().Interface ())
@@ -99,3 +87,13 @@ func setFile(dir string, queriesFS embed.FS, v reflect.Value) {
99
87
agerr .Assert (err )
100
88
v .SetString (string (file ))
101
89
}
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