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

Fix build

This commit is contained in:
Lunny Xiao 2021-07-23 14:54:53 +08:00
parent ddb51cfe8e
commit 9a5cd536b8
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dialects/dameng.go
View File

@ -616,11 +616,6 @@ func (db *dameng) DropTableSQL(tableName string) (string, bool) {
return fmt.Sprintf("DROP TABLE %s", db.quoter.Quote(tableName)), false return fmt.Sprintf("DROP TABLE %s", db.quoter.Quote(tableName)), false
} }
// SeqName returns sequence name for some table
func SeqName(tableName string) string {
return "SEQ_" + strings.ToUpper(tableName)
}
func (db *dameng) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) ([]string, bool, error) { func (db *dameng) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) ([]string, bool, error) {
if tableName == "" { if tableName == "" {
tableName = table.Name tableName = table.Name
@ -653,7 +648,7 @@ func (db *dameng) CreateTableSQL(ctx context.Context, queryer core.Queryer, tabl
} }
b.WriteString(")") b.WriteString(")")
var seqName = SeqName(tableName) var seqName = utils.SeqName(tableName)
if table.AutoIncrColumn() != nil { if table.AutoIncrColumn() != nil {
var cnt int var cnt int
rows, err := queryer.QueryContext(ctx, "SELECT COUNT(*) FROM user_sequences WHERE sequence_name = ?", seqName) rows, err := queryer.QueryContext(ctx, "SELECT COUNT(*) FROM user_sequences WHERE sequence_name = ?", seqName)

4
internal/statements/insert.go
View File

@ -10,7 +10,7 @@ import (
"strings" "strings"
"xorm.io/builder" "xorm.io/builder"
"xorm.io/xorm/dialects" "xorm.io/xorm/internal/utils"
"xorm.io/xorm/schemas" "xorm.io/xorm/schemas"
) )
@ -129,7 +129,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
return "", nil, err return "", nil, err
} }
} }
if _, err := buf.WriteString(dialects.SeqName(tableName) + ".nextval"); err != nil { if _, err := buf.WriteString(utils.SeqName(tableName) + ".nextval"); err != nil {
return "", nil, err return "", nil, err
} }
} }

6
internal/utils/name.go
View File

@ -6,9 +6,15 @@ package utils
import ( import (
"fmt" "fmt"
"strings"
) )
// IndexName returns index name // IndexName returns index name
func IndexName(tableName, idxName string) string { func IndexName(tableName, idxName string) string {
return fmt.Sprintf("IDX_%v_%v", tableName, idxName) return fmt.Sprintf("IDX_%v_%v", tableName, idxName)
} }
// SeqName returns sequence name for some table
func SeqName(tableName string) string {
return "SEQ_" + strings.ToUpper(tableName)
}

4
session_insert.go
View File

@ -127,7 +127,7 @@ func (session *Session) insertMultipleStruct(rowsSlicePtr interface{}) (int64, e
if i == 0 { if i == 0 {
colNames = append(colNames, col.Name) colNames = append(colNames, col.Name)
} }
colPlaces = append(colPlaces, dialects.SeqName(tableName)+".nextval") colPlaces = append(colPlaces, utils.SeqName(tableName)+".nextval")
} }
continue continue
} }
@ -327,7 +327,7 @@ func (session *Session) insertStruct(bean interface{}) (int64, error) {
if err != nil { if err != nil {
return 0, err return 0, err
} }
sql = fmt.Sprintf("select %s.currval from dual", dialects.SeqName(tableName)) sql = fmt.Sprintf("select %s.currval from dual", utils.SeqName(tableName))
} else { } else {
sql = sqlStr sql = sqlStr
newArgs = args newArgs = args