修复读取数据库配置失败问题

azhai · Aug 14, 2024 · 7203c18 · 7203c18
1 parent dcbdb0f
commit 7203c18
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 102 deletions.
diff --git a/cmd/xg/demo.go b/cmd/xg/demo.go
diff --git a/cmd/xm/main.go b/cmd/xm/main.go
diff --git a/models/init.go b/models/init.go
@@ -21,7 +21,7 @@ func init() {
 }
 
 func SetupConns() {
-	if _, err := cmd.LoadConfigFile(false); err != nil {
+	if _, err := cmd.LoadConfigFile(true); err != nil {
 		panic(err)
 	}
 	for _, c := range cmd.GetConnConfigs() {

diff --git a/templater/preset.go b/templater/preset.go
@@ -30,7 +30,8 @@ func init() {
 }
 
 func SetupConns() {
-	if _, err := cmd.LoadConfigFile(false); err != nil {
+	// 需要重新解析，因为配置可能之前解析过，当时忽略了数据库部分
+	if _, err := cmd.LoadConfigFile(true); err != nil {
 		panic(err)
 	}
 	for _, c := range cmd.GetConnConfigs() {

diff --git a/tests/crud_test.go b/tests/crud_test.go
@@ -25,7 +25,7 @@ type MenuForTest struct {
 	*xquery.TimeMixin   `json:",inline" xorm:"extends"`
 }
 
-func (MenuForTest) TableName() string {
+func (*MenuForTest) TableName() string {
 	return "x_menu_abcd"
 }
 
@@ -66,7 +66,7 @@ func Test05Delete(t *testing.T) {
 }
 
 func Test06Query(t *testing.T) {
-	table := (MenuForTest{}).TableName()
+	table := new(MenuForTest).TableName()
 	sql := fmt.Sprintf("DROP TABLE `%s`", table)
 	_, err := db.Engine().Query(sql)
 	assert.NoError(t, err)