From 21c08ea09c487819bfa808b0b818c32ff100dd24 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 23 Jan 2014 11:09:48 +0800 Subject: [PATCH] move test files to tests/ subdir --- engine.go | 10 +- base_test.go => tests/base_test.go | 184 +++++++++--------- benchmark.bat => tests/benchmark.bat | 0 benchmark.sh => tests/benchmark.sh | 0 .../benchmark_base_test.go | 8 +- mssql_test.go => tests/mssql_test.go | 13 +- mymysql_test.go => tests/mymysql_test.go | 21 +- mysql_test.go => tests/mysql_test.go | 31 +-- postgres_test.go => tests/postgres_test.go | 19 +- sqlite3_test.go => tests/sqlite3_test.go | 19 +- tests/{ => testdata}/mysql_ddl.sql | 0 11 files changed, 157 insertions(+), 148 deletions(-) rename base_test.go => tests/base_test.go (94%) rename benchmark.bat => tests/benchmark.bat (100%) rename benchmark.sh => tests/benchmark.sh (100%) rename benchmark_base_test.go => tests/benchmark_base_test.go (93%) rename mssql_test.go => tests/mssql_test.go (87%) rename mymysql_test.go => tests/mymysql_test.go (80%) rename mysql_test.go => tests/mysql_test.go (79%) rename postgres_test.go => tests/postgres_test.go (87%) rename sqlite3_test.go => tests/sqlite3_test.go (86%) rename tests/{ => testdata}/mysql_ddl.sql (100%) diff --git a/engine.go b/engine.go index 99e62ee0..a6509828 100644 --- a/engine.go +++ b/engine.go @@ -21,8 +21,8 @@ type PK []interface{} // Engine is the major struct of xorm, it means a database manager. // Commonly, an application only need one engine type Engine struct { - columnMapper IMapper - tableMapper IMapper + ColumnMapper IMapper + TableMapper IMapper TagIdentifier string DriverName string DataSourceName string @@ -47,11 +47,11 @@ func (engine *Engine) SetMapper(mapper IMapper) { } func (engine *Engine) SetTableMapper(mapper IMapper) { - engine.tableMapper = mapper + engine.TableMapper = mapper } func (engine *Engine) SetColumnMapper(mapper IMapper) { - engine.columnMapper = mapper + engine.ColumnMapper = mapper } // If engine's database support batch insert records like @@ -406,7 +406,7 @@ func (engine *Engine) autoMap(bean interface{}) *core.Table { } func (engine *Engine) mapType(t reflect.Type) *core.Table { - return mappingTable(t, engine.tableMapper, engine.columnMapper, engine.dialect, engine.TagIdentifier) + return mappingTable(t, engine.TableMapper, engine.ColumnMapper, engine.dialect, engine.TagIdentifier) } func mappingTable(t reflect.Type, tableMapper IMapper, colMapper IMapper, dialect core.Dialect, tagId string) *core.Table { diff --git a/base_test.go b/tests/base_test.go similarity index 94% rename from base_test.go rename to tests/base_test.go index 5c60500d..cf12066a 100644 --- a/base_test.go +++ b/tests/base_test.go @@ -7,6 +7,7 @@ import ( "testing" "time" + "github.com/lunny/xorm" "github.com/lunny/xorm/core" ) @@ -44,7 +45,7 @@ type Userdetail struct { Profile string `xorm:"varchar(2000)"` } -func directCreateTable(engine *Engine, t *testing.T) { +func directCreateTable(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&Userinfo{}, &Userdetail{}) if err != nil { t.Error(err) @@ -94,7 +95,7 @@ func directCreateTable(engine *Engine, t *testing.T) { } } -func insert(engine *Engine, t *testing.T) { +func insert(engine *xorm.Engine, t *testing.T) { user := Userinfo{0, "xiaolunwen", "dev", "lunny", time.Now(), Userdetail{Id: 1}, 1.78, []byte{1, 2, 3}, true} cnt, err := engine.Insert(&user) @@ -130,7 +131,7 @@ func insert(engine *Engine, t *testing.T) { } } -func testQuery(engine *Engine, t *testing.T) { +func testQuery(engine *xorm.Engine, t *testing.T) { sql := "select * from userinfo" results, err := engine.Query(sql) if err != nil { @@ -140,7 +141,7 @@ func testQuery(engine *Engine, t *testing.T) { fmt.Println(results) } -func exec(engine *Engine, t *testing.T) { +func exec(engine *xorm.Engine, t *testing.T) { sql := "update userinfo set username=? where id=?" res, err := engine.Exec(sql, "xiaolun", 1) if err != nil { @@ -150,7 +151,7 @@ func exec(engine *Engine, t *testing.T) { fmt.Println(res) } -func testQuerySameMapper(engine *Engine, t *testing.T) { +func testQuerySameMapper(engine *xorm.Engine, t *testing.T) { sql := "select * from `Userinfo`" results, err := engine.Query(sql) if err != nil { @@ -160,7 +161,7 @@ func testQuerySameMapper(engine *Engine, t *testing.T) { fmt.Println(results) } -func execSameMapper(engine *Engine, t *testing.T) { +func execSameMapper(engine *xorm.Engine, t *testing.T) { sql := "update `Userinfo` set `Username`=? where (id)=?" res, err := engine.Exec(sql, "xiaolun", 1) if err != nil { @@ -170,7 +171,7 @@ func execSameMapper(engine *Engine, t *testing.T) { fmt.Println(res) } -func insertAutoIncr(engine *Engine, t *testing.T) { +func insertAutoIncr(engine *xorm.Engine, t *testing.T) { // auto increment insert user := Userinfo{Username: "xiaolunwen2", Departname: "dev", Alias: "lunny", Created: time.Now(), Detail: Userdetail{Id: 1}, Height: 1.78, Avatar: []byte{1, 2, 3}, IsMan: true} @@ -194,11 +195,11 @@ func insertAutoIncr(engine *Engine, t *testing.T) { type BigInsert struct { } -func insertDefault(engine *Engine, t *testing.T) { +func insertDefault(engine *xorm.Engine, t *testing.T) { } -func insertMulti(engine *Engine, t *testing.T) { +func insertMulti(engine *xorm.Engine, t *testing.T) { //engine.InsertMany = true users := []Userinfo{ {Username: "xlw", Departname: "dev", Alias: "lunny2", Created: time.Now()}, @@ -239,7 +240,7 @@ func insertMulti(engine *Engine, t *testing.T) { } } -func insertTwoTable(engine *Engine, t *testing.T) { +func insertTwoTable(engine *xorm.Engine, t *testing.T) { userdetail := Userdetail{ /*Id: 1, */ Intro: "I'm a very beautiful women.", Profile: "sfsaf"} userinfo := Userinfo{Username: "xlw3", Departname: "dev", Alias: "lunny4", Created: time.Now(), Detail: userdetail} @@ -281,7 +282,7 @@ type Article struct { type Condi map[string]interface{} -func update(engine *Engine, t *testing.T) { +func update(engine *xorm.Engine, t *testing.T) { // update by id user := Userinfo{Username: "xxx", Height: 1.2} cnt, err := engine.Id(4).Update(&user) @@ -360,7 +361,7 @@ func update(engine *Engine, t *testing.T) { } } -func updateSameMapper(engine *Engine, t *testing.T) { +func updateSameMapper(engine *xorm.Engine, t *testing.T) { // update by id user := Userinfo{Username: "xxx", Height: 1.2} cnt, err := engine.Id(4).Update(&user) @@ -409,7 +410,7 @@ func updateSameMapper(engine *Engine, t *testing.T) { } } -func testDelete(engine *Engine, t *testing.T) { +func testDelete(engine *xorm.Engine, t *testing.T) { user := Userinfo{Uid: 1} cnt, err := engine.Delete(&user) if err != nil { @@ -452,7 +453,7 @@ type NoIdUser struct { Total int64 } -func get(engine *Engine, t *testing.T) { +func get(engine *xorm.Engine, t *testing.T) { user := Userinfo{Uid: 2} has, err := engine.Get(&user) @@ -472,7 +473,7 @@ func get(engine *Engine, t *testing.T) { panic(err) } - userCol := engine.columnMapper.Obj2Table("User") + userCol := engine.ColumnMapper.Obj2Table("User") _, err = engine.Where("`"+userCol+"` = ?", "xlw").Delete(&NoIdUser{}) if err != nil { @@ -507,7 +508,7 @@ func get(engine *Engine, t *testing.T) { fmt.Println(noIdUser) } -func cascadeGet(engine *Engine, t *testing.T) { +func cascadeGet(engine *xorm.Engine, t *testing.T) { user := Userinfo{Uid: 11} has, err := engine.Get(&user) @@ -522,7 +523,7 @@ func cascadeGet(engine *Engine, t *testing.T) { } } -func find(engine *Engine, t *testing.T) { +func find(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Find(&users) @@ -535,7 +536,7 @@ func find(engine *Engine, t *testing.T) { } users2 := make([]Userinfo, 0) - userinfo := engine.tableMapper.Obj2Table("Userinfo") + userinfo := engine.TableMapper.Obj2Table("Userinfo") err = engine.Sql("select * from " + engine.Quote(userinfo)).Find(&users2) if err != nil { t.Error(err) @@ -543,7 +544,7 @@ func find(engine *Engine, t *testing.T) { } } -func find2(engine *Engine, t *testing.T) { +func find2(engine *xorm.Engine, t *testing.T) { users := make([]*Userinfo, 0) err := engine.Find(&users) @@ -556,7 +557,7 @@ func find2(engine *Engine, t *testing.T) { } } -func findMap(engine *Engine, t *testing.T) { +func findMap(engine *xorm.Engine, t *testing.T) { users := make(map[int64]Userinfo) err := engine.Find(&users) @@ -569,7 +570,7 @@ func findMap(engine *Engine, t *testing.T) { } } -func findMap2(engine *Engine, t *testing.T) { +func findMap2(engine *xorm.Engine, t *testing.T) { users := make(map[int64]*Userinfo) err := engine.Find(&users) @@ -582,7 +583,7 @@ func findMap2(engine *Engine, t *testing.T) { } } -func count(engine *Engine, t *testing.T) { +func count(engine *xorm.Engine, t *testing.T) { user := Userinfo{Departname: "dev"} total, err := engine.Count(&user) if err != nil { @@ -592,7 +593,7 @@ func count(engine *Engine, t *testing.T) { fmt.Printf("Total %d records!!!\n", total) } -func where(engine *Engine, t *testing.T) { +func where(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Where("(id) > ?", 2).Find(&users) if err != nil { @@ -609,7 +610,7 @@ func where(engine *Engine, t *testing.T) { fmt.Println(users) } -func in(engine *Engine, t *testing.T) { +func in(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.In("(id)", 1, 2, 3).Find(&users) if err != nil { @@ -626,8 +627,8 @@ func in(engine *Engine, t *testing.T) { } fmt.Println(users) - department := engine.columnMapper.Obj2Table("Departname") - dev := engine.columnMapper.Obj2Table("Dev") + department := engine.ColumnMapper.Obj2Table("Departname") + dev := engine.ColumnMapper.Obj2Table("Dev") err = engine.In("(id)", 1).In("(id)", 2).In(department, dev).Find(&users) if err != nil { @@ -687,7 +688,7 @@ func in(engine *Engine, t *testing.T) { } } -func limit(engine *Engine, t *testing.T) { +func limit(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Limit(2, 1).Find(&users) if err != nil { @@ -697,7 +698,7 @@ func limit(engine *Engine, t *testing.T) { fmt.Println(users) } -func order(engine *Engine, t *testing.T) { +func order(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.OrderBy("id desc").Find(&users) if err != nil { @@ -715,7 +716,7 @@ func order(engine *Engine, t *testing.T) { fmt.Println(users2) } -func join(engine *Engine, t *testing.T) { +func join(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Join("LEFT", "userdetail", "userinfo.id=userdetail.id").Find(&users) if err != nil { @@ -724,7 +725,7 @@ func join(engine *Engine, t *testing.T) { } } -func having(engine *Engine, t *testing.T) { +func having(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.GroupBy("username").Having("username='xlw'").Find(&users) if err != nil { @@ -734,7 +735,7 @@ func having(engine *Engine, t *testing.T) { fmt.Println(users) } -func orderSameMapper(engine *Engine, t *testing.T) { +func orderSameMapper(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.OrderBy("(id) desc").Find(&users) if err != nil { @@ -752,7 +753,7 @@ func orderSameMapper(engine *Engine, t *testing.T) { fmt.Println(users2) } -func joinSameMapper(engine *Engine, t *testing.T) { +func joinSameMapper(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Join("LEFT", "`Userdetail`", "`Userinfo`.`(id)`=`Userdetail`.`(id)`").Find(&users) if err != nil { @@ -761,7 +762,7 @@ func joinSameMapper(engine *Engine, t *testing.T) { } } -func havingSameMapper(engine *Engine, t *testing.T) { +func havingSameMapper(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.GroupBy("Username").Having(`"Username"='xlw'`).Find(&users) if err != nil { @@ -771,7 +772,7 @@ func havingSameMapper(engine *Engine, t *testing.T) { fmt.Println(users) } -func transaction(engine *Engine, t *testing.T) { +func transaction(engine *xorm.Engine, t *testing.T) { counter := func() { total, err := engine.Count(&Userinfo{}) if err != nil { @@ -823,7 +824,7 @@ func transaction(engine *Engine, t *testing.T) { // panic(err) !nashtsai! should remove this } -func combineTransaction(engine *Engine, t *testing.T) { +func combineTransaction(engine *xorm.Engine, t *testing.T) { counter := func() { total, err := engine.Count(&Userinfo{}) if err != nil { @@ -872,7 +873,7 @@ func combineTransaction(engine *Engine, t *testing.T) { } } -func combineTransactionSameMapper(engine *Engine, t *testing.T) { +func combineTransactionSameMapper(engine *xorm.Engine, t *testing.T) { counter := func() { total, err := engine.Count(&Userinfo{}) if err != nil { @@ -921,7 +922,7 @@ func combineTransactionSameMapper(engine *Engine, t *testing.T) { } } -func table(engine *Engine, t *testing.T) { +func table(engine *xorm.Engine, t *testing.T) { err := engine.DropTables("user_user") if err != nil { t.Error(err) @@ -935,7 +936,7 @@ func table(engine *Engine, t *testing.T) { } } -func createMultiTables(engine *Engine, t *testing.T) { +func createMultiTables(engine *xorm.Engine, t *testing.T) { session := engine.NewSession() defer session.Close() @@ -969,7 +970,7 @@ func createMultiTables(engine *Engine, t *testing.T) { } } -func tableOp(engine *Engine, t *testing.T) { +func tableOp(engine *xorm.Engine, t *testing.T) { user := Userinfo{Username: "tablexiao", Departname: "dev", Alias: "lunny", Created: time.Now()} tableName := fmt.Sprintf("user_%v", len(user.Username)) cnt, err := engine.Table(tableName).Insert(&user) @@ -1017,7 +1018,7 @@ func tableOp(engine *Engine, t *testing.T) { } } -func testCharst(engine *Engine, t *testing.T) { +func testCharst(engine *xorm.Engine, t *testing.T) { err := engine.DropTables("user_charset") if err != nil { t.Error(err) @@ -1031,7 +1032,7 @@ func testCharst(engine *Engine, t *testing.T) { } } -func testStoreEngine(engine *Engine, t *testing.T) { +func testStoreEngine(engine *xorm.Engine, t *testing.T) { err := engine.DropTables("user_store_engine") if err != nil { t.Error(err) @@ -1050,7 +1051,7 @@ type tempUser struct { Username string } -func testCols(engine *Engine, t *testing.T) { +func testCols(engine *xorm.Engine, t *testing.T) { users := []Userinfo{} err := engine.Cols("id, username").Find(&users) if err != nil { @@ -1077,7 +1078,7 @@ func testCols(engine *Engine, t *testing.T) { fmt.Println("===================", user, affected) } -func testColsSameMapper(engine *Engine, t *testing.T) { +func testColsSameMapper(engine *xorm.Engine, t *testing.T) { users := []Userinfo{} err := engine.Cols("(id), Username").Find(&users) if err != nil { @@ -1109,7 +1110,7 @@ type tempUser2 struct { Departname string } -func testExtends(engine *Engine, t *testing.T) { +func testExtends(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&tempUser2{}) if err != nil { t.Error(err) @@ -1186,7 +1187,7 @@ type allCols struct { //BigSerial int64 `xorm:"BIGSERIAL"` } -func testColTypes(engine *Engine, t *testing.T) { +func testColTypes(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&allCols{}) if err != nil { t.Error(err) @@ -1319,7 +1320,7 @@ type MyStruct struct { MSS map[string]string } -func testCustomType(engine *Engine, t *testing.T) { +func testCustomType(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&MyStruct{}) if err != nil { t.Error(err) @@ -1405,7 +1406,7 @@ type UserCU struct { Updated time.Time `xorm:"updated"` } -func testCreatedAndUpdated(engine *Engine, t *testing.T) { +func testCreatedAndUpdated(engine *xorm.Engine, t *testing.T) { u := new(UserCU) err := engine.DropTables(u) if err != nil { @@ -1472,7 +1473,7 @@ type IndexOrUnique struct { UniGroup2 int `xorm:"unique(lll)"` } -func testIndexAndUnique(engine *Engine, t *testing.T) { +func testIndexAndUnique(engine *xorm.Engine, t *testing.T) { err := engine.CreateTables(&IndexOrUnique{}) if err != nil { t.Error(err) @@ -1534,7 +1535,7 @@ type StringPK struct { Name string } -func testIntId(engine *Engine, t *testing.T) { +func testIntId(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&IntId{}) if err != nil { t.Error(err) @@ -1594,7 +1595,7 @@ func testIntId(engine *Engine, t *testing.T) { } } -func testInt32Id(engine *Engine, t *testing.T) { +func testInt32Id(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&Int32Id{}) if err != nil { t.Error(err) @@ -1655,7 +1656,7 @@ func testInt32Id(engine *Engine, t *testing.T) { } } -func testUintId(engine *Engine, t *testing.T) { +func testUintId(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&UintId{}) if err != nil { t.Error(err) @@ -1715,7 +1716,7 @@ func testUintId(engine *Engine, t *testing.T) { } } -func testUint32Id(engine *Engine, t *testing.T) { +func testUint32Id(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&Uint32Id{}) if err != nil { t.Error(err) @@ -1776,7 +1777,7 @@ func testUint32Id(engine *Engine, t *testing.T) { } } -func testUint64Id(engine *Engine, t *testing.T) { +func testUint64Id(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&Uint64Id{}) if err != nil { t.Error(err) @@ -1837,7 +1838,7 @@ func testUint64Id(engine *Engine, t *testing.T) { } } -func testStringPK(engine *Engine, t *testing.T) { +func testStringPK(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&StringPK{}) if err != nil { t.Error(err) @@ -1898,7 +1899,7 @@ func testStringPK(engine *Engine, t *testing.T) { } } -func testMetaInfo(engine *Engine, t *testing.T) { +func testMetaInfo(engine *xorm.Engine, t *testing.T) { tables, err := engine.DBMetas() if err != nil { t.Error(err) @@ -1907,9 +1908,10 @@ func testMetaInfo(engine *Engine, t *testing.T) { for _, table := range tables { fmt.Println(table.Name) - for _, col := range table.Columns() { - fmt.Println(col.String(engine.dialect)) - } + //for _, col := range table.Columns() { + //TODO: engine.dialect show exported + //fmt.Println(col.String(engine.dia)) + //} for _, index := range table.Indexes { fmt.Println(index.Name, index.Type, strings.Join(index.Cols, ",")) @@ -1917,7 +1919,7 @@ func testMetaInfo(engine *Engine, t *testing.T) { } } -func testIterate(engine *Engine, t *testing.T) { +func testIterate(engine *xorm.Engine, t *testing.T) { err := engine.Omit("is_man").Iterate(new(Userinfo), func(idx int, bean interface{}) error { user := bean.(*Userinfo) fmt.Println(idx, "--", user) @@ -1930,7 +1932,7 @@ func testIterate(engine *Engine, t *testing.T) { } } -func testRows(engine *Engine, t *testing.T) { +func testRows(engine *xorm.Engine, t *testing.T) { rows, err := engine.Omit("is_man").Rows(new(Userinfo)) if err != nil { t.Error(err) @@ -1956,7 +1958,7 @@ type StrangeName struct { Name string } -func testStrangeName(engine *Engine, t *testing.T) { +func testStrangeName(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(new(StrangeName)) if err != nil { t.Error(err) @@ -1985,7 +1987,7 @@ type VersionS struct { Ver int `xorm:"version"` } -func testVersion(engine *Engine, t *testing.T) { +func testVersion(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(new(VersionS)) if err != nil { t.Error(err) @@ -2058,7 +2060,7 @@ func testVersion(engine *Engine, t *testing.T) { }*/ } -func testDistinct(engine *Engine, t *testing.T) { +func testDistinct(engine *xorm.Engine, t *testing.T) { users := make([]Userinfo, 0) err := engine.Distinct("departname").Find(&users) if err != nil { @@ -2089,7 +2091,7 @@ func testDistinct(engine *Engine, t *testing.T) { fmt.Println(users2) } -func testUseBool(engine *Engine, t *testing.T) { +func testUseBool(engine *xorm.Engine, t *testing.T) { cnt1, err := engine.Count(&Userinfo{}) if err != nil { t.Error(err) @@ -2129,7 +2131,7 @@ func testUseBool(engine *Engine, t *testing.T) { } } -func testBool(engine *Engine, t *testing.T) { +func testBool(engine *xorm.Engine, t *testing.T) { _, err := engine.UseBool().Update(&Userinfo{IsMan: true}) if err != nil { t.Error(err) @@ -2175,7 +2177,7 @@ type TTime struct { Tz time.Time `xorm:"timestampz"` } -func testTime(engine *Engine, t *testing.T) { +func testTime(engine *xorm.Engine, t *testing.T) { err := engine.Sync(&TTime{}) if err != nil { t.Error(err) @@ -2217,14 +2219,14 @@ func testTime(engine *Engine, t *testing.T) { fmt.Println("=======\n", tt4s, "=======\n") } -func testPrefixTableName(engine *Engine, t *testing.T) { - tempEngine, err := NewEngine(engine.DriverName, engine.DataSourceName) +func testPrefixTableName(engine *xorm.Engine, t *testing.T) { + tempEngine, err := xorm.NewEngine(engine.DriverName, engine.DataSourceName) if err != nil { t.Error(err) panic(err) } tempEngine.ShowSQL = true - mapper := NewPrefixMapper(SnakeMapper{}, "xlw_") + mapper := xorm.NewPrefixMapper(xorm.SnakeMapper{}, "xlw_") //tempEngine.SetMapper(mapper) tempEngine.SetTableMapper(mapper) exist, err := tempEngine.IsTableExist(&Userinfo{}) @@ -2255,7 +2257,7 @@ type CreatedUpdated struct { Updated time.Time `xorm:"updated"` } -func testCreatedUpdated(engine *Engine, t *testing.T) { +func testCreatedUpdated(engine *xorm.Engine, t *testing.T) { err := engine.Sync(&CreatedUpdated{}) if err != nil { t.Error(err) @@ -2330,7 +2332,7 @@ func (p *ProcessorsStruct) AfterDelete() { p.AfterDeletedFlag = 1 } -func testProcessors(engine *Engine, t *testing.T) { +func testProcessors(engine *xorm.Engine, t *testing.T) { // tempEngine, err := NewEngine(engine.DriverName, engine.DataSourceName) // if err != nil { // t.Error(err) @@ -2556,7 +2558,7 @@ func testProcessors(engine *Engine, t *testing.T) { // -- } -func testProcessorsTx(engine *Engine, t *testing.T) { +func testProcessorsTx(engine *xorm.Engine, t *testing.T) { // tempEngine, err := NewEngine(engine.DriverName, engine.DataSourceName) // if err != nil { // t.Error(err) @@ -3062,7 +3064,7 @@ type NullData3 struct { StringPtr *string } -func testPointerData(engine *Engine, t *testing.T) { +func testPointerData(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&NullData{}) if err != nil { @@ -3232,7 +3234,7 @@ func testPointerData(engine *Engine, t *testing.T) { // using instance type should just work too nullData2Get := NullData2{} - tableName := engine.tableMapper.Obj2Table("NullData") + tableName := engine.TableMapper.Obj2Table("NullData") has, err = engine.Table(tableName).Id(nullData.Id).Get(&nullData2Get) if err != nil { @@ -3324,7 +3326,7 @@ func testPointerData(engine *Engine, t *testing.T) { // -- } -func testNullValue(engine *Engine, t *testing.T) { +func testNullValue(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&NullData{}) if err != nil { @@ -3599,7 +3601,7 @@ func testNullValue(engine *Engine, t *testing.T) { // update to null values nullDataUpdate = NullData{} - string_ptr := engine.columnMapper.Obj2Table("StringPtr") + string_ptr := engine.ColumnMapper.Obj2Table("StringPtr") cnt, err = engine.Id(nullData.Id).Cols(string_ptr).Update(&nullDataUpdate) if err != nil { @@ -3709,7 +3711,7 @@ type CompositeKey struct { UpdateStr string } -func testCompositeKey(engine *Engine, t *testing.T) { +func testCompositeKey(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&CompositeKey{}) if err != nil { @@ -3736,7 +3738,7 @@ func testCompositeKey(engine *Engine, t *testing.T) { } var compositeKeyVal CompositeKey - has, err := engine.Id(PK{11, 22}).Get(&compositeKeyVal) + has, err := engine.Id(xorm.PK{11, 22}).Get(&compositeKeyVal) if err != nil { t.Error(err) } else if !has { @@ -3744,7 +3746,7 @@ func testCompositeKey(engine *Engine, t *testing.T) { } // test passing PK ptr, this test seem failed withCache - has, err = engine.Id(&PK{11, 22}).Get(&compositeKeyVal) + has, err = engine.Id(&xorm.PK{11, 22}).Get(&compositeKeyVal) if err != nil { t.Error(err) } else if !has { @@ -3752,14 +3754,14 @@ func testCompositeKey(engine *Engine, t *testing.T) { } compositeKeyVal = CompositeKey{UpdateStr: "test1"} - cnt, err = engine.Id(PK{11, 22}).Update(&compositeKeyVal) + cnt, err = engine.Id(xorm.PK{11, 22}).Update(&compositeKeyVal) if err != nil { t.Error(err) } else if cnt != 1 { t.Error(errors.New("can't update CompositeKey{11, 22}")) } - cnt, err = engine.Id(PK{11, 22}).Delete(&CompositeKey{}) + cnt, err = engine.Id(xorm.PK{11, 22}).Delete(&CompositeKey{}) if err != nil { t.Error(err) } else if cnt != 1 { @@ -3774,7 +3776,7 @@ type User struct { Score int32 `xorm:"integer"` } -func testCompositeKey2(engine *Engine, t *testing.T) { +func testCompositeKey2(engine *xorm.Engine, t *testing.T) { err := engine.DropTables(&User{}) if err != nil { @@ -3801,7 +3803,7 @@ func testCompositeKey2(engine *Engine, t *testing.T) { } var user User - has, err := engine.Id(PK{"11", 22}).Get(&user) + has, err := engine.Id(xorm.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -3809,7 +3811,7 @@ func testCompositeKey2(engine *Engine, t *testing.T) { } // test passing PK ptr, this test seem failed withCache - has, err = engine.Id(&PK{"11", 22}).Get(&user) + has, err = engine.Id(&xorm.PK{"11", 22}).Get(&user) if err != nil { t.Error(err) } else if !has { @@ -3817,14 +3819,14 @@ func testCompositeKey2(engine *Engine, t *testing.T) { } user = User{NickName: "test1"} - cnt, err = engine.Id(PK{"11", 22}).Update(&user) + cnt, err = engine.Id(xorm.PK{"11", 22}).Update(&user) if err != nil { t.Error(err) } else if cnt != 1 { t.Error(errors.New("can't update User{11, 22}")) } - cnt, err = engine.Id(PK{"11", 22}).Delete(&User{}) + cnt, err = engine.Id(xorm.PK{"11", 22}).Delete(&User{}) if err != nil { t.Error(err) } else if cnt != 1 { @@ -3832,7 +3834,7 @@ func testCompositeKey2(engine *Engine, t *testing.T) { } } -func testAll(engine *Engine, t *testing.T) { +func testAll(engine *xorm.Engine, t *testing.T) { fmt.Println("-------------- directCreateTable --------------") directCreateTable(engine, t) fmt.Println("-------------- insert --------------") @@ -3867,7 +3869,7 @@ func testAll(engine *Engine, t *testing.T) { limit(engine, t) } -func testAll2(engine *Engine, t *testing.T) { +func testAll2(engine *xorm.Engine, t *testing.T) { fmt.Println("-------------- combineTransaction --------------") combineTransaction(engine, t) fmt.Println("-------------- table --------------") @@ -3931,7 +3933,7 @@ func testAll2(engine *Engine, t *testing.T) { } // !nash! the 3rd set of the test is intended for non-cache enabled engine -func testAll3(engine *Engine, t *testing.T) { +func testAll3(engine *xorm.Engine, t *testing.T) { fmt.Println("-------------- processors TX --------------") testProcessorsTx(engine, t) fmt.Println("-------------- insert pointer data --------------") @@ -3946,7 +3948,7 @@ func testAll3(engine *Engine, t *testing.T) { testStringPK(engine, t) } -func testAllSnakeMapper(engine *Engine, t *testing.T) { +func testAllSnakeMapper(engine *xorm.Engine, t *testing.T) { fmt.Println("-------------- query --------------") testQuery(engine, t) fmt.Println("-------------- exec --------------") @@ -3961,7 +3963,7 @@ func testAllSnakeMapper(engine *Engine, t *testing.T) { having(engine, t) } -func testAllSameMapper(engine *Engine, t *testing.T) { +func testAllSameMapper(engine *xorm.Engine, t *testing.T) { fmt.Println("-------------- query --------------") testQuerySameMapper(engine, t) fmt.Println("-------------- exec --------------") diff --git a/benchmark.bat b/tests/benchmark.bat similarity index 100% rename from benchmark.bat rename to tests/benchmark.bat diff --git a/benchmark.sh b/tests/benchmark.sh similarity index 100% rename from benchmark.sh rename to tests/benchmark.sh diff --git a/benchmark_base_test.go b/tests/benchmark_base_test.go similarity index 93% rename from benchmark_base_test.go rename to tests/benchmark_base_test.go index d263da06..5ea598e5 100644 --- a/benchmark_base_test.go +++ b/tests/benchmark_base_test.go @@ -3,6 +3,8 @@ package xorm import ( "database/sql" "testing" + + "github.com/lunny/xorm" ) type BigStruct struct { @@ -77,7 +79,7 @@ func doBenchDriver(newdriver func() (*sql.DB, error), createTableSql, } } -func doBenchInsert(engine *Engine, b *testing.B) { +func doBenchInsert(engine *xorm.Engine, b *testing.B) { b.StopTimer() bs := &BigStruct{0, "fafdasf", "fadfa", "afadfsaf", "fadfafdsafd", "fadfafdsaf"} err := engine.CreateTables(bs) @@ -103,7 +105,7 @@ func doBenchInsert(engine *Engine, b *testing.B) { } } -func doBenchFind(engine *Engine, b *testing.B) { +func doBenchFind(engine *xorm.Engine, b *testing.B) { b.StopTimer() bs := &BigStruct{0, "fafdasf", "fadfa", "afadfsaf", "fadfafdsafd", "fadfafdsaf"} err := engine.CreateTables(bs) @@ -138,7 +140,7 @@ func doBenchFind(engine *Engine, b *testing.B) { } } -func doBenchFindPtr(engine *Engine, b *testing.B) { +func doBenchFindPtr(engine *xorm.Engine, b *testing.B) { b.StopTimer() bs := &BigStruct{0, "fafdasf", "fadfa", "afadfsaf", "fadfafdsafd", "fadfafdsaf"} err := engine.CreateTables(bs) diff --git a/mssql_test.go b/tests/mssql_test.go similarity index 87% rename from mssql_test.go rename to tests/mssql_test.go index a9093866..101d07ae 100644 --- a/mssql_test.go +++ b/tests/mssql_test.go @@ -8,12 +8,13 @@ import ( "testing" _ "github.com/lunny/godbc" + "github.com/lunny/xorm" ) const mssqlConnStr = "driver={SQL Server};Server=192.168.20.135;Database=xorm_test; uid=sa; pwd=1234;" -func newMssqlEngine() (*Engine, error) { - return NewEngine("odbc", mssqlConnStr) +func newMssqlEngine() (*xorm.Engine, error) { + return xorm.NewEngine("odbc", mssqlConnStr) } func TestMssql(t *testing.T) { @@ -39,7 +40,7 @@ func TestMssqlWithCache(t *testing.T) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -112,7 +113,7 @@ func BenchmarkMssqlCacheInsert(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchInsert(engine, t) } @@ -124,7 +125,7 @@ func BenchmarkMssqlCacheFind(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFind(engine, t) } @@ -136,7 +137,7 @@ func BenchmarkMssqlCacheFindPtr(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFindPtr(engine, t) } diff --git a/mymysql_test.go b/tests/mymysql_test.go similarity index 80% rename from mymysql_test.go rename to tests/mymysql_test.go index 0ad8aace..c64261dc 100644 --- a/mymysql_test.go +++ b/tests/mymysql_test.go @@ -4,6 +4,7 @@ import ( "database/sql" "testing" + "github.com/lunny/xorm" _ "github.com/ziutek/mymysql/godrv" ) @@ -20,7 +21,7 @@ func TestMyMysql(t *testing.T) { t.Error(err) return } - engine, err := NewEngine("mymysql", "xorm_test/root/") + engine, err := xorm.NewEngine("mymysql", "xorm_test/root/") defer engine.Close() if err != nil { t.Error(err) @@ -42,13 +43,13 @@ func TestMyMysqlWithCache(t *testing.T) { t.Error(err) return } - engine, err := NewEngine("mymysql", "xorm_test2/root/") + engine, err := xorm.NewEngine("mymysql", "xorm_test2/root/") defer engine.Close() if err != nil { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -58,8 +59,8 @@ func TestMyMysqlWithCache(t *testing.T) { testAll2(engine, t) } -func newMyMysqlEngine() (*Engine, error) { - return NewEngine("mymysql", "xorm_test2/root/") +func newMyMysqlEngine() (*xorm.Engine, error) { + return xorm.NewEngine("mymysql", "xorm_test2/root/") } func newMyMysqlDriverDB() (*sql.DB, error) { @@ -77,7 +78,7 @@ func BenchmarkMyMysqlDriverFind(t *testing.B) { } func mymysqlDdlImport() error { - engine, err := NewEngine("mymysql", "/root/") + engine, err := xorm.NewEngine("mymysql", "/root/") if err != nil { return err } @@ -86,7 +87,7 @@ func mymysqlDdlImport() error { engine.ShowWarn = showTestSql engine.ShowDebug = showTestSql - sqlResults, _ := engine.Import("tests/mysql_ddl.sql") + sqlResults, _ := engine.Import("testdata/mysql_ddl.sql") engine.LogDebug("sql results: %v", sqlResults) engine.Close() return nil @@ -135,7 +136,7 @@ func BenchmarkMyMysqlCacheInsert(t *testing.B) { } defer engine.Close() - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchInsert(engine, t) } @@ -148,7 +149,7 @@ func BenchmarkMyMysqlCacheFind(t *testing.B) { } defer engine.Close() - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFind(engine, t) } @@ -161,7 +162,7 @@ func BenchmarkMyMysqlCacheFindPtr(t *testing.B) { } defer engine.Close() - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFindPtr(engine, t) } diff --git a/mysql_test.go b/tests/mysql_test.go similarity index 79% rename from mysql_test.go rename to tests/mysql_test.go index 6c356afe..f42be512 100644 --- a/mysql_test.go +++ b/tests/mysql_test.go @@ -5,6 +5,7 @@ import ( "testing" _ "github.com/go-sql-driver/mysql" + "github.com/lunny/xorm" ) /* @@ -19,7 +20,7 @@ func TestMysql(t *testing.T) { return } - engine, err := NewEngine("mysql", "root:@/xorm_test?charset=utf8") + engine, err := xorm.NewEngine("mysql", "root:@/xorm_test?charset=utf8") defer engine.Close() if err != nil { t.Error(err) @@ -43,7 +44,7 @@ func TestMysqlSameMapper(t *testing.T) { return } - engine, err := NewEngine("mysql", "root:@/xorm_test1?charset=utf8") + engine, err := xorm.NewEngine("mysql", "root:@/xorm_test1?charset=utf8") defer engine.Close() if err != nil { t.Error(err) @@ -53,7 +54,7 @@ func TestMysqlSameMapper(t *testing.T) { engine.ShowErr = showTestSql engine.ShowWarn = showTestSql engine.ShowDebug = showTestSql - engine.SetMapper(SameMapper{}) + engine.SetMapper(xorm.SameMapper{}) testAll(engine, t) testAllSameMapper(engine, t) @@ -68,13 +69,13 @@ func TestMysqlWithCache(t *testing.T) { return } - engine, err := NewEngine("mysql", "root:@/xorm_test2?charset=utf8") + engine, err := xorm.NewEngine("mysql", "root:@/xorm_test2?charset=utf8") defer engine.Close() if err != nil { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -92,14 +93,14 @@ func TestMysqlWithCacheSameMapper(t *testing.T) { return } - engine, err := NewEngine("mysql", "root:@/xorm_test3?charset=utf8") + engine, err := xorm.NewEngine("mysql", "root:@/xorm_test3?charset=utf8") defer engine.Close() if err != nil { t.Error(err) return } - engine.SetMapper(SameMapper{}) - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetMapper(xorm.SameMapper{}) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -110,12 +111,12 @@ func TestMysqlWithCacheSameMapper(t *testing.T) { testAll2(engine, t) } -func newMysqlEngine() (*Engine, error) { - return NewEngine("mysql", "root:@/xorm_test?charset=utf8") +func newMysqlEngine() (*xorm.Engine, error) { + return xorm.NewEngine("mysql", "root:@/xorm_test?charset=utf8") } func mysqlDdlImport() error { - engine, err := NewEngine("mysql", "root:@/?charset=utf8") + engine, err := xorm.NewEngine("mysql", "root:@/?charset=utf8") if err != nil { return err } @@ -124,7 +125,7 @@ func mysqlDdlImport() error { engine.ShowWarn = showTestSql engine.ShowDebug = showTestSql - sqlResults, _ := engine.Import("tests/mysql_ddl.sql") + sqlResults, _ := engine.Import("testdata/mysql_ddl.sql") engine.LogDebug("sql results: %v", sqlResults) engine.Close() return nil @@ -189,7 +190,7 @@ func BenchmarkMysqlCacheInsert(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchInsert(engine, t) } @@ -201,7 +202,7 @@ func BenchmarkMysqlCacheFind(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFind(engine, t) } @@ -213,7 +214,7 @@ func BenchmarkMysqlCacheFindPtr(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFindPtr(engine, t) } diff --git a/postgres_test.go b/tests/postgres_test.go similarity index 87% rename from postgres_test.go rename to tests/postgres_test.go index 32fb8b17..9c2ee2d8 100644 --- a/postgres_test.go +++ b/tests/postgres_test.go @@ -5,14 +5,15 @@ import ( "testing" _ "github.com/lib/pq" + "github.com/lunny/xorm" ) //var connStr string = "dbname=xorm_test user=lunny password=1234 sslmode=disable" var connStr string = "dbname=xorm_test sslmode=disable" -func newPostgresEngine() (*Engine, error) { - orm, err := NewEngine("postgres", connStr) +func newPostgresEngine() (*xorm.Engine, error) { + orm, err := xorm.NewEngine("postgres", connStr) if err != nil { return nil, err } @@ -58,7 +59,7 @@ func TestPostgresWithCache(t *testing.T) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) defer engine.Close() engine.ShowSQL = showTestSql engine.ShowErr = showTestSql @@ -77,7 +78,7 @@ func TestPostgresSameMapper(t *testing.T) { return } defer engine.Close() - engine.SetMapper(SameMapper{}) + engine.SetMapper(xorm.SameMapper{}) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -95,9 +96,9 @@ func TestPostgresWithCacheSameMapper(t *testing.T) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) defer engine.Close() - engine.SetMapper(SameMapper{}) + engine.SetMapper(xorm.SameMapper{}) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -167,7 +168,7 @@ func BenchmarkPostgresCacheInsert(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchInsert(engine, t) } @@ -180,7 +181,7 @@ func BenchmarkPostgresCacheFind(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFind(engine, t) } @@ -193,7 +194,7 @@ func BenchmarkPostgresCacheFindPtr(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFindPtr(engine, t) } diff --git a/sqlite3_test.go b/tests/sqlite3_test.go similarity index 86% rename from sqlite3_test.go rename to tests/sqlite3_test.go index aa66cb4e..aa10af64 100644 --- a/sqlite3_test.go +++ b/tests/sqlite3_test.go @@ -5,12 +5,13 @@ import ( "os" "testing" + "github.com/lunny/xorm" _ "github.com/mattn/go-sqlite3" ) -func newSqlite3Engine() (*Engine, error) { +func newSqlite3Engine() (*xorm.Engine, error) { os.Remove("./test.db") - return NewEngine("sqlite3", "./test.db") + return xorm.NewEngine("sqlite3", "./test.db") } func newSqlite3DriverDB() (*sql.DB, error) { @@ -43,7 +44,7 @@ func TestSqlite3WithCache(t *testing.T) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -61,7 +62,7 @@ func TestSqlite3SameMapper(t *testing.T) { t.Error(err) return } - engine.SetMapper(SameMapper{}) + engine.SetMapper(xorm.SameMapper{}) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -80,8 +81,8 @@ func TestSqlite3WithCacheSameMapper(t *testing.T) { t.Error(err) return } - engine.SetMapper(SameMapper{}) - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetMapper(xorm.SameMapper{}) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) engine.ShowSQL = showTestSql engine.ShowErr = showTestSql engine.ShowWarn = showTestSql @@ -151,7 +152,7 @@ func BenchmarkSqlite3CacheInsert(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchInsert(engine, t) } @@ -163,7 +164,7 @@ func BenchmarkSqlite3CacheFind(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFind(engine, t) } @@ -175,6 +176,6 @@ func BenchmarkSqlite3CacheFindPtr(t *testing.B) { t.Error(err) return } - engine.SetDefaultCacher(NewLRUCacher(NewMemoryStore(), 1000)) + engine.SetDefaultCacher(xorm.NewLRUCacher(xorm.NewMemoryStore(), 1000)) doBenchFindPtr(engine, t) } diff --git a/tests/mysql_ddl.sql b/tests/testdata/mysql_ddl.sql similarity index 100% rename from tests/mysql_ddl.sql rename to tests/testdata/mysql_ddl.sql