Merge branch 'master' of github.com:lunny/xorm

This commit is contained in:
Lunny Xiao 2013-08-29 10:25:27 +08:00
commit d2507a900f
1 changed files with 294 additions and 294 deletions

View File

@ -17,7 +17,7 @@ Drivers for Go's sql package which currently support database/sql includes:
* SQLite: [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3)
* Postgres: [github.com/bylevel/pg](https://github.com/bylevel/pg)
* Postgres: [github.com/bylevel/pq](https://github.com/bylevel/pq)
## Changelog
@ -61,7 +61,7 @@ import (
_ "github.com/Go-SQL-Driver/MySQL"
"github.com/lunny/xorm"
)
err, engine := xorm.NewEngine("mysql", "root:123@/test?charset=utf8")
engine, err := xorm.NewEngine("mysql", "root:123@/test?charset=utf8")
defer engine.Close()
```
@ -72,7 +72,7 @@ import (
_ "github.com/mattn/go-sqlite3"
"github.com/lunny/xorm"
)
err, engine = xorm.NewEngine("sqlite3", "./test.db")
engine, err = xorm.NewEngine("sqlite3", "./test.db")
defer engine.Close()
```