null uuid sql store insert fix (#5288)

rilldata · Jul 17, 2024 · 03beddd · 03beddd · github-actions · Jul 17, 2024
1 parent f6e72bc
commit 03beddd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/runtime/drivers/duckdb/transporter_sqlstore_to_duckDB.go b/runtime/drivers/duckdb/transporter_sqlstore_to_duckDB.go
@@ -229,6 +229,9 @@ func CreateTableQuery(schema *runtimev1.StructType, name string) (string, error)
 
 func convert(row []driver.Value, schema *runtimev1.StructType) error {
 	for i, v := range row {
+		if v == nil {
+			continue
+		}
 		if schema.Fields[i].Type.Code == runtimev1.Type_CODE_UUID {
 			val, ok := v.([16]byte)
 			if !ok {

diff --git a/runtime/drivers/postgres/sql_store.go b/runtime/drivers/postgres/sql_store.go
@@ -115,11 +115,11 @@ func (r *rowIterator) Next(ctx context.Context) ([]sqldriver.Value, error) {
 	}
 
 	for i := range r.schema.Fields {
-		mapper := r.fieldMappers[i]
 		if vals[i] == nil {
 			r.row[i] = nil
 			continue
 		}
+		mapper := r.fieldMappers[i]
 		r.row[i], err = mapper.value(vals[i])
 		if err != nil {
 			return nil, err