diff --git a/Makefile b/Makefile index ac37d9fa..e9bd4129 100644 --- a/Makefile +++ b/Makefile @@ -258,13 +258,13 @@ test-tidb\#%: go-check .PNONY: test-dameng test-dameng: go-check - $(GO) test -tags=dm $(INTEGRATION_PACKAGES) -v -race -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \ + $(GO) test $(INTEGRATION_PACKAGES) -v -race -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \ -conn_str="dm://$(TEST_DAMENG_USERNAME):$(TEST_DAMENG_PASSWORD)@$(TEST_DAMENG_HOST)" \ -coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m .PHONY: test-dameng\#% test-dameng\#%: go-check - $(GO) test -tags=dm $(INTEGRATION_PACKAGES) -v -race -run $* -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \ + $(GO) test $(INTEGRATION_PACKAGES) -v -race -run $* -db=dm -cache=$(TEST_CACHE_ENABLE) -quote=$(TEST_QUOTE_POLICY) \ -conn_str="dm://$(TEST_DAMENG_USERNAME):$(TEST_DAMENG_PASSWORD)@$(TEST_DAMENG_HOST)" \ -coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m diff --git a/dialects/dameng.go b/dialects/dameng.go index ff00c53d..b6cc2673 100644 --- a/dialects/dameng.go +++ b/dialects/dameng.go @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build dm - package dialects import ( @@ -15,7 +13,6 @@ import ( "strconv" "strings" - "gitee.com/travelliu/dm" "xorm.io/xorm/core" "xorm.io/xorm/internal/convert" "xorm.io/xorm/internal/utils" @@ -770,13 +767,20 @@ type dmClobScanner struct { data string } +type dmClobObject interface { + GetLength() (int64, error) + ReadString(int, int) (string, error) +} + +//var _ dmClobObject = &dm.DmClob{} + func (d *dmClobScanner) Scan(data interface{}) error { if data == nil { return nil } switch t := data.(type) { - case *dm.DmClob: + case dmClobObject: // *dm.DmClob if t == nil { return nil } diff --git a/integrations/session_tx_test.go b/integrations/session_tx_test.go index 2bdfe0c0..8d6519d0 100644 --- a/integrations/session_tx_test.go +++ b/integrations/session_tx_test.go @@ -73,7 +73,7 @@ func TestCombineTransaction(t *testing.T) { _, err = session.Where("`id` = ?", 0).Update(&user2) assert.NoError(t, err) - _, err = session.Exec("delete from `"+testEngine.TableName("userinfo", true)+"` where `username` = ?", user2.Username) + _, err = session.Exec("delete from "+testEngine.Quote(testEngine.TableName("userinfo", true))+" where `username` = ?", user2.Username) assert.NoError(t, err) err = session.Commit() @@ -116,7 +116,7 @@ func TestCombineTransactionSameMapper(t *testing.T) { _, err = session.Where("`id` = ?", 0).Update(&user2) assert.NoError(t, err) - _, err = session.Exec("delete from "+testEngine.TableName("`Userinfo`", true)+" where `Username` = ?", user2.Username) + _, err = session.Exec("delete from "+testEngine.Quote(testEngine.TableName("Userinfo", true))+" where `Username` = ?", user2.Username) assert.NoError(t, err) err = session.Commit()