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

remove dm tag

This commit is contained in:
Lunny Xiao 2021-08-08 21:16:26 +08:00
parent ecfb32124e
commit e702ac5fcf
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -258,13 +258,13 @@ test-tidb\#%: go-check
.PNONY: test-dameng .PNONY: test-dameng
test-dameng: go-check 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)" \ -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 -coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m
.PHONY: test-dameng\#% .PHONY: test-dameng\#%
test-dameng\#%: go-check 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)" \ -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 -coverprofile=dameng.$(TEST_QUOTE_POLICY).$(TEST_CACHE_ENABLE).coverage.out -covermode=atomic -timeout=20m

12
dialects/dameng.go
View File

@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
// +build dm
package dialects package dialects
import ( import (
@ -15,7 +13,6 @@ import (
"strconv" "strconv"
"strings" "strings"
"gitee.com/travelliu/dm"
"xorm.io/xorm/core" "xorm.io/xorm/core"
"xorm.io/xorm/internal/convert" "xorm.io/xorm/internal/convert"
"xorm.io/xorm/internal/utils" "xorm.io/xorm/internal/utils"
@ -770,13 +767,20 @@ type dmClobScanner struct {
data string data string
} }
type dmClobObject interface {
GetLength() (int64, error)
ReadString(int, int) (string, error)
}
//var _ dmClobObject = &dm.DmClob{}
func (d *dmClobScanner) Scan(data interface{}) error { func (d *dmClobScanner) Scan(data interface{}) error {
if data == nil { if data == nil {
return nil return nil
} }
switch t := data.(type) { switch t := data.(type) {
case *dm.DmClob: case dmClobObject: // *dm.DmClob
if t == nil { if t == nil {
return nil return nil
} }

4
integrations/session_tx_test.go
View File

@ -73,7 +73,7 @@ func TestCombineTransaction(t *testing.T) {
_, err = session.Where("`id` = ?", 0).Update(&user2) _, err = session.Where("`id` = ?", 0).Update(&user2)
assert.NoError(t, err) 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) assert.NoError(t, err)
err = session.Commit() err = session.Commit()
@ -116,7 +116,7 @@ func TestCombineTransactionSameMapper(t *testing.T) {
_, err = session.Where("`id` = ?", 0).Update(&user2) _, err = session.Where("`id` = ?", 0).Update(&user2)
assert.NoError(t, err) 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) assert.NoError(t, err)
err = session.Commit() err = session.Commit()