update clickhouse_test.go

Author: zxc111

clickhouse_test.go

@@ -91,7 +91,9 @@ func Test_Insert(t *testing.T) {
 				date    Date,
 				datetime DateTime,
 				ipv4 IPv4,
-				ipv6 IPv6
+				ipv6 IPv6,
+				ipv4str FixedString(16),
+				ipv6str FixedString(16)
 			) Engine=Memory
 		`
 		dml = `
@@ -111,7 +113,9 @@ func Test_Insert(t *testing.T) {
 				date,
 				datetime,
 				ipv4,
-				ipv6
+				ipv6,
+				ipv4str,
+				ipv6str
 			) VALUES (
 				?,
 				?,
@@ -128,6 +132,8 @@ func Test_Insert(t *testing.T) {
 				?,
 				?,
 				?,
+				?,
+				?,
 				?
 			)
 		`
@@ -148,7 +154,9 @@ func Test_Insert(t *testing.T) {
 				date,
 				datetime,
 				ipv4,
-				ipv6
+				ipv6,
+				ipv4str,
+				ipv6str
 			FROM clickhouse_test_insert
 		`
 	)
@@ -162,12 +170,14 @@ func Test_Insert(t *testing.T) {
 								-1*i, -2*i, -4*i, -8*i, // int
 								uint8(1*i), uint16(2*i), uint32(4*i), uint64(8*i), // uint
 								1.32*float32(i), 1.64*float64(i), //float
-								fmt.Sprintf("string %d", i), // string
-								"RU",                        //fixedstring,
-								time.Now(),                  //date
-								time.Now(),                  //datetime
-								"1.2.3.4",                   // ipv4
+								fmt.Sprintf("string %d", i),               // string
+								"RU",                                      //fixedstring,
+								time.Now(),                                //date
+								time.Now(),                                //datetime
+								"1.2.3.4",                                 // ipv4
 								"2001:0db8:85a3:0000:0000:8a2e:0370:7334", //ipv6
+								column.IP(net.ParseIP("127.0.0.1").To4()),
+								column.IP(net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334")),
 							)
 							if !assert.NoError(t, err) {
 								return
@@ -194,6 +204,8 @@ func Test_Insert(t *testing.T) {
 							DateTime    time.Time
 							Ipv6        column.IP
 							Ipv4        column.IP
+							Ipv4str     column.IP
+							Ipv6str     column.IP
 						}
 						if rows, err := connect.Query(query); assert.NoError(t, err) {
 							var count int
@@ -216,6 +228,8 @@ func Test_Insert(t *testing.T) {
 									&item.DateTime,
 									&item.Ipv4,
 									&item.Ipv6,
+									&item.Ipv4str,
+									&item.Ipv6str,
 								)
 								if !assert.NoError(t, err) {
 									return

lib/column/ip_test.go

@@ -2,6 +2,8 @@ package column
 
 import (
 	"fmt"
+	"github.com/kshvakov/clickhouse/lib/binary"
+	"io/ioutil"
 	"net"
 	"strings"
 	"testing"
@@ -47,5 +49,85 @@ func Test_IPConverter(t *testing.T) {
 	assert.Equal(t, errInvalidScanValue, ip.Scan(""))
 	assert.Equal(t, errInvalidScanValue, ip.Scan([]byte{'1', '2', '3'}))
 	assert.Equal(t, errInvalidScanType, ip.Scan(1))
+}
+
+func TestIPv4_Write(t *testing.T) {
+	ip := net.ParseIP("0.0.0.0")
+	ipv4 := IPv4{}
 
+	cases := []struct {
+		Key   interface{}
+		Error interface{}
+	}{
+		{
+			net.ParseIP("0.0.0.0"),
+			nil,
+		},
+		{
+			&ip,
+			nil,
+		},
+		{
+			"0.0.0.0",
+			nil,
+		},
+		{
+			"",
+			&ErrUnexpectedType{
+				&ipv4,
+				"",
+			},
+		},
+		{
+			"2001:0db8::0001",
+			&ErrUnexpectedType{
+				&ipv4,
+				"2001:0db8::0001",
+			},
+		},
+	}
+	for _, Case := range cases {
+
+		buffer := binary.NewEncoder(ioutil.Discard)
+		assert.Equal(t, ipv4.Write(buffer, Case.Key), Case.Error)
+	}
 }
+
+func TestIPv6_Write(t *testing.T) {
+	ip := net.ParseIP("2001:0db8::0001")
+	ipv6 := IPv6{}
+
+	cases := []struct {
+		Key   interface{}
+		Error interface{}
+	}{
+		{
+			net.ParseIP("2001:0db8::0001"),
+			nil,
+		},
+		{
+			&ip,
+			nil,
+		},
+		{
+			"2001:0db8::0001",
+			nil,
+		},
+		{
+			"",
+			&ErrUnexpectedType{
+				&ipv6,
+				"",
+			},
+		},
+		{
+			"0.0.0.0",
+			nil,
+		},
+	}
+	for _, Case := range cases {
+
+		buffer := binary.NewEncoder(ioutil.Discard)
+		assert.Equal(t, ipv6.Write(buffer, Case.Key), Case.Error)
+	}
+}

lib/column/ipv4.go

@@ -34,7 +34,19 @@ func (ip *IPv4) Write(encoder *binary.Encoder, v interface{}) error {
 		}
 	}
 
+	if netIP == nil {
+		return &ErrUnexpectedType{
+			T:      v,
+			Column: ip,
+		}
+	}
 	ip4 := netIP.To4()
+	if ip4 == nil {
+		return &ErrUnexpectedType{
+			T:      v,
+			Column: ip,
+		}
+	}
 	if _, err := encoder.Write([]byte{ip4[3], ip4[2], ip4[1], ip4[0]}); err != nil {
 		return err
 	}

lib/column/ipv6.go

@@ -34,6 +34,12 @@ func (ip *IPv6) Write(encoder *binary.Encoder, v interface{}) error {
 		}
 	}
 
+	if netIP == nil {
+		return &ErrUnexpectedType{
+			T:      v,
+			Column: ip,
+		}
+	}
 	if _, err := encoder.Write([]byte(netIP.To16())); err != nil {
 		return err
 	}