SQL Expressions: Return error on malformed input (#110479)

Fixup on a misleading error being returned due to a missing return statement in the code. Was returning the error "conversion succeeded but no frames" even though there was an error.

pkg/expr/sql_command.go

@@ -378,6 +378,7 @@ func handleSqlInput(ctx context.Context, tracer trace.Tracer, refID string, forR
 		convertedFrames, err := ConvertToFullLong(dataFrames)
 		if err != nil {
 			result.Error = sql.MakeInputConvertError(err, refID, forRefIDs, dsType)
+			return result, true
 		}
 
 		if len(convertedFrames) == 0 {

pkg/expr/sql_command_test.go

@@ -236,6 +236,17 @@ func TestHandleSqlInput(t *testing.T) {
 			expectFrame: true,
 			converted:   true,
 		},
+		{
+			name: "supported type (timeseries-multi) but malformed returns error",
+			frames: data.Frames{
+				data.NewFrame("",
+					data.NewField("time", nil, []string{"1"}), // string is not valid for time field
+					data.NewField("value", data.Labels{"host": "a"}, []*float64{fp(2)}),
+				).SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti}),
+			},
+			expectErr: "missing time field",
+			converted: true,
+		},
 	}
 
 	for _, tc := range tests {