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

Merge pull request #187 from extrame/master 

fix the insert multi and sqlite3 dis-match
This commit is contained in:
Lunny Xiao 2014-12-04 09:39:48 +08:00
parent 5c23849a66 a8796d1cca
commit ef6b1af40b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine.go
View File

@ -1419,6 +1419,8 @@ func (engine *Engine) FormatTime(sqlTypeName string, t time.Time) (v interface{}
case core.DateTime, core.TimeStamp: case core.DateTime, core.TimeStamp:
if engine.dialect.DBType() == "ql" { if engine.dialect.DBType() == "ql" {
v = engine.TZTime(t) v = engine.TZTime(t)
} else if engine.dialect.DBType() == "sqlite3" {
v = engine.TZTime(t).UTC().Format("2006-01-02 15:04:05")
} else { } else {
v = engine.TZTime(t).Format("2006-01-02 15:04:05") v = engine.TZTime(t).Format("2006-01-02 15:04:05")
} }

2
sqlite3_dialect.go
View File

@ -152,7 +152,7 @@ func (db *sqlite3) Init(d *core.DB, uri *core.Uri, drivername, dataSourceName st
func (db *sqlite3) SqlType(c *core.Column) string { func (db *sqlite3) SqlType(c *core.Column) string {
switch t := c.SQLType.Name; t { switch t := c.SQLType.Name; t {
case core.Date, core.DateTime, core.TimeStamp, core.Time: case core.Date, core.DateTime, core.TimeStamp, core.Time:
return core.Numeric return core.DateTime
case core.TimeStampz: case core.TimeStampz:
return core.Text return core.Text
case core.Char, core.Varchar, core.NVarchar, core.TinyText, core.Text, core.MediumText, core.LongText: case core.Char, core.Varchar, core.NVarchar, core.TinyText, core.Text, core.MediumText, core.LongText: