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

improved docs

This commit is contained in:
Lunny Xiao 2014-07-04 14:16:03 +08:00
parent 4693ad2aee
commit a404099f25
3 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/QuickStart.md
View File

@ -91,7 +91,7 @@ f, err := os.Create("sql.log")
println(err.Error()) println(err.Error())
return return
} }
engine.Logger = f engine.Logger = xorm.NewSimpleLogger(f)
``` ```
3.Engine provide DB connection pool settings. 3.Engine provide DB connection pool settings.

2
docs/QuickStartCN.md
View File

@ -95,7 +95,7 @@ f, err := os.Create("sql.log")
println(err.Error()) println(err.Error())
return return
} }
engine.Logger = f engine.Logger = xorm.NewSimpleLogger(f)
``` ```
3.engine内部支持连接池接口。 3.engine内部支持连接池接口。

56
xorm.go
View File

@ -1,7 +1,6 @@
package xorm package xorm
import ( import (
"database/sql"
"errors" "errors"
"fmt" "fmt"
"os" "os"
@ -17,42 +16,29 @@ const (
Version string = "0.4" Version string = "0.4"
) )
// !nashtsai! implicit register drivers and dialects is no good, as init() can be called before sql driver got registered
// func init() {
// regDrvsNDialects()
// }
func regDrvsNDialects() bool { func regDrvsNDialects() bool {
if core.RegisteredDriverSize() == 0 { providedDrvsNDialects := map[string]struct {
providedDrvsNDialects := map[string]struct { dbType core.DbType
dbType core.DbType getDriver func() core.Driver
getDriver func() core.Driver getDialect func() core.Dialect
getDialect func() core.Dialect }{
}{ "mssql": {"mssql", func() core.Driver { return &odbcDriver{} }, func() core.Dialect { return &mssql{} }},
"mssql": {"mssql", func() core.Driver { return &odbcDriver{} }, func() core.Dialect { return &mssql{} }}, "odbc": {"mssql", func() core.Driver { return &odbcDriver{} }, func() core.Dialect { return &mssql{} }}, // !nashtsai! TODO change this when supporting MS Access
"odbc": {"mssql", func() core.Driver { return &odbcDriver{} }, func() core.Dialect { return &mssql{} }}, // !nashtsai! TODO change this when supporting MS Access "mysql": {"mysql", func() core.Driver { return &mysqlDriver{} }, func() core.Dialect { return &mysql{} }},
"mysql": {"mysql", func() core.Driver { return &mysqlDriver{} }, func() core.Dialect { return &mysql{} }}, "mymysql": {"mysql", func() core.Driver { return &mymysqlDriver{} }, func() core.Dialect { return &mysql{} }},
"mymysql": {"mysql", func() core.Driver { return &mymysqlDriver{} }, func() core.Dialect { return &mysql{} }}, "postgres": {"postgres", func() core.Driver { return &pqDriver{} }, func() core.Dialect { return &postgres{} }},
"postgres": {"postgres", func() core.Driver { return &pqDriver{} }, func() core.Dialect { return &postgres{} }}, "sqlite3": {"sqlite3", func() core.Driver { return &sqlite3Driver{} }, func() core.Dialect { return &sqlite3{} }},
"sqlite3": {"sqlite3", func() core.Driver { return &sqlite3Driver{} }, func() core.Dialect { return &sqlite3{} }}, "oci8": {"oracle", func() core.Driver { return &oci8Driver{} }, func() core.Dialect { return &oracle{} }},
"oci8": {"oracle", func() core.Driver { return &oci8Driver{} }, func() core.Dialect { return &oracle{} }}, "goracle": {"oracle", func() core.Driver { return &goracleDriver{} }, func() core.Dialect { return &oracle{} }},
"goracle": {"oracle", func() core.Driver { return &goracleDriver{} }, func() core.Dialect { return &oracle{} }},
}
for driverName, v := range providedDrvsNDialects {
_, err := sql.Open(driverName, "")
if err == nil {
// fmt.Printf("driver succeed: %v\n", driverName)
core.RegisterDriver(driverName, v.getDriver())
core.RegisterDialect(v.dbType, v.getDialect())
} else {
// fmt.Printf("driver failed: %v | err: %v\n", driverName, err)
}
}
return true
} else {
return false
} }
for driverName, v := range providedDrvsNDialects {
if driver := core.QueryDriver(driverName); driver == nil {
core.RegisterDriver(driverName, v.getDriver())
core.RegisterDialect(v.dbType, v.getDialect())
}
}
return true
} }
func close(engine *Engine) { func close(engine *Engine) {