SQL Expressions: Always convert on type first (#106083)

fixes #103124
This commit is contained in:
Kyle Brandt
2025-05-28 12:00:37 -04:00
committed by GitHub
parent 64f321e430
commit 7f1a286ffb
3 changed files with 139 additions and 31 deletions
+82
View File
@@ -120,3 +120,85 @@ func TestConvertDataFramesToResults(t *testing.T) {
})
})
}
func TestHandleSqlInput(t *testing.T) {
tests := []struct {
name string
frames data.Frames
expectErr string
expectFrame bool
}{
{
name: "single frame with no fields and no type is passed through",
frames: data.Frames{data.NewFrame("")},
expectFrame: true,
},
{
name: "single frame with no fields but type timeseries-multi is passed through",
frames: data.Frames{data.NewFrame("").SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti})},
expectFrame: true,
},
{
name: "single frame, no labels, no type → passes through",
frames: data.Frames{
data.NewFrame("",
data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
data.NewField("value", nil, []*float64{fp(2)}),
),
},
expectFrame: true,
},
{
name: "single frame with labels, but missing FrameMeta.Type → error",
frames: data.Frames{
data.NewFrame("",
data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
data.NewField("value", data.Labels{"foo": "bar"}, []*float64{fp(2)}),
),
},
expectErr: "frame has labels but frame type is missing or unsupported",
},
{
name: "multiple frames, no type → error",
frames: data.Frames{
data.NewFrame("",
data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
data.NewField("value", nil, []*float64{fp(2)}),
),
data.NewFrame("",
data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
data.NewField("value", nil, []*float64{fp(2)}),
),
},
expectErr: "response has more than one frame but frame type is missing or unsupported",
},
{
name: "supported type (timeseries-multi) triggers ConvertToFullLong",
frames: data.Frames{
data.NewFrame("",
data.NewField("time", nil, []time.Time{time.Unix(1, 0)}),
data.NewField("value", data.Labels{"host": "a"}, []*float64{fp(2)}),
).SetMeta(&data.FrameMeta{Type: data.FrameTypeTimeSeriesMulti}),
},
expectFrame: true,
},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
res := handleSqlInput(tc.frames)
if tc.expectErr != "" {
require.Error(t, res.Error)
require.ErrorContains(t, res.Error, tc.expectErr)
} else {
require.NoError(t, res.Error)
if tc.expectFrame {
require.Len(t, res.Values, 1)
require.IsType(t, mathexp.TableData{}, res.Values[0])
assert.NotNil(t, res.Values[0].(mathexp.TableData).Frame)
}
}
})
}
}