gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 16:29:17 +08:00
Code

fix: 解决数据库创建重命名用户的问题 (#2222)

Browse Source
This commit is contained in:
ssongliu 2023-09-07 21:36:10 +08:00 committed by GitHub
parent 6e8f22a4a6
commit 6b908d2553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/utils/mysql/client/remote.go
View File

@ -32,7 +32,7 @@ func NewRemote(db Remote) *Remote {
func (r *Remote) Create(info CreateInfo) error { func (r *Remote) Create(info CreateInfo) error {
createSql := fmt.Sprintf("create database `%s` default character set %s collate %s", info.Name, info.Format, formatMap[info.Format]) createSql := fmt.Sprintf("create database `%s` default character set %s collate %s", info.Name, info.Format, formatMap[info.Format])
if err := r.ExecSQL(createSql, info.Timeout); err != nil { if err := r.ExecSQL(createSql, info.Timeout); err != nil {
if strings.Contains(err.Error(), "ERROR 1007") { if strings.Contains(strings.ToLower(err.Error()), "ERROR 1007") {
return buserr.New(constant.ErrDatabaseIsExist) return buserr.New(constant.ErrDatabaseIsExist)
} }
return err return err
@ -61,6 +61,9 @@ func (r *Remote) CreateUser(info CreateInfo, withDeleteDB bool) error {
for _, user := range userlist { for _, user := range userlist {
if err := r.ExecSQL(fmt.Sprintf("create user %s identified by '%s';", user, info.Password), info.Timeout); err != nil { if err := r.ExecSQL(fmt.Sprintf("create user %s identified by '%s';", user, info.Password), info.Timeout); err != nil {
if strings.Contains(strings.ToLower(err.Error()), "error 1396") {
return buserr.New(constant.ErrUserIsExist)
}
if withDeleteDB { if withDeleteDB {
_ = r.Delete(DeleteInfo{ _ = r.Delete(DeleteInfo{
Name: info.Name, Name: info.Name,
@ -69,9 +72,6 @@ func (r *Remote) CreateUser(info CreateInfo, withDeleteDB bool) error {
Permission: info.Permission, Permission: info.Permission,
ForceDelete: true, ForceDelete: true,
Timeout: 300}) Timeout: 300})
if strings.Contains(err.Error(), "ERROR 1396") {
return buserr.New(constant.ErrUserIsExist)
}
} }
return err return err
} }

8
frontend/src/views/database/mysql/index.vue
View File

@ -295,14 +295,18 @@ const onChangeConn = async () => {
}; };
const goRemoteDB = async () => { const goRemoteDB = async () => {
globalStore.setCurrentDB(currentDB.value.database); if (currentDB.value) {
globalStore.setCurrentDB(currentDB.value.database);
}
router.push({ name: 'MySQL-Remote' }); router.push({ name: 'MySQL-Remote' });
}; };
const passwordRef = ref(); const passwordRef = ref();
const onSetting = async () => { const onSetting = async () => {
globalStore.setCurrentDB(currentDB.value.database); if (currentDB.value) {
globalStore.setCurrentDB(currentDB.value.database);
}
router.push({ name: 'MySQL-Setting', params: { type: currentDB.value.type, database: currentDB.value.database } }); router.push({ name: 'MySQL-Setting', params: { type: currentDB.value.type, database: currentDB.value.database } });
}; };