Skip to content

Commit b158a2e

Browse files
fix: Simplify DefaultValue handling
1 parent f90e27b commit b158a2e

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

  • internal/pkg/service/stream/mapping/table/column

internal/pkg/service/stream/mapping/table/column/renderer.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -140,23 +140,19 @@ func (r *Renderer) jsonPathCSVValue(c Path, ctx recordctx.Context) (string, erro
140140

141141
if resultErr == nil {
142142
// Return unquoted string if the value is a string and RawString is set to true.
143-
if value.Type() == fastjson.TypeString && c.RawString {
143+
if c.RawString && value.Type() == fastjson.TypeString {
144144
return string(value.GetStringBytes()), nil
145145
}
146146

147147
// Return the found value (json encoded)
148148
return value.String(), nil
149149
} else if c.DefaultValue != nil {
150150
// An error happened while processing the path, but we have a DefaultValue to use.
151-
var result any = *c.DefaultValue
152-
153151
if c.RawString {
154-
if stringValue, ok := result.(string); ok {
155-
return stringValue, nil
156-
}
152+
return *c.DefaultValue, nil
157153
}
158154

159-
return json.EncodeString(result, false)
155+
return json.EncodeString(*c.DefaultValue, false)
160156
}
161157

162158
return "", resultErr

0 commit comments

Comments
 (0)