From 19b206912e3655ecb5b63237b8d54f898f1f104f Mon Sep 17 00:00:00 2001
From: MURAOKA Taro <koron.kaoriya@gmail.com>
Date: Sat, 21 Jul 2018 14:37:09 +0900
Subject: [PATCH] replace retval of ToDB with {}interface(nil)

instead of []byte(nil)
---
 session_convert.go | 6 ++++++
 statement.go       | 8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/session_convert.go b/session_convert.go
index 1f9d8aa1b..0b54f237f 100644
--- a/session_convert.go
+++ b/session_convert.go
@@ -541,6 +541,9 @@ func (session *Session) value2Interface(col *core.Column, fieldValue reflect.Val
 				return 0, err
 			}
 			if col.SQLType.IsBlob() {
+				if data == nil {
+					return nil, nil
+				}
 				return data, nil
 			}
 			return string(data), nil
@@ -553,6 +556,9 @@ func (session *Session) value2Interface(col *core.Column, fieldValue reflect.Val
 			return 0, err
 		}
 		if col.SQLType.IsBlob() {
+			if data == nil {
+				return nil, nil
+			}
 			return data, nil
 		}
 		return string(data), nil
diff --git a/statement.go b/statement.go
index 7856936f5..cd4ef6921 100644
--- a/statement.go
+++ b/statement.go
@@ -305,7 +305,9 @@ func (statement *Statement) buildUpdates(bean interface{},
 				if err != nil {
 					engine.logger.Error(err)
 				} else {
-					val = data
+					if data != nil {
+						val = data
+					}
 				}
 				goto APPEND
 			}
@@ -316,7 +318,9 @@ func (statement *Statement) buildUpdates(bean interface{},
 			if err != nil {
 				engine.logger.Error(err)
 			} else {
-				val = data
+				if data != nil {
+					val = data
+				}
 			}
 			goto APPEND
 		}