Merge pull request ClickHouse#207 from cw9/master

Support inserting [][]byte to Array(String) column

Author: kshvakov

clickhouse_test.go

@@ -1228,6 +1228,18 @@ func TestArrayArrayT(t *testing.T) {
 						if !assert.NoError(t, err) {
 							return
 						}
+						_, err = stmt.Exec(
+							[][][]byte{
+								[][]byte{[]byte("AA")},
+								[][]byte{[]byte("BB")},
+								[][]byte{[]byte("C4C")},
+							},
+							[][]byte{[]byte("XX"), []byte("YY")},
+							[]int32{4, 5, 6},
+						)
+						if !assert.NoError(t, err) {
+							return
+						}
 					} else {
 						return
 					}

lib/column/array.go

@@ -59,6 +59,10 @@ func (array *Array) read(decoder *binary.Decoder, ln int) (interface{}, error) {
 	return slice.Interface(), nil
 }
 
+func (array *Array) Depth() int {
+	return array.depth
+}
+
 func parseArray(name, chType string, timezone *time.Location) (*Array, error) {
 	if len(chType) < 11 {
 		return nil, fmt.Errorf("invalid Array column type: %s", chType)

lib/column/column.go

@@ -16,6 +16,7 @@ type Column interface {
 	Read(*binary.Decoder) (interface{}, error)
 	Write(*binary.Encoder, interface{}) error
 	defaultValue() interface{}
+	Depth() int
 }
 
 func Factory(name, chType string, timezone *time.Location) (Column, error) {

lib/column/common.go

@@ -54,3 +54,7 @@ func (base *base) defaultValue() interface{} {
 func (base *base) String() string {
 	return fmt.Sprintf("%s (%s)", base.name, base.chType)
 }
+
+func (base *base) Depth() int {
+	return 0
+}

lib/data/block.go

@@ -96,6 +96,9 @@ func (block *Block) Read(serverInfo *ServerInfo, decoder *binary.Decoder) (err e
 }
 
 func (block *Block) writeArray(column column.Column, value reflect.Value, num, level int) error {
+	if level > column.Depth() {
+		return column.Write(block.buffers[num].Column, value.Interface())
+	}
 	switch {
 	case value.Kind() == reflect.Slice:
 		if len(block.offsets[num]) < level {