Merge pull request #1 from ClickHouse/master

sync with origin master

Author: pikot

clickhouse_negative_test.go

@@ -18,14 +18,14 @@ func Test_Negative_OpenConnectAndPing(t *testing.T) {
 	if connect, err := sql.Open("clickhouse", "tcp://127.0.0.1:9000?username=invalid"); assert.NoError(t, err) {
 		if err := connect.Ping(); assert.Error(t, err) {
 			if exception, ok := err.(*clickhouse.Exception); assert.True(t, ok) {
-				assert.Equal(t, int32(192), exception.Code)
+				assert.Truef(t, exception.Code == int32(192) || exception.Code == int32(516), "Not equal. Expected: 192 or 516. Actual: %n", exception.Code)
 			}
 		}
 	}
 	if connect, err := sql.Open("clickhouse", "tcp://127.0.0.1:9000?password=invalid"); assert.NoError(t, err) {
 		if err := connect.Ping(); assert.Error(t, err) {
 			if exception, ok := err.(*clickhouse.Exception); assert.True(t, ok) {
-				assert.Equal(t, int32(193), exception.Code)
+				assert.Truef(t, exception.Code == int32(192) || exception.Code == int32(516), "Not equal. Expected: 192 or 516. Actual: %n", exception.Code)
 			}
 		}
 	}

lib/column/column.go

@@ -128,15 +128,6 @@ func Factory(name, chType string, timezone *time.Location) (Column, error) {
 			Timezone: timezone,
 			offset:   int64(offset),
 		}, nil
-	case "DateTime":
-		return &DateTime{
-			base: base{
-				name:    name,
-				chType:  chType,
-				valueOf: columnBaseTypes[time.Time{}],
-			},
-			Timezone: timezone,
-		}, nil
 	case "IPv4":
 		return &IPv4{
 			base: base{
@@ -154,8 +145,16 @@ func Factory(name, chType string, timezone *time.Location) (Column, error) {
 			},
 		}, nil
 	}
-
 	switch {
+	case strings.HasPrefix(chType, "DateTime"):
+		return &DateTime{
+			base: base{
+				name:    name,
+				chType:  "DateTime",
+				valueOf: columnBaseTypes[time.Time{}],
+			},
+			Timezone: timezone,
+		}, nil
 	case strings.HasPrefix(chType, "Array"):
 		return parseArray(name, chType, timezone)
 	case strings.HasPrefix(chType, "Nullable"):

lib/column/column_test.go

@@ -465,6 +465,35 @@ func Test_Column_DateTime(t *testing.T) {
 	}
 }
 
+func Test_Column_DateTimeWithTZ(t *testing.T) {
+	var (
+		buf     bytes.Buffer
+		timeNow = time.Now().Truncate(time.Second)
+		encoder = binary.NewEncoder(&buf)
+		decoder = binary.NewDecoder(&buf)
+	)
+	if column, err := columns.Factory("column_name", `DateTime("UTC")`, time.Local); assert.NoError(t, err) {
+		if err := column.Write(encoder, timeNow); assert.NoError(t, err) {
+			if v, err := column.Read(decoder); assert.NoError(t, err) {
+				assert.Equal(t, timeNow, v)
+			}
+		}
+		if err := column.Write(encoder, timeNow.In(time.UTC).Format("2006-01-02 15:04:05")); assert.NoError(t, err) {
+			if v, err := column.Read(decoder); assert.NoError(t, err) {
+				assert.Equal(t, timeNow, v)
+			}
+		}
+		if assert.Equal(t, "column_name", column.Name()) && assert.Equal(t, "DateTime", column.CHType()) {
+			assert.Equal(t, reflect.TypeOf(time.Time{}).Kind(), column.ScanType().Kind())
+		}
+		if err := column.Write(encoder, int8(0)); assert.Error(t, err) {
+			if e, ok := err.(*columns.ErrUnexpectedType); assert.True(t, ok) {
+				assert.Equal(t, int8(0), e.T)
+			}
+		}
+	}
+}
+
 func Test_Column_UUID(t *testing.T) {
 	var (
 		buf     bytes.Buffer