TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-08 18:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

!99 feat: DBMS新增kingbaseES、vastbase，还有一些优化

Browse Source 
* refactor: 重构机器列表展示
* fix：修复编辑表问题
* refactor: 优化下拉实例显示
* feat: DBMS新增kingbaseES(已测试postgres、oracle兼容模式) 、vastbase
This commit is contained in:
zongyangleo
2024-02-06 07:32:03 +00:00
committed by Coder慌
parent f2b6e15cf4
commit 3fdd98a390
23 changed files with 416 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/internal/db/dbm/postgres/dialect.go
View File

@@ -26,7 +26,7 @@ type PgsqlDialect struct {
}
func (md *PgsqlDialect) GetDbServer() (*dbi.DbServer, error) {
_, res, err := md.dc.Query("SHOW server_version")
_, res, err := md.dc.Query("SELECT version() as server_version")
if err != nil {
return nil, err
}

28
server/internal/db/dbm/postgres/meta.go
View File

@@ -15,7 +15,10 @@ import (
)
func init() {
dbi.Register(dbi.DbTypePostgres, new(PostgresMeta))
meta := new(PostgresMeta)
dbi.Register(dbi.DbTypePostgres, meta)
dbi.Register(dbi.DbTypeKingbaseEs, meta)
dbi.Register(dbi.DbTypeVastbase, meta)
gauss := new(PostgresMeta)
gauss.Param = "dbtype=gauss"
@@ -40,16 +43,17 @@ func (md *PostgresMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
db := d.Database
var dbParam string
exsitSchema := false
if db != "" {
// postgres database可以使用db/schema表示，方便连接指定schema, 若不存在schema则使用默认schema
ss := strings.Split(db, "/")
if len(ss) > 1 {
exsitSchema = true
dbParam = fmt.Sprintf("dbname=%s search_path=%s", ss[0], ss[len(ss)-1])
} else {
dbParam = "dbname=" + db
}
existSchema := false
if db == "" {
db = d.Type.MetaDbName()
}
// postgres database可以使用db/schema表示，方便连接指定schema, 若不存在schema则使用默认schema
ss := strings.Split(db, "/")
if len(ss) > 1 {
existSchema = true
dbParam = fmt.Sprintf("dbname=%s search_path=%s", ss[0], ss[len(ss)-1])
} else {
dbParam = "dbname=" + db
}
dsn := fmt.Sprintf("host=%s port=%d user=%s password=%s %s sslmode=disable connect_timeout=8", d.Host, d.Port, d.Username, d.Password, dbParam)
@@ -62,7 +66,7 @@ func (md *PostgresMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
if strings.HasPrefix(param, "dbname=") {
return true
}
if exsitSchema && strings.HasPrefix(param, "search_path") {
if existSchema && strings.HasPrefix(param, "search_path") {
return true
}
return false