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

!131 fix: 数据迁移bug

Browse Source 
* fix: 数据迁移bug
This commit is contained in:
zongyangleo
2025-01-24 11:08:59 +00:00
committed by Coder慌
parent 30ea36a722
commit efb2b7368c
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/internal/db/application/db.go
View File

@@ -348,7 +348,9 @@ func (d *dbAppImpl) DumpDb(ctx context.Context, reqParam *dto.DumpDb) error {
}
beforeInsert := dumpHelper.BeforeInsertSql(quoteSchema, quoteTableName)
writer.WriteString(beforeInsert)
if beforeInsert != "" {
writer.WriteString(beforeInsert)
}
insertSql := targetSqlGenerator.GenInsert(tableName, columns, rows, dbi.DuplicateStrategyNone)
if _, err := writer.WriteString(strings.Join(insertSql, ";\n") + ";\n"); err != nil {
return err
@@ -364,14 +366,12 @@ func (d *dbAppImpl) DumpDb(ctx context.Context, reqParam *dto.DumpDb) error {
if len(rows) > 0 {
beforeInsert := dumpHelper.BeforeInsertSql(quoteSchema, quoteTableName)
writer.WriteString(beforeInsert)
sqls := targetSqlGenerator.GenInsert(tableName, columns, rows, dbi.DuplicateStrategyNone)
for _, sqlStr := range sqls {
_, err := writer.WriteString(sqlStr)
if err != nil {
return err
}
if beforeInsert != "" {
writer.WriteString(beforeInsert)
}
insertSql := targetSqlGenerator.GenInsert(tableName, columns, rows, dbi.DuplicateStrategyNone)
if _, err := writer.WriteString(strings.Join(insertSql, ";\n") + ";\n"); err != nil {
return err
}
}

5
server/internal/db/dbm/dm/helper.go
View File

@@ -7,6 +7,7 @@ import (
)
type DumpHelper struct {
dbi.DefaultDumpHelper
}
func (dh *DumpHelper) BeforeInsert(writer io.Writer, tableName string) {
@@ -16,7 +17,3 @@ func (dh *DumpHelper) BeforeInsert(writer io.Writer, tableName string) {
func (dh *DumpHelper) BeforeInsertSql(quoteSchema string, tableName string) string {
return fmt.Sprintf("set identity_insert %s on;", tableName)
}
func (dh *DumpHelper) AfterInsert(writer io.Writer, tableName string, columns []dbi.Column) {
writer.Write([]byte("COMMIT;\n"))
}

2
server/internal/db/dbm/dm/sqlgen.go
View File

@@ -102,7 +102,7 @@ func (sg *SQLGenerator) GenInsert(tableName string, columns []dbi.Column, values
// 达梦数据库只能一条条的执行insert语句，所以这里需要将values拆分成多条insert语句
sqls := collx.ArrayMap(values, func(value []any) string {
columnStr, valuesStrs := dbi.GenInsertSqlColumnAndValues(sg.Dialect, DbTypeDM, columns, [][]any{value})
return fmt.Sprintf("insert into %s %s values %s ;", quote(tableName), columnStr, valuesStrs[0])
return fmt.Sprintf("insert into %s %s values %s", quote(tableName), columnStr, valuesStrs[0])
})
res = append(res, sqls...)

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

@@ -52,7 +52,7 @@ func (md *MysqlDialect) Quoter() dbi.Quoter {
return mysqlQuoter
}
func (pd *MysqlDialect) GetSQLParser() sqlparser.SqlParser {
func (md *MysqlDialect) GetSQLParser() sqlparser.SqlParser {
return new(mysql.MysqlParser)
}