Skip to content

Commit 960ea22

Browse files
author
James Cor
committed
restore
1 parent dd2e4ff commit 960ea22

File tree

1 file changed

+7
-25
lines changed

1 file changed

+7
-25
lines changed

enginetest/memory_engine_test.go

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -200,40 +200,22 @@ func TestSingleQueryPrepared(t *testing.T) {
200200

201201
// Convenience test for debugging a single query. Unskip and set to the desired query.
202202
func TestSingleScript(t *testing.T) {
203-
//t.Skip()
203+
t.Skip()
204204
var scripts = []queries.ScriptTest{
205205
{
206-
Name: "merge join optimization",
207-
Dialect: "mysql",
208-
SetUpScript: []string{
209-
"create table t3 (i int, j int, primary key (i, j));",
210-
"create table t4 (x int, y int, primary key (x, y));",
211-
"insert into t3 values (1, 1), (1, 2), (2, 2), (2, 3), (3, 3);",
212-
"insert into t4 values (2, 2), (3, 3), (4, 4);",
213-
},
206+
Name: "AS OF propagates to nested CALLs",
207+
SetUpScript: []string{},
214208
Assertions: []queries.ScriptTestAssertion{
215209
{
216-
Query: "select /*+ MERGE_JOIN(t3, t4) */ * from t3 join t4 on t3.i = t4.x order by t3.i;",
217-
Expected: []sql.Row{
218-
{2, 2, 2, 2},
219-
{2, 3, 2, 2},
220-
{3, 3, 3, 3},
221-
},
222-
},
223-
{
224-
Query: "explain plan select /*+ MERGE_JOIN(t3, t4) */ * from t3 join t4 on t3.i = t4.x order by t3.i desc;",
210+
Query: "create procedure create_proc() create table t (i int primary key, j int);",
225211
Expected: []sql.Row{
226-
{3, 3, 3, 3},
227-
{2, 3, 2, 2},
228-
{2, 2, 2, 2},
212+
{types.NewOkResult(0)},
229213
},
230214
},
231215
{
232-
Query: "explain plan select /*+ MERGE_JOIN(t3, t4) */ * from t3 join t4 on t3.i = t4.x order by t3.j;",
216+
Query: "call create_proc()",
233217
Expected: []sql.Row{
234-
{2, 2, 2, 2},
235-
{2, 3, 2, 2},
236-
{3, 3, 3, 3},
218+
{types.NewOkResult(0)},
237219
},
238220
},
239221
},

0 commit comments

Comments
 (0)