This commit is contained in:
Lunny Xiao 2021-07-06 16:53:24 +08:00
parent 2bee370937
commit 9295998075
2 changed files with 6 additions and 9 deletions

View File

@ -82,12 +82,7 @@ func newEngine(driverName, dataSourceName string, dialect dialects.Dialect, db *
dataSourceName: dataSourceName, dataSourceName: dataSourceName,
db: db, db: db,
logSessionID: false, logSessionID: false,
} DatabaseTZ: time.Local,
if dialect.URI().DBType == schemas.SQLITE {
engine.DatabaseTZ = time.UTC
} else {
engine.DatabaseTZ = time.Local
} }
logger := log.NewSimpleLogger(os.Stdout) logger := log.NewSimpleLogger(os.Stdout)

View File

@ -22,7 +22,9 @@ func genScanResultsByBeanNullable(bean interface{}) (interface{}, bool, error) {
case *sql.NullInt64, *sql.NullBool, *sql.NullFloat64, *sql.NullString, *sql.RawBytes: case *sql.NullInt64, *sql.NullBool, *sql.NullFloat64, *sql.NullString, *sql.RawBytes:
return t, false, nil return t, false, nil
case *time.Time: case *time.Time:
return &sql.NullTime{}, true, nil return &sql.NullString{}, true, nil
case *sql.NullTime:
return &sql.NullString{}, true, nil
case *string: case *string:
return &sql.NullString{}, true, nil return &sql.NullString{}, true, nil
case *int, *int8, *int16, *int32: case *int, *int8, *int16, *int32:
@ -75,8 +77,8 @@ func genScanResultsByBean(bean interface{}) (interface{}, bool, error) {
*float32, *float64, *float32, *float64,
*bool: *bool:
return t, false, nil return t, false, nil
case *time.Time: case *time.Time, *sql.NullTime:
return &sql.NullTime{}, true, nil return &sql.NullString{}, true, nil
case sql.NullInt64, sql.NullBool, sql.NullFloat64, sql.NullString, case sql.NullInt64, sql.NullBool, sql.NullFloat64, sql.NullString,
time.Time, time.Time,
string, string,