Skip to content

Commit 71aeb6f

Browse files
committed
fix: PostgreSQL database supports creating root database and user
1 parent 5d2084f commit 71aeb6f

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

agent/app/service/database.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,10 @@ func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
119119
if req.Timeout == 0 {
120120
req.Timeout = 30
121121
}
122+
var err error
122123
switch req.Type {
123124
case constant.AppPostgresql:
124-
_, err := postgresql.NewPostgresqlClient(pgclient.DBInfo{
125+
_, err = postgresql.NewPostgresqlClient(pgclient.DBInfo{
125126
From: "remote",
126127
Address: req.Address,
127128
Port: req.Port,
@@ -130,17 +131,15 @@ func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
130131
Password: req.Password,
131132
Timeout: req.Timeout,
132133
})
133-
return err == nil
134134
case constant.AppRedis:
135-
_, err := redisclient.NewRedisClient(redisclient.DBInfo{
135+
_, err = redisclient.NewRedisClient(redisclient.DBInfo{
136136
Address: req.Address,
137137
Port: req.Port,
138138
Password: req.Password,
139139
Timeout: req.Timeout,
140140
})
141-
return err == nil
142141
case "mysql", "mariadb":
143-
_, err := mysql.NewMysqlClient(client.DBInfo{
142+
_, err = mysql.NewMysqlClient(client.DBInfo{
144143
From: "remote",
145144
Address: req.Address,
146145
Port: req.Port,
@@ -154,10 +153,13 @@ func (u *DatabaseService) CheckDatabase(req dto.DatabaseCreate) bool {
154153
SkipVerify: req.SkipVerify,
155154
Timeout: req.Timeout,
156155
})
157-
return err == nil
156+
}
157+
if err != nil {
158+
global.LOG.Errorf("check database connection failed, err: %v", err)
159+
return false
158160
}
159161

160-
return false
162+
return true
161163
}
162164

163165
func (u *DatabaseService) Create(req dto.DatabaseCreate) error {

agent/app/service/database_mysql.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (u *MysqlService) Create(ctx context.Context, req dto.MysqlDBCreate) (*mode
115115
}
116116

117117
if req.From == "local" && req.Username == "root" {
118-
return nil, errors.New("Cannot set root as user name")
118+
return nil, errors.New("cannot set root as user name")
119119
}
120120

121121
cli, version, err := LoadMysqlClientByFrom(req.Database)

agent/app/service/database_postgresql.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"github.com/1Panel-dev/1Panel/agent/utils/postgresql/client"
2222
_ "github.com/jackc/pgx/v5/stdlib"
2323
"github.com/jinzhu/copier"
24-
"github.com/pkg/errors"
2524
)
2625

2726
type PostgresqlService struct{}
@@ -138,10 +137,6 @@ func (u *PostgresqlService) Create(ctx context.Context, req dto.PostgresqlDBCrea
138137
return nil, buserr.WithDetail("ErrStructTransform", err.Error(), nil)
139138
}
140139

141-
if req.From == "local" && req.Username == "root" {
142-
return nil, errors.New("Cannot set root as user name")
143-
}
144-
145140
cli, err := LoadPostgresqlClientByFrom(req.Database)
146141
if err != nil {
147142
return nil, err

0 commit comments

Comments
 (0)