Merge pull request #311 from vadimalekseev/main

chore: automatic column inference for the UUID column
ClickHouse · Jun 21, 2023 · e616553 · e616553
2 parents b7e3366 + 6a4fd4f
commit e616553
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/proto/col_auto.go b/proto/col_auto.go
@@ -58,6 +58,12 @@ func (c *ColAuto) Infer(t ColumnType) error {
 		c.Data = new(ColDate)
 	case "Map(String,String)":
 		c.Data = NewMap[string, string](new(ColStr), new(ColStr))
+	case ColumnTypeUUID:
+		c.Data = new(ColUUID)
+	case ColumnTypeArray.Sub(ColumnTypeUUID):
+		c.Data = new(ColUUID).Array()
+	case ColumnTypeNullable.Sub(ColumnTypeUUID):
+		c.Data = new(ColUUID).Nullable()
 	default:
 		switch t.Base() {
 		case ColumnTypeDateTime:

diff --git a/proto/col_auto_test.go b/proto/col_auto_test.go
@@ -43,6 +43,9 @@ func TestColAuto_Infer(t *testing.T) {
 		ColumnTypeNothing,
 		"Nullable(Nothing)",
 		"Array(Nothing)",
+		ColumnTypeUUID,
+		ColumnTypeArray.Sub(ColumnTypeUUID),
+		ColumnTypeNullable.Sub(ColumnTypeUUID),
 	} {
 		r := AutoResult("foo")
 		require.NoError(t, r.Data.(Inferable).Infer(columnType))

diff --git a/proto/col_uuid.go b/proto/col_uuid.go
@@ -21,3 +21,13 @@ func (c ColUUID) Row(i int) uuid.UUID      { return c[i] }
 func (c *ColUUID) Reset()                  { *c = (*c)[:0] }
 func (c *ColUUID) Append(v uuid.UUID)      { *c = append(*c, v) }
 func (c *ColUUID) AppendArr(v []uuid.UUID) { *c = append(*c, v...) }
+
+// Nullable is helper that creates Nullable(uuid.UUID).
+func (c *ColUUID) Nullable() *ColNullable[uuid.UUID] {
+	return NewColNullable[uuid.UUID](c)
+}
+
+// Array is helper that creates Array of uuid.UUID.
+func (c *ColUUID) Array() *ColArr[uuid.UUID] {
+	return NewArray[uuid.UUID](c)
+}