ClickHouse#133 fix

Author: kshvakov

clickhouse_nullable_test.go

@@ -33,11 +33,11 @@ func Test_Nullable(t *testing.T) {
 		dml = `
 			INSERT INTO clickhouse_test_nullable (
 				int8,
-				int16, 
+				int16,
 				int32,
 				int64,
-				uint8, 
-				uint16, 
+				uint8,
+				uint16,
 				uint32,
 				uint64,
 				float32,
@@ -49,8 +49,8 @@ func Test_Nullable(t *testing.T) {
 				enum8,
 				enum16
 			) VALUES (
-				?, 
-				?, 
+				?,
+				?,
 				?,
 				?,
 				?,
@@ -68,13 +68,13 @@ func Test_Nullable(t *testing.T) {
 			)
 		`
 		query = `
-			SELECT 
-				int8, 
-				int16, 
+			SELECT
+				int8,
+				int16,
 				int32,
 				int64,
-				uint8, 
-				uint16, 
+				uint8,
+				uint16,
 				uint32,
 				uint64,
 				float32,
@@ -273,13 +273,13 @@ func Test_Nullable(t *testing.T) {
 								&Enum8,
 								&Enum16,
 							); assert.NoError(t, err) {
-								if assert.Nil(t, Int8) {
-									if assert.NotNil(t, Int16) {
+								if assert.NotNil(t, Int8) {
+									if assert.Equal(t, int8(0), *Int8) && assert.NotNil(t, Int16) {
 										assert.Equal(t, int16(16), *Int16)
 									}
 								}
-								if assert.Nil(t, Int32) {
-									if assert.NotNil(t, Int64) {
+								if assert.NotNil(t, Int32) {
+									if assert.Equal(t, int32(0), *Int32) && assert.NotNil(t, Int64) {
 										assert.Equal(t, int64(64), *Int64)
 									}
 								}

lib/column/nullable.go

@@ -51,7 +51,7 @@ func (null *Nullable) ReadNull(decoder *binary.Decoder, rows int) (_ []interface
 	return values, nil
 }
 func (null *Nullable) WriteNull(nulls, encoder *binary.Encoder, v interface{}) error {
-	if v == nil || reflect.ValueOf(v).IsNil() {
+	if value := reflect.ValueOf(v); v == nil || (value.Kind() == reflect.Ptr && value.IsNil()) {
 		if _, err := nulls.Write([]byte{1}); err != nil {
 			return err
 		}