Gleipnir/jet
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Bug fix: Bytea nil values aren't stored as null in database.

Browse source
This commit is contained in:
go-jet 2019-06-12 16:21:50 +02:00
parent c598978ba6
commit 038a4b9dd0
6 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sqlbuilder/execution/execution.go
View file

@ -86,6 +86,8 @@ func queryToSlice(db Db, query string, args []interface{}, slicePtr interface{})
groupTime := time.Duration(0)
slicePtrValue := reflect.ValueOf(slicePtr)
for rows.Next() {
err := rows.Scan(scanContext.row...)
@ -97,7 +99,7 @@ func queryToSlice(db Db, query string, args []interface{}, slicePtr interface{})
begin := time.Now()
_, err = mapRowToSlice(scanContext, "", reflect.ValueOf(slicePtr), nil)
_, err = mapRowToSlice(scanContext, "", slicePtrValue, nil)
if err != nil {
return err
@ -406,9 +408,7 @@ func mapRowToStruct(scanContext *scanContext, groupKey string, structPtrValue re
updated = true
} else if isGoBaseType(field.Type) {
cellValue := getCellValue(scanContext, tableName, fieldName)
//spew.Dump(rowElem)
//spew.Dump(rowColumnValue, fieldValue)
if cellValue != nil {
updated = true
initializeValueIfNil(fieldValue)
@ -441,9 +441,7 @@ func initializeValueIfNil(value reflect.Value) {
return
}
if value.Type().Kind() == reflect.Slice && value.IsNil() {
value.Set(reflect.New(value.Type()).Elem())
} else if value.Kind() == reflect.Ptr && value.IsNil() {
if value.Kind() == reflect.Ptr && value.IsNil() {
value.Set(reflect.New(value.Type().Elem()))
}
}

10
sqlbuilder/execution/null_types.go
View file

@ -8,12 +8,18 @@ import (
// NullByteArray
type NullByteArray struct {
ByteArray []byte
Valid bool // Valid is true if Time is not NULL
Valid bool
}
// Scan implements the Scanner interface.
func (nb *NullByteArray) Scan(value interface{}) error {
nb.ByteArray, nb.Valid = value.([]byte)
switch v := value.(type) {
case []byte:
nb.ByteArray = append(v[:0:0], v...)
nb.Valid = true
default:
nb.Valid = false
}
return nil
}