fix oracle date field insert (#2420)
for #2419 Reviewed-on: https://gitea.com/xorm/xorm/pulls/2420 Co-authored-by: Kos <kos@noreply.gitea.com> Co-committed-by: Kos <kos@noreply.gitea.com>
This commit is contained in:
parent
3b3f99f8a1
commit
f50aacd38b
|
@ -5,10 +5,23 @@
|
||||||
package statements
|
package statements
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"database/sql/driver"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
"xorm.io/builder"
|
"xorm.io/builder"
|
||||||
"xorm.io/xorm/schemas"
|
"xorm.io/xorm/schemas"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type DateTimeString struct {
|
||||||
|
Layout string
|
||||||
|
Str string
|
||||||
|
}
|
||||||
|
|
||||||
|
// Value implements the driver Valuer interface.
|
||||||
|
func (n DateTimeString) Value() (driver.Value, error) {
|
||||||
|
return n.Str, nil
|
||||||
|
}
|
||||||
|
|
||||||
// WriteArg writes an arg
|
// WriteArg writes an arg
|
||||||
func (statement *Statement) WriteArg(w *builder.BytesWriter, arg interface{}) error {
|
func (statement *Statement) WriteArg(w *builder.BytesWriter, arg interface{}) error {
|
||||||
switch argv := arg.(type) {
|
switch argv := arg.(type) {
|
||||||
|
@ -22,6 +35,17 @@ func (statement *Statement) WriteArg(w *builder.BytesWriter, arg interface{}) er
|
||||||
if _, err := w.WriteString(")"); err != nil {
|
if _, err := w.WriteString(")"); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
case *DateTimeString:
|
||||||
|
if statement.dialect.URI().DBType == schemas.ORACLE {
|
||||||
|
if _, err := fmt.Fprintf(w, `TO_DATE(?,'%s')`, argv.Layout); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err := w.WriteByte('?'); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.Append(arg)
|
||||||
default:
|
default:
|
||||||
if err := w.WriteByte('?'); err != nil {
|
if err := w.WriteByte('?'); err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -88,7 +88,20 @@ func (statement *Statement) Value2Interface(col *schemas.Column, fieldValue refl
|
||||||
if fieldType.ConvertibleTo(schemas.TimeType) {
|
if fieldType.ConvertibleTo(schemas.TimeType) {
|
||||||
t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time)
|
t := fieldValue.Convert(schemas.TimeType).Interface().(time.Time)
|
||||||
tf, err := dialects.FormatColumnTime(statement.dialect, statement.defaultTimeZone, col, t)
|
tf, err := dialects.FormatColumnTime(statement.dialect, statement.defaultTimeZone, col, t)
|
||||||
return tf, err
|
if val, ok := tf.(string); ok {
|
||||||
|
var layout string
|
||||||
|
switch col.SQLType.Name {
|
||||||
|
case schemas.Date:
|
||||||
|
layout = "yyyy-MM-dd"
|
||||||
|
case schemas.Time:
|
||||||
|
layout = "HH24:mi:ss"
|
||||||
|
default:
|
||||||
|
layout = "yyyy-MM-dd HH24:mi:ss"
|
||||||
|
}
|
||||||
|
return &DateTimeString{Layout: layout, Str: val}, err
|
||||||
|
} else {
|
||||||
|
return tf, err
|
||||||
|
}
|
||||||
} else if fieldType.ConvertibleTo(nullFloatType) {
|
} else if fieldType.ConvertibleTo(nullFloatType) {
|
||||||
t := fieldValue.Convert(nullFloatType).Interface().(sql.NullFloat64)
|
t := fieldValue.Convert(nullFloatType).Interface().(sql.NullFloat64)
|
||||||
if !t.Valid {
|
if !t.Valid {
|
||||||
|
|
Loading…
Reference in New Issue