HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug

This commit is contained in:
Lunny Xiao 2021-08-05 21:52:01 +08:00
parent 26dd15e8ec
commit 1ae4d9cf41
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dialects/dameng.go
View File

@ -18,6 +18,7 @@ import (
"gitee.com/travelliu/dm" "gitee.com/travelliu/dm"
"xorm.io/xorm/core" "xorm.io/xorm/core"
"xorm.io/xorm/internal/convert" "xorm.io/xorm/internal/convert"
"xorm.io/xorm/internal/utils"
"xorm.io/xorm/schemas" "xorm.io/xorm/schemas"
) )
@ -742,10 +743,6 @@ func (db *dameng) IsColumnExist(queryer core.Queryer, ctx context.Context, table
return db.HasRecords(queryer, ctx, query, args...) return db.HasRecords(queryer, ctx, query, args...)
} }
func DamengSeqName(tableName string) string {
return "SEQ_" + strings.ToUpper(tableName)
}
var _ sql.Scanner = &dmClobScanner{} var _ sql.Scanner = &dmClobScanner{}
type dmClobScanner struct { type dmClobScanner struct {
@ -793,20 +790,23 @@ func (db *dameng) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
s := `select column_name from user_cons_columns s := `select column_name from user_cons_columns
where constraint_name = (select constraint_name from user_constraints where constraint_name = (select constraint_name from user_constraints
where table_name = ? and constraint_type ='P')` where table_name = ? and constraint_type ='P')`
var pkName string
rows, err := queryer.QueryContext(ctx, s, tableName) rows, err := queryer.QueryContext(ctx, s, tableName)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
if !rows.Next() { defer rows.Close()
if rows.Err() != nil {
return nil, nil, rows.Err() var pkNames []string
} for rows.Next() {
} else { var pkName string
err = rows.Scan(&pkName) err = rows.Scan(&pkName)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
pkNames = append(pkNames, pkName)
}
if rows.Err() != nil {
return nil, nil, rows.Err()
} }
rows.Close() rows.Close()
@ -859,10 +859,9 @@ func (db *dameng) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
if !comment.Valid { if !comment.Valid {
col.Comment = comment.String col.Comment = comment.String
} }
if pkName != "" && pkName == col.Name { if utils.IndexSlice(pkNames, col.Name) > -1 {
col.IsPrimaryKey = true col.IsPrimaryKey = true
has, err := db.HasRecords(queryer, ctx, "SELECT * FROM USER_SEQUENCES WHERE SEQUENCE_NAME = ?", utils.SeqName(tableName))
has, err := db.HasRecords(queryer, ctx, "SELECT * FROM USER_SEQUENCES WHERE SEQUENCE_NAME = ?", DamengSeqName(tableName))
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }