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

rm support sqllite shadow database

This commit is contained in:
YongAn 2022-06-04 21:19:09 +08:00
parent 8339751603
commit 7d199fae3f
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dialects/table_name.go
View File

@ -105,7 +105,7 @@ func FullTableName(ctx context.Context, dialect Dialect, mapper names.Mapper, be
tbName = TableNameWithSchema(dialect, tbName) tbName = TableNameWithSchema(dialect, tbName)
} }
if dialect.URI() != nil && if dialect.URI() != nil &&
(dialect.URI().DBType == schemas.MYSQL || dialect.URI().DBType == schemas.SQLITE) && dialect.URI().DBType == schemas.MYSQL &&
dialect.IsShadow(ctx) && !hasShadowPrefix(tbName) { dialect.IsShadow(ctx) && !hasShadowPrefix(tbName) {
tbName = ShadowDBNamePrefix + TableNameWithDBName(dialect, tbName) tbName = ShadowDBNamePrefix + TableNameWithDBName(dialect, tbName)
} }

2
go.sum
View File

@ -659,7 +659,5 @@ modernc.org/z v1.2.19 h1:BGyRFWhDVn5LFS5OcX4Yd/MlpRTOc7hOPTdcIpCiUao=
modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 h1:bvLlAPW1ZMTWA32LuZMBEGHAUOcATZjzHcotf3SWweM=
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=
xorm.io/builder v0.3.11 h1:naLkJitGyYW7ZZdncsh/JW+HF4HshmvTHTyUyPwJS00= xorm.io/builder v0.3.11 h1:naLkJitGyYW7ZZdncsh/JW+HF4HshmvTHTyUyPwJS00=
xorm.io/builder v0.3.11/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE= xorm.io/builder v0.3.11/go.mod h1:aUW0S9eb9VCaPohFCH3j7czOx1PMW3i1HrSzbLYGBSE=

2
integrations/engine_group_test.go
View File

@ -6,6 +6,7 @@ package integrations
import ( import (
"testing" "testing"
"xorm.io/xorm/dialects"
"xorm.io/xorm" "xorm.io/xorm"
"xorm.io/xorm/log" "xorm.io/xorm/log"
@ -32,4 +33,5 @@ func TestEngineGroup(t *testing.T) {
eg.SetColumnMapper(master.GetColumnMapper()) eg.SetColumnMapper(master.GetColumnMapper())
eg.SetLogLevel(log.LOG_INFO) eg.SetLogLevel(log.LOG_INFO)
eg.ShowSQL(true) eg.ShowSQL(true)
eg.SetShadow(dialects.NewFalseShadow())
} }

2
integrations/session_get_test.go
View File

@ -24,6 +24,8 @@ import (
) )
func TestShadowGetVar(t *testing.T) { func TestShadowGetVar(t *testing.T) {
//db, mock, err := sqlmock.New()
testEngine, err := xorm.NewEngine(string(schemas.MYSQL), "root:root@tcp(127.0.0.1:3306)/test?charset=utf8") testEngine, err := xorm.NewEngine(string(schemas.MYSQL), "root:root@tcp(127.0.0.1:3306)/test?charset=utf8")
assert.NoError(t, err) assert.NoError(t, err)
testEngine.ShowSQL(true) testEngine.ShowSQL(true)