From c841a77ad64823b653b6d07ab23571e7aaea2989 Mon Sep 17 00:00:00 2001 From: ngaut Date: Fri, 11 Sep 2015 11:24:58 +0800 Subject: [PATCH] Orm: Add tidb for query builder --- orm/models_test.go | 2 +- orm/orm_test.go | 5 ++++- orm/qb.go | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/orm/models_test.go b/orm/models_test.go index 23e2b9e3..2a9962a1 100644 --- a/orm/models_test.go +++ b/orm/models_test.go @@ -397,7 +397,7 @@ go test -v github.com/astaxie/beego/orm #### TiDB export ORM_DRIVER=tidb -export ORM_SOURCE='memory://test' +export ORM_SOURCE='memory://test/test' go test -v github.com/astaxie/beego/orm `) diff --git a/orm/orm_test.go b/orm/orm_test.go index 1d174fa9..dc68da1a 100644 --- a/orm/orm_test.go +++ b/orm/orm_test.go @@ -26,6 +26,8 @@ import ( "strings" "testing" "time" + + "github.com/juju/errors" ) var _ = os.PathSeparator @@ -133,6 +135,7 @@ func throwFail(t *testing.T, err error, args ...interface{}) { } con += " " + strings.Join(parts, ", ") } + t.Error(errors.ErrorStack(err)) t.Error(con) t.Fail() } @@ -172,7 +175,7 @@ func TestSyncDb(t *testing.T) { RegisterModel(new(UserBig)) RegisterModel(new(PostTags)) - err := RunSyncdb("default", true, false) + err := RunSyncdb("default", true, true) throwFail(t, err) modelCache.clean() diff --git a/orm/qb.go b/orm/qb.go index f5f10ebf..9f778916 100644 --- a/orm/qb.go +++ b/orm/qb.go @@ -48,8 +48,8 @@ type QueryBuilder interface { func NewQueryBuilder(driver string) (qb QueryBuilder, err error) { if driver == "mysql" { qb = new(MySQLQueryBuilder) - } else if driver == "mysql" { - qb = new(MySQLQueryBuilder) + } else if driver == "tidb" { + qb = new(TiDBQueryBuilder) } else if driver == "postgres" { err = errors.New("postgres query builder is not supported yet") } else if driver == "sqlite" {