Skip to content

Commit 82ed525

Browse files
authored
Merge pull request #3083 from dolthub/zachmu/split-queries
Split function-specific engine test queries into their own file
2 parents 8b0896d + 61fbb0b commit 82ed525

File tree

4 files changed

+1075
-1009
lines changed

4 files changed

+1075
-1009
lines changed

enginetest/enginetests.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,20 @@ func TestQueries(t *testing.T, harness Harness) {
7474
})
7575
}
7676

77+
for _, tt := range queries.FunctionQueryTests {
78+
t.Run(tt.Query, func(t *testing.T) {
79+
if sh, ok := harness.(SkippingHarness); ok {
80+
if sh.SkipQueryTest(tt.Query) {
81+
t.Skipf("Skipping query plan for %s", tt.Query)
82+
}
83+
}
84+
if IsServerEngine(e) && tt.SkipServerEngine {
85+
t.Skip("skipping for server engine")
86+
}
87+
TestQueryWithContext(t, ctx, e, harness, tt.Query, tt.Expected, tt.ExpectedColumns, nil, nil)
88+
})
89+
}
90+
7791
// TODO: move this into its own test method
7892
if keyless, ok := harness.(KeylessTableHarness); ok && keyless.SupportsKeylessTables() {
7993
for _, tt := range queries.KeylessQueries {
@@ -218,6 +232,17 @@ func TestQueriesPrepared(t *testing.T, harness Harness) {
218232
}
219233
})
220234

235+
t.Run("function query prepared tests", func(t *testing.T) {
236+
for _, tt := range queries.FunctionQueryTests {
237+
if tt.SkipPrepared {
238+
continue
239+
}
240+
t.Run(tt.Query, func(t *testing.T) {
241+
TestPreparedQueryWithEngine(t, harness, e, tt)
242+
})
243+
}
244+
})
245+
221246
t.Run("keyless prepared tests", func(t *testing.T) {
222247
harness.Setup(setup.MydbData, setup.KeylessData, setup.Keyless_idxData, setup.MytableData)
223248
for _, tt := range queries.KeylessQueries {
@@ -487,6 +512,7 @@ func TestReadOnlyDatabases(t *testing.T, harness ReadOnlyDatabaseHarness) {
487512

488513
for _, querySet := range [][]queries.QueryTest{
489514
queries.QueryTests,
515+
queries.FunctionQueryTests,
490516
queries.KeylessQueries,
491517
} {
492518
for _, tt := range querySet {

0 commit comments

Comments
 (0)