!131 fix: 数据迁移bug

* 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

View File

@@ -63,6 +63,7 @@
"sass": "^1.83.4", "sass": "^1.83.4",
"typescript": "^5.7.3", "typescript": "^5.7.3",
"vite": "^6.0.7", "vite": "^6.0.7",
"vite-plugin-progress": "0.0.7",
"vue-eslint-parser": "^9.4.3" "vue-eslint-parser": "^9.4.3"
}, },
"browserslist": [ "browserslist": [

View File

@@ -3,6 +3,7 @@ import { resolve } from 'path';
import type { UserConfig } from 'vite'; import type { UserConfig } from 'vite';
import { loadEnv } from './src/common/utils/viteBuild'; import { loadEnv } from './src/common/utils/viteBuild';
import { CodeInspectorPlugin } from 'code-inspector-plugin'; import { CodeInspectorPlugin } from 'code-inspector-plugin';
import progress from 'vite-plugin-progress';
const pathResolve = (dir: string): any => { const pathResolve = (dir: string): any => {
return resolve(__dirname, '.', dir); return resolve(__dirname, '.', dir);
@@ -21,6 +22,7 @@ const viteConfig: UserConfig = {
bundler: 'vite', bundler: 'vite',
editor: VITE_EDITOR as any, editor: VITE_EDITOR as any,
}), }),
progress(),
], ],
root: process.cwd(), root: process.cwd(),
resolve: { resolve: {

View File

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

View File

@@ -7,6 +7,7 @@ import (
) )
type DumpHelper struct { type DumpHelper struct {
dbi.DefaultDumpHelper
} }
func (dh *DumpHelper) BeforeInsert(writer io.Writer, tableName string) { 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 { func (dh *DumpHelper) BeforeInsertSql(quoteSchema string, tableName string) string {
return fmt.Sprintf("set identity_insert %s on;", tableName) 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"))
}

View File

@@ -102,7 +102,7 @@ func (sg *SQLGenerator) GenInsert(tableName string, columns []dbi.Column, values
// 达梦数据库只能一条条的执行insert语句所以这里需要将values拆分成多条insert语句 // 达梦数据库只能一条条的执行insert语句所以这里需要将values拆分成多条insert语句
sqls := collx.ArrayMap(values, func(value []any) string { sqls := collx.ArrayMap(values, func(value []any) string {
columnStr, valuesStrs := dbi.GenInsertSqlColumnAndValues(sg.Dialect, DbTypeDM, columns, [][]any{value}) 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...) res = append(res, sqls...)

View File

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