fix: IQueryField support ConvertFromValue

Author: Qiu Jian

backends/clickhouse/column.go

@@ -20,13 +20,11 @@ import (
 	"fmt"
 	"reflect"
 	"strconv"
-	"strings"
 	"time"
 
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/gotypes"
 	"yunion.io/x/pkg/tristate"
-	"yunion.io/x/pkg/util/timeutils"
 	"yunion.io/x/pkg/utils"
 
 	"yunion.io/x/sqlchemy"
@@ -157,8 +155,8 @@ func (c *SBooleanColumn) DefinitionString() string {
 
 // ConvertFromString implementation of SBooleanColumn for IColumnSpec
 func (c *SBooleanColumn) ConvertFromString(str string) interface{} {
-	switch strings.ToLower(str) {
-	case "true", "yes", "on", "ok", "1":
+	switch sqlchemy.ConvertValueToBool(str) {
+	case true:
 		return uint8(1)
 	default:
 		return uint8(0)
@@ -167,11 +165,12 @@ func (c *SBooleanColumn) ConvertFromString(str string) interface{} {
 
 // ConvertFromValue implementation of STristateColumn for IColumnSpec
 func (c *SBooleanColumn) ConvertFromValue(val interface{}) interface{} {
-	bVal := val.(bool)
-	if bVal {
+	switch sqlchemy.ConvertValueToBool(val) {
+	case true:
 		return uint8(1)
+	default:
+		return uint8(0)
 	}
-	return uint8(0)
 }
 
 // IsZero implementation of SBooleanColumn for IColumnSpec
@@ -207,24 +206,24 @@ func (c *STristateColumn) DefinitionString() string {
 
 // ConvertFromString implementation of STristateColumn for IColumnSpec
 func (c *STristateColumn) ConvertFromString(str string) interface{} {
-	switch strings.ToLower(str) {
-	case "true", "yes", "on", "ok", "1":
+	switch sqlchemy.ConvertValueToTriState(str) {
+	case tristate.True:
 		return uint8(1)
-	case "none", "null", "unknown":
-		return sql.NullInt32{}
-	default:
+	case tristate.False:
 		return uint8(0)
+	default:
+		return sql.NullInt32{}
 	}
 }
 
 // ConvertFromValue implementation of STristateColumn for IColumnSpec
 func (c *STristateColumn) ConvertFromValue(val interface{}) interface{} {
-	bVal := val.(tristate.TriState)
-	if bVal == tristate.True {
+	switch sqlchemy.ConvertValueToTriState(val) {
+	case tristate.True:
 		return uint8(1)
-	} else if bVal == tristate.False {
+	case tristate.False:
 		return uint8(0)
-	} else {
+	default:
 		return sql.NullInt32{}
 	}
 }
@@ -282,37 +281,50 @@ func (c *SIntegerColumn) IsZero(val interface{}) bool {
 
 // ConvertFromString implementation of STristateColumn for IColumnSpec
 func (c *SIntegerColumn) ConvertFromString(str string) interface{} {
-	ctype := c.SBaseColumn.ColType()
-	if ctype[0] == 'U' {
-		// unsigned
-		val, _ := strconv.ParseUint(str, 10, 64)
-		switch ctype {
-		case "UInt8":
-			return uint8(val)
-		case "UInt16":
-			return uint16(val)
-		case "UInt32":
-			return uint32(val)
-		case "UInt64":
-			return val
-		default:
-			panic(fmt.Sprintf("unsupported type %s", ctype))
-		}
-	} else {
-		val, _ := strconv.ParseInt(str, 10, 64)
-		switch ctype {
-		case "Int8":
-			return int8(val)
-		case "Int16":
-			return int16(val)
-		case "Int32":
-			return int32(val)
-		case "Int64":
-			return val
-		default:
-			panic(fmt.Sprintf("unsupported type %s", ctype))
-		}
+	val := sqlchemy.ConvertValueToInteger(str)
+	switch c.ColType() {
+	case "UInt8":
+		return uint8(val)
+	case "UInt16":
+		return uint16(val)
+	case "UInt32":
+		return uint32(val)
+	case "UInt64":
+		return val
+	case "Int8":
+		return int8(val)
+	case "Int16":
+		return int16(val)
+	case "Int32":
+		return int32(val)
+	case "Int64":
+		return val
 	}
+	panic(fmt.Sprintf("unsupported type %s", c.ColType()))
+}
+
+// ConvertFromValue implementation of SIntegerColumn for IColumnSpec
+func (c *SIntegerColumn) ConvertFromValue(val interface{}) interface{} {
+	intval := sqlchemy.ConvertValueToInteger(val)
+	switch c.ColType() {
+	case "UInt8":
+		return uint8(intval)
+	case "UInt16":
+		return uint16(intval)
+	case "UInt32":
+		return uint32(intval)
+	case "UInt64":
+		return intval
+	case "Int8":
+		return int8(intval)
+	case "Int16":
+		return int16(intval)
+	case "Int32":
+		return int32(intval)
+	case "Int64":
+		return intval
+	}
+	panic(fmt.Sprintf("unsupported type %s", c.ColType()))
 }
 
 // IsAutoVersion implements IsAutoVersion for IColumnSpec
@@ -374,16 +386,26 @@ func (c *SFloatColumn) IsZero(val interface{}) bool {
 
 // ConvertFromString implementation of STristateColumn for IColumnSpec
 func (c *SFloatColumn) ConvertFromString(str string) interface{} {
-	ctype := c.SBaseColumn.ColType()
-	val, _ := strconv.ParseFloat(str, 64)
-	switch ctype {
+	floatVal := sqlchemy.ConvertValueToFloat(str)
+	switch c.ColType() {
 	case "Float32":
-		return float32(val)
+		return float32(floatVal)
 	case "Float64":
-		return val
-	default:
-		panic(fmt.Sprintf("unsupported type %s", ctype))
+		return floatVal
+	}
+	panic(fmt.Sprintf("unsupported type %s", c.ColType()))
+}
+
+// ConvertFromValue implementation of SFloatColumn for IColumnSpec
+func (c *SFloatColumn) ConvertFromValue(val interface{}) interface{} {
+	floatVal := sqlchemy.ConvertValueToFloat(val)
+	switch c.ColType() {
+	case "Float32":
+		return float32(floatVal)
+	case "Float64":
+		return floatVal
 	}
+	panic(fmt.Sprintf("unsupported type %s", c.ColType()))
 }
 
 // NewFloatColumn returns an instance of SFloatColumn
@@ -442,8 +464,12 @@ func (c *SDecimalColumn) IsZero(val interface{}) bool {
 
 // ConvertFromString implementation of STristateColumn for IColumnSpec
 func (c *SDecimalColumn) ConvertFromString(str string) interface{} {
-	val, _ := strconv.ParseFloat(str, 64)
-	return val
+	return sqlchemy.ConvertValueToFloat(str)
+}
+
+// ConvertFromValue implementation of SDecimalColumn for IColumnSpec
+func (c *SDecimalColumn) ConvertFromValue(val interface{}) interface{} {
+	return sqlchemy.ConvertValueToFloat(val)
 }
 
 // NewDecimalColumn returns an instance of SDecimalColumn
@@ -527,6 +553,11 @@ func (c *STextColumn) ConvertFromString(str string) interface{} {
 	return str
 }
 
+// ConvertFromValue implementation of STextColumn for IColumnSpec
+func (c *STextColumn) ConvertFromValue(val interface{}) interface{} {
+	return sqlchemy.ConvertValueToString(val)
+}
+
 // NewTextColumn return an instance of STextColumn
 func NewTextColumn(name string, sqlType string, tagmap map[string]string, isPointer bool) STextColumn {
 	return STextColumn{
@@ -564,8 +595,12 @@ func (c *STimeTypeColumn) IsZero(val interface{}) bool {
 
 // ConvertFromString implementation of STristateColumn for IColumnSpec
 func (c *STimeTypeColumn) ConvertFromString(str string) interface{} {
-	tm, _ := timeutils.ParseTimeStr(str)
-	return tm
+	return sqlchemy.ConvertValueToTime(str)
+}
+
+// ConvertFromValue implementation of STimeTypeColumn for IColumnSpec
+func (c *STimeTypeColumn) ConvertFromValue(val interface{}) interface{} {
+	return sqlchemy.ConvertValueToTime(val)
 }
 
 func (c *STimeTypeColumn) GetTTL() (int, string) {

backends/clickhouse/column_test.go

@@ -17,6 +17,7 @@ package clickhouse
 import (
 	"database/sql"
 	"testing"
+	"time"
 
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/tristate"
@@ -211,7 +212,7 @@ func TestConvertValue(t *testing.T) {
 		},
 		{
 			in:   23,
-			want: 23,
+			want: int8(23),
 			col:  &intCol,
 		},
 		{
@@ -268,6 +269,11 @@ func TestConvertString(t *testing.T) {
 			want: float32(0.01),
 			col:  &float32Col,
 		},
+		{
+			in:   "2025-03-27 12:00:00",
+			want: time.Date(2025, 3, 27, 12, 0, 0, 0, time.UTC),
+			col:  &dateCol,
+		},
 	}
 	for _, c := range cases {
 		got := c.col.ConvertFromString(c.in)

backends/clickhouse/sync.go

@@ -164,7 +164,7 @@ func (clickhouse *SClickhouseBackend) CommitTableChangeSQL(ts sqlchemy.ITableSpe
 	if oldTtlSpec != newTtlSpec {
 		if oldTtlSpec.Count > 0 && newTtlSpec.Count == 0 {
 			// remove
-			sql := fmt.Sprintf("REMOVE TTL")
+			sql := "REMOVE TTL"
 			alters = append(alters, sql)
 		} else {
 			// alter