refactor: remove CastRowToStringSafe and improve error handling in CastToString methods

Author: flarco

core/dbio/iop/datastream.go

@@ -321,15 +321,6 @@ func (ds *Datastream) CastRowToString(row []any) []string {
 	return rowStr
 }
 
-// CastRowToStringSafe returns the row as string casted (safer)
-func (ds *Datastream) CastRowToStringSafe(row []any) []string {
-	rowStr := make([]string, len(row))
-	for i, val := range row {
-		rowStr[i] = ds.Sp.CastToStringSafe(i, val, ds.Columns[i].Type)
-	}
-	return rowStr
-}
-
 // CastToStringSafeMask returns the row as string mask casted ( evensafer)
 func (ds *Datastream) CastToStringSafeMask(row []any) []string {
 	rowStr := make([]string, len(row))

core/dbio/iop/datatype_test.go

@@ -301,6 +301,16 @@ func TestParseDate(t *testing.T) {
 	g.P(sp.ParseString(val))
 	val = `1/17/20`
 	g.P(sp.ParseString(val))
+	val = `0001-01-01 00:00:00.000`
+	valT, err := sp.CastToTime(val)
+	if assert.NoError(t, err) {
+		g.P(valT)
+		g.P(valT.IsZero())
+		g.P(valT.Format(time.DateTime))
+	}
+	val = `0000-00-00 00:00:00.000`
+	_, err = sp.CastToTime(val)
+	assert.Error(t, err)
 }
 
 func TestParseDecimal(t *testing.T) {

core/dbio/iop/stream_processor.go

@@ -925,7 +925,7 @@ func (sp *StreamProcessor) CastVal(i int, val interface{}, col *Column) interfac
 			sVal = cast.ToString(val)
 			sp.rowChecksum[i] = uint64(len(sVal))
 			nVal = sVal
-		} else if dVal.IsZero() || g.In(val, "0000-00-00", "0000-00-00 00:00:00") {
+		} else if g.In(val, "0000-00-00", "0000-00-00 00:00:00") {
 			nVal = nil
 			cs.NullCnt++
 			sp.rowBlankValCnt++
@@ -1013,15 +1013,15 @@ func (sp *StreamProcessor) CastToString(i int, val interface{}, valType ...Colum
 		return cast.ToString(val)
 		// return fmt.Sprintf("%v", val)
 	case typ.IsDate():
-		tVal, _ := sp.CastToTime(val)
-		if tVal.IsZero() {
-			return ""
+		tVal, err := sp.CastToTime(val)
+		if err != nil {
+			return cast.ToString(val)
 		}
 		return tVal.Format("2006-01-02")
 	case typ.IsDatetime():
-		tVal, _ := sp.CastToTime(val)
-		if tVal.IsZero() {
-			return ""
+		tVal, err := sp.CastToTime(val)
+		if err != nil {
+			return cast.ToString(val)
 		} else if sp.Config.DatetimeFormat != "" && strings.ToLower(sp.Config.DatetimeFormat) != "auto" {
 			return tVal.Format(sp.Config.DatetimeFormat)
 		} else if tVal.Location() == nil {
@@ -1040,48 +1040,6 @@ func (sp *StreamProcessor) CastToString(i int, val interface{}, valType ...Colum
 	}
 }
 
-// CastToStringSafe to string (safer)
-func (sp *StreamProcessor) CastToStringSafe(i int, val interface{}, valType ...ColumnType) string {
-	typ := ColumnType("")
-	switch v := val.(type) {
-	case time.Time:
-		typ = DatetimeType
-	default:
-		_ = v
-	}
-
-	if len(valType) > 0 {
-		typ = valType[0]
-	}
-
-	switch {
-	case val == nil:
-		return ""
-	case sp.Config.BoolAsInt && typ.IsBool():
-		switch cast.ToString(val) {
-		case "true", "1", "TRUE":
-			return "1"
-		}
-		return "0"
-	case typ.IsDecimal() || typ.IsFloat():
-		return cast.ToString(val)
-	case typ.IsDate():
-		tVal, _ := sp.CastToTime(val)
-		if tVal.IsZero() {
-			return ""
-		}
-		return tVal.UTC().Format("2006-01-02")
-	case typ.IsDatetime():
-		tVal, _ := sp.CastToTime(val)
-		if tVal.IsZero() {
-			return ""
-		}
-		return tVal.UTC().Format("2006-01-02 15:04:05.999999") + " +00"
-	default:
-		return cast.ToString(val)
-	}
-}
-
 // CastToStringSafe to masks to count bytes (even safer)
 func (sp *StreamProcessor) CastToStringSafeMask(i int, val interface{}, valType ...ColumnType) string {
 	typ := ColumnType("")
@@ -1155,8 +1113,6 @@ func (sp *StreamProcessor) CastValWithoutStats(i int, val interface{}, typ Colum
 		dVal, err := sp.CastToTime(val)
 		if err != nil {
 			nVal = val // keep string
-		} else if dVal.IsZero() {
-			nVal = nil
 		} else {
 			nVal = dVal
 		}