From e233895e1c86909b9f368dd0342d260ae67e398a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E4=BA=91=E9=87=91YunjinXu?= Date: Sun, 29 Oct 2023 21:14:42 +0800 Subject: [PATCH] fix sql server error: main_test.go dtmsvr.PopulateDB(false) invokes GetPlaceHoldSQL(sql) --- client/dtmcli/dtmimp/db_special.go | 21 --------------------- client/dtmcli/dtmimp/utils.go | 4 +++- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/client/dtmcli/dtmimp/db_special.go b/client/dtmcli/dtmimp/db_special.go index 5a2bb83..d9128b1 100644 --- a/client/dtmcli/dtmimp/db_special.go +++ b/client/dtmcli/dtmimp/db_special.go @@ -78,27 +78,6 @@ func init() { dbSpecials[DBTypePostgres] = &postgresDBSpecial{} } -// TODO sqlserver implement (for go client only, not for dtm server) -type sqlserverDBSpecial struct{} - -func (*sqlserverDBSpecial) GetPlaceHoldSQL(sql string) string { - // TODO sqlserver implement - return sql -} - -func (*sqlserverDBSpecial) GetInsertIgnoreTemplate(tableAndValues string, pgConstraint string) string { - // TODO sqlserver implement - return "" -} - -func (*sqlserverDBSpecial) GetXaSQL(command string, xid string) string { - // TODO sqlserver implement - return "" -} -func init() { - dbSpecials[DBTypeSQLServer] = &sqlserverDBSpecial{} -} - // GetDBSpecial get DBSpecial for currentDBType func GetDBSpecial(dbType string) DBSpecial { if dbType == "" { diff --git a/client/dtmcli/dtmimp/utils.go b/client/dtmcli/dtmimp/utils.go index e62234f..cc7b912 100644 --- a/client/dtmcli/dtmimp/utils.go +++ b/client/dtmcli/dtmimp/utils.go @@ -207,7 +207,9 @@ func DBExec(dbType string, db DB, sql string, values ...interface{}) (affected i return 0, nil } began := time.Now() - sql = GetDBSpecial(dbType).GetPlaceHoldSQL(sql) + if len(values) > 0 { + sql = GetDBSpecial(dbType).GetPlaceHoldSQL(sql) + } r, rerr := db.Exec(sql, values...) used := time.Since(began) / time.Millisecond if rerr == nil {