OCTOPUS
/
modules
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

master
Andrey Ivanov 2020-12-10 05:32:19 -05:00 committed by Andrey Ivanov
parent c7941f595a
commit a0362a8da7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/config/config.go
View File

@ -127,7 +127,7 @@ func (s Interface) SetFromDB(db *sql.DB, dbname string) error {
if err != nil {
return fmt.Errorf("can't parse key-value into vars: %w", err)
}
res[key] = val
res[strings.ToLower(key)] = val
}
if err = parseToStruct(reflect.ValueOf(s.str), reflect.TypeOf(s.str), -1, "", res); err != nil {
return fmt.Errorf("can't parse into struct: %w", err)

18
core/config/config_test.go
View File

@ -235,12 +235,12 @@ func TestSetFromDBPositive(t *testing.T) {
defer db.Close()
rows := sqlmock.NewRows([]string{"key", "value"})
rows.AddRow("SECTION1.VARINT1", "11")
rows.AddRow("SECTION1.VARSTRING1", "first string")
rows.AddRow("SECTION1.VARBOOL1", "true")
rows.AddRow("SECTION2.VARINT2", "22")
rows.AddRow("SECTION2.VARSTRING2", "second string")
rows.AddRow("SECTION2.VARBOOL2", "true")
rows.AddRow("section1.varint1", "11")
rows.AddRow("section1.varstring1", "first string")
rows.AddRow("section1.varbool1", "true")
rows.AddRow("section2.varint2", "22")
rows.AddRow("section2.varstring2", "second string")
rows.AddRow("section2.varbool2", "true")
mock.ExpectQuery("SELECT config.key, config.value FROM config").WillReturnRows(rows)
var c TestConf
@ -261,9 +261,9 @@ func TestSetFromDBPositive(t *testing.T) {
defer db.Close()
rows := sqlmock.NewRows([]string{"key", "value"})
rows.AddRow("SECTION2.VARINT2", "22")
rows.AddRow("SECTION2.VARSTRING2", "second string")
rows.AddRow("SECTION2.VARBOOL2", "true")
rows.AddRow("section2.VARINT2", "22")
rows.AddRow("section2.VARSTRING2", "second string")
rows.AddRow("section2.VARBOOL2", "true")
mock.ExpectQuery("SELECT config.key, config.value FROM config").WillReturnRows(rows)
var c TestConf

2
core/config/internal.go
View File

@ -45,7 +45,7 @@ func parseToStruct(v reflect.Value, t reflect.Type, counter int, prefix string,
f = t.Field(counter)
}
v = reflect.Indirect(v)
fName := strings.ToUpper(f.Name)
fName := strings.ToLower(f.Name)
if prefix != "" {
prefix = strings.TrimLeft(prefix, ".")
}