Merge branch 'master' of https://github.com/kshvakov/clickhouse

Author: kshvakov

lib/column/uuid.go

@@ -23,6 +23,9 @@ func (*UUID) Read(decoder *binary.Decoder) (interface{}, error) {
 	if err != nil {
 		return "", err
 	}
+
+	src = swap(src)
+
 	var uuid [36]byte
 	{
 		hex.Encode(uuid[:], src[:4])
@@ -56,12 +59,28 @@ func (u *UUID) Write(encoder *binary.Encoder, v interface{}) (err error) {
 			Column: u,
 		}
 	}
+
+	uuid = swap(uuid)
+
 	if _, err := encoder.Write(uuid); err != nil {
 		return err
 	}
 	return nil
 }
 
+func swap(src []byte) []byte {
+	_ = src[15]
+	src[0], src[7] = src[7], src[0]
+	src[1], src[6] = src[6], src[1]
+	src[2], src[5] = src[5], src[2]
+	src[3], src[4] = src[4], src[3]
+	src[8], src[15] = src[15], src[8]
+	src[9], src[14] = src[14], src[9]
+	src[10], src[13] = src[13], src[10]
+	src[11], src[12] = src[12], src[11]
+	return src
+}
+
 func uuid2bytes(str string) ([]byte, error) {
 	var uuid [16]byte
 	if str[8] != '-' || str[13] != '-' || str[18] != '-' || str[23] != '-' {

stmt.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"database/sql/driver"
+	"unicode"
 
 	"github.com/kshvakov/clickhouse/lib/data"
 )
@@ -138,13 +139,17 @@ func (stmt *stmt) bind(args []driver.NamedValue) string {
 						char == '(',
 						char == ',',
 						char == '%',
+						char == '+',
+						char == '-',
+						char == '*',
+						char == '/',
 						char == '[':
 						keyword = true
 					default:
 						if limit.matchRune(char) {
 							keyword = true
 						} else {
-							keyword = keyword && (char == ' ' || char == '\t' || char == '\n')
+							keyword = keyword && unicode.IsSpace(char)
 						}
 					}
 					buf.WriteRune(char)