Skip to content

Commit 170512e

Browse files
author
James Cor
committed
fixes
1 parent cf72039 commit 170512e

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎enginetest/enginetests.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ func TestInfoSchema(t *testing.T, h Harness) {
346346

347347
TestQueryWithContext(t, ctx, e, h,
348348
"SELECT id, uSeR, hOST FROM information_schema.processlist ORDER BY id",
349-
[]sql.Row{
349+
[]sql.UntypedSqlRow{
350350
{uint64(1), "root", "localhost"},
351351
{uint64(2), "root", "otherhost"},
352352
},
@@ -391,7 +391,7 @@ func TestInfoSchema(t *testing.T, h Harness) {
391391

392392
TestQueryWithContext(t, ctx, e, h,
393393
"SELECT id, uSeR, hOST FROM information_schema.processlist pl ORDER BY id",
394-
[]sql.Row{
394+
[]sql.UntypedSqlRow{
395395
{uint64(1), "root", "localhost"},
396396
{uint64(2), "root", "otherhost"},
397397
},
@@ -436,7 +436,7 @@ func TestInfoSchema(t *testing.T, h Harness) {
436436

437437
TestQueryWithContext(t, ctx, e, h,
438438
"SELECT id, uSeR, hOST FROM information_schema.processlist pl join information_schema.schemata on true ORDER BY id limit 1",
439-
[]sql.Row{
439+
[]sql.UntypedSqlRow{
440440
{uint64(1), "root", "localhost"},
441441
},
442442
sql.Schema{
@@ -1110,14 +1110,14 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11101110
file string
11111111
query string
11121112
exp string
1113-
expRows []sql.Row
1113+
expRows []sql.UntypedSqlRow
11141114
err *errors.Kind
11151115
skip bool
11161116
}{
11171117
{
11181118
file: "outfile.txt",
11191119
query: "select * from mytable into outfile 'outfile.txt';",
1120-
expRows: []sql.Row{{types.NewOkResult(3)}},
1120+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11211121
exp: "" +
11221122
"1\tfirst row\n" +
11231123
"2\tsecond row\n" +
@@ -1126,13 +1126,13 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11261126
{
11271127
file: "dumpfile.txt",
11281128
query: "select * from mytable limit 1 into dumpfile 'dumpfile.txt';",
1129-
expRows: []sql.Row{{types.NewOkResult(1)}},
1129+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(1)}},
11301130
exp: "1first row",
11311131
},
11321132
{
11331133
file: "outfile.txt",
11341134
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',';",
1135-
expRows: []sql.Row{{types.NewOkResult(3)}},
1135+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11361136
exp: "" +
11371137
"1,first row\n" +
11381138
"2,second row\n" +
@@ -1141,7 +1141,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11411141
{
11421142
file: "outfile.txt",
11431143
query: "select * from mytable into outfile 'outfile.txt' fields terminated by '$$';",
1144-
expRows: []sql.Row{{types.NewOkResult(3)}},
1144+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11451145
exp: "" +
11461146
"1$$first row\n" +
11471147
"2$$second row\n" +
@@ -1150,7 +1150,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11501150
{
11511151
file: "outfile.txt",
11521152
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' optionally enclosed by '\"';",
1153-
expRows: []sql.Row{{types.NewOkResult(3)}},
1153+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11541154
exp: "" +
11551155
"1,\"first row\"\n" +
11561156
"2,\"second row\"\n" +
@@ -1169,7 +1169,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11691169
{
11701170
file: "outfile.txt",
11711171
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' enclosed by '\"';",
1172-
expRows: []sql.Row{{types.NewOkResult(3)}},
1172+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11731173
exp: "" +
11741174
"\"1\",\"first row\"\n" +
11751175
"\"2\",\"second row\"\n" +
@@ -1178,7 +1178,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11781178
{
11791179
file: "outfile.txt",
11801180
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' lines terminated by ';';",
1181-
expRows: []sql.Row{{types.NewOkResult(3)}},
1181+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11821182
exp: "" +
11831183
"1,first row;" +
11841184
"2,second row;" +
@@ -1187,7 +1187,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11871187
{
11881188
file: "outfile.txt",
11891189
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' lines terminated by 'r';",
1190-
expRows: []sql.Row{{types.NewOkResult(3)}},
1190+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
11911191
exp: "" +
11921192
"1,fi\\rst \\rowr" +
11931193
"2,second \\rowr" +
@@ -1196,7 +1196,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
11961196
{
11971197
file: "outfile.txt",
11981198
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' lines starting by 'r';",
1199-
expRows: []sql.Row{{types.NewOkResult(3)}},
1199+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
12001200
exp: "" +
12011201
"r1,first row\n" +
12021202
"r2,second row\n" +
@@ -1205,7 +1205,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12051205
{
12061206
file: "outfile.txt",
12071207
query: "select * from mytable into outfile 'outfile.txt' fields terminated by '';",
1208-
expRows: []sql.Row{{types.NewOkResult(3)}},
1208+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
12091209
exp: "" +
12101210
"1\tfirst row\n" +
12111211
"2\tsecond row\n" +
@@ -1214,7 +1214,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12141214
{
12151215
file: "outfile.txt",
12161216
query: "select * from mytable into outfile 'outfile.txt' fields terminated by ',' lines terminated by '';",
1217-
expRows: []sql.Row{{types.NewOkResult(3)}},
1217+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
12181218
exp: "" +
12191219
"1,first row" +
12201220
"2,second row" +
@@ -1223,7 +1223,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12231223
{
12241224
file: "outfile.txt",
12251225
query: "select * from niltable into outfile 'outfile.txt';",
1226-
expRows: []sql.Row{{types.NewOkResult(6)}},
1226+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(6)}},
12271227
exp: "1\t\\N\t\\N\t\\N\n" +
12281228
"2\t2\t1\t\\N\n" +
12291229
"3\t\\N\t0\t\\N\n" +
@@ -1234,7 +1234,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12341234
{
12351235
file: "outfile.txt",
12361236
query: "select * from niltable into outfile 'outfile.txt' fields terminated by ',' enclosed by '\"';",
1237-
expRows: []sql.Row{{types.NewOkResult(6)}},
1237+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(6)}},
12381238
exp: "\"1\",\\N,\\N,\\N\n" +
12391239
"\"2\",\"2\",\"1\",\\N\n" +
12401240
"\"3\",\\N,\"0\",\\N\n" +
@@ -1245,7 +1245,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12451245
{
12461246
file: "outfile.txt",
12471247
query: "select * from niltable into outfile 'outfile.txt' fields terminated by ',' escaped by '$';",
1248-
expRows: []sql.Row{{types.NewOkResult(6)}},
1248+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(6)}},
12491249
exp: "1,$N,$N,$N\n" +
12501250
"2,2,1,$N\n" +
12511251
"3,$N,0,$N\n" +
@@ -1256,7 +1256,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12561256
{
12571257
file: "outfile.txt",
12581258
query: "select * from niltable into outfile 'outfile.txt' fields terminated by ',' escaped by '';",
1259-
expRows: []sql.Row{{types.NewOkResult(6)}},
1259+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(6)}},
12601260
exp: "1,NULL,NULL,NULL\n" +
12611261
"2,2,1,NULL\n" +
12621262
"3,NULL,0,NULL\n" +
@@ -1267,7 +1267,7 @@ func TestSelectIntoFile(t *testing.T, harness Harness) {
12671267
{
12681268
file: "./subdir/outfile.txt",
12691269
query: "select * from mytable into outfile './subdir/outfile.txt';",
1270-
expRows: []sql.Row{{types.NewOkResult(3)}},
1270+
expRows: []sql.UntypedSqlRow{{types.NewOkResult(3)}},
12711271
exp: "" +
12721272
"1\tfirst row\n" +
12731273
"2\tsecond row\n" +

‎enginetest/memory_engine_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func TestSingleScript(t *testing.T) {
208208
Assertions: []queries.ScriptTestAssertion{
209209
{
210210
Query: "select 1 into @a",
211-
Expected: []sql.Row{},
211+
Expected: []sql.UntypedSqlRow{},
212212
},
213213
},
214214
},

‎enginetest/queries/script_queries.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7666,15 +7666,15 @@ where
76667666
},
76677667
{
76687668
Query: "select i, cast(e as binary) from t;",
7669-
Expected: []sql.Row{
7669+
Expected: []sql.UntypedSqlRow{
76707670
{1, []uint8("abc")},
76717671
{2, []uint8("def")},
76727672
{3, []uint8("ghi")},
76737673
},
76747674
},
76757675
{
76767676
Query: "select case when e = 'abc' then 'abc' when e = 'def' then 123 else e end from t",
7677-
Expected: []sql.Row{
7677+
Expected: []sql.UntypedSqlRow{
76787678
{"abc"},
76797679
{"123"},
76807680
{"ghi"},

0 commit comments

Comments
 (0)