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

Merge 2f0a5c1809 into d38aa33645

This commit is contained in:
violetgo 2013-12-30 18:21:07 -08:00
parent d38aa33645 2f0a5c1809
commit 9918c56e68
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine.go
View File

@ -67,6 +67,7 @@ type Engine struct {
Logger io.Writer Logger io.Writer
Cacher Cacher Cacher Cacher
UseCache bool UseCache bool
charset string
} }
func (engine *Engine) SetMapper(mapper IMapper) { func (engine *Engine) SetMapper(mapper IMapper) {

6
xorm.go
View File

@ -6,6 +6,7 @@ import (
"os" "os"
"reflect" "reflect"
"runtime" "runtime"
"strings"
"sync" "sync"
) )
@ -28,6 +29,11 @@ func NewEngine(driverName string, dataSourceName string) (*Engine, error) {
engine.dialect = &sqlite3{} engine.dialect = &sqlite3{}
} else if driverName == MYSQL { } else if driverName == MYSQL {
engine.dialect = &mysql{} engine.dialect = &mysql{}
index := strings.Index(strings.ToLower(dataSourceName), "charset=")
tempstr := dataSourceName[index+8:]
index = strings.Index(strings.ToLower(tempstr), "&")
tempstr = tempstr[:index]
engine.charset = tempstr
} else if driverName == POSTGRES { } else if driverName == POSTGRES {
engine.dialect = &postgres{} engine.dialect = &postgres{}
engine.Filters = append(engine.Filters, &PgSeqFilter{}) engine.Filters = append(engine.Filters, &PgSeqFilter{})