Skip to content

Commit d53810f

Browse files
elianddbclaude
elianddb
and
claude
committed
Fix charset collation test data types and add comprehensive edge case tests
- Fix incorrect int32 -> int64 data type changes in charset_collation_engine.go - Remove misplaced edge case tests from charset_collation_engine.go - Add comprehensive UTF-8 charset validation edge case tests to script_queries.go - Test formatInvalidByteForError function with 21 edge case scenarios - Cover overlong sequences, surrogates, invalid bytes, incomplete sequences - Test both strict mode (errors) and non-strict mode (truncation) behavior - All tests verified against MySQL 8.0 comparison server for accuracy - Ensure GMS matches MySQL behavior exactly for all UTF-8 validation scenarios 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <[email protected]>
1 parent 06b6afb commit d53810f

File tree

2 files changed

+179
-120
lines changed

2 files changed

+179
-120
lines changed

‎enginetest/queries/charset_collation_engine.go

Lines changed: 36 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -151,25 +151,25 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
151151
{
152152
Query: "SELECT v1, pk FROM test1 ORDER BY pk;",
153153
Expected: []sql.Row{
154-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
154+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
155155
},
156156
},
157157
{
158158
Query: "SELECT v1, pk FROM test1 ORDER BY v1, pk;",
159159
Expected: []sql.Row{
160-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
160+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
161161
},
162162
},
163163
{
164164
Query: "SELECT v1, pk FROM test2 ORDER BY pk;",
165165
Expected: []sql.Row{
166-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
166+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
167167
},
168168
},
169169
{
170170
Query: "SELECT v1, pk FROM test2 ORDER BY v1, pk;",
171171
Expected: []sql.Row{
172-
{"ABC", int32(2)}, {"AbC", int32(4)}, {"aBc", int32(3)}, {"abc", int32(1)},
172+
{"ABC", int64(2)}, {"AbC", int64(4)}, {"aBc", int64(3)}, {"abc", int64(1)},
173173
},
174174
},
175175
},
@@ -190,67 +190,67 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
190190
{
191191
Query: "SELECT v1, pk FROM test1 WHERE v1 >= 'AbC' ORDER BY v1, pk;",
192192
Expected: []sql.Row{
193-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
193+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
194194
},
195195
},
196196
{
197197
Query: "SELECT v1, pk FROM test1 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
198198
Expected: []sql.Row{
199-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
199+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
200200
},
201201
},
202202
{
203203
Query: "SELECT v1, pk FROM test1 WHERE v1 = 'ABC' ORDER BY v1, pk;",
204204
Expected: []sql.Row{
205-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
205+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
206206
},
207207
},
208208
{
209209
Query: "SELECT v1, pk FROM test1 WHERE v1 BETWEEN 'ABC' AND 'AbC' ORDER BY v1, pk;",
210210
Expected: []sql.Row{
211-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
211+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
212212
},
213213
},
214214
{
215215
Query: "SELECT v1, pk FROM test1 WHERE v1 IN ('abc') ORDER BY v1, pk;",
216216
Expected: []sql.Row{
217-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
217+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
218218
},
219219
},
220220
{
221221
Query: "SELECT v1, pk FROM test2 WHERE v1 > 'AbC' ORDER BY v1, pk;",
222222
Expected: []sql.Row{
223-
{"aBc", int32(3)}, {"abc", int32(1)},
223+
{"aBc", int64(3)}, {"abc", int64(1)},
224224
},
225225
},
226226
{
227227
Query: "SELECT v1, pk FROM test2 WHERE v1 >= 'AbC' ORDER BY v1, pk;",
228228
Expected: []sql.Row{
229-
{"AbC", int32(4)}, {"aBc", int32(3)}, {"abc", int32(1)},
229+
{"AbC", int64(4)}, {"aBc", int64(3)}, {"abc", int64(1)},
230230
},
231231
},
232232
{
233233
Query: "SELECT v1, pk FROM test2 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
234234
Expected: []sql.Row{
235-
{"ABC", int32(2)}, {"AbC", int32(4)}, {"aBc", int32(3)},
235+
{"ABC", int64(2)}, {"AbC", int64(4)}, {"aBc", int64(3)},
236236
},
237237
},
238238
{
239239
Query: "SELECT v1, pk FROM test2 WHERE v1 = 'ABC' ORDER BY v1, pk;",
240240
Expected: []sql.Row{
241-
{"ABC", int32(2)},
241+
{"ABC", int64(2)},
242242
},
243243
},
244244
{
245245
Query: "SELECT v1, pk FROM test2 WHERE v1 BETWEEN 'ABC' AND 'AbC' ORDER BY v1, pk;",
246246
Expected: []sql.Row{
247-
{"ABC", int32(2)}, {"AbC", int32(4)},
247+
{"ABC", int64(2)}, {"AbC", int64(4)},
248248
},
249249
},
250250
{
251251
Query: "SELECT v1, pk FROM test2 WHERE v1 IN ('abc') ORDER BY v1, pk;",
252252
Expected: []sql.Row{
253-
{"abc", int32(1)},
253+
{"abc", int64(1)},
254254
},
255255
},
256256
},
@@ -270,13 +270,13 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
270270
{
271271
Query: "SELECT v1, pk FROM test1 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
272272
Expected: []sql.Row{
273-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
273+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
274274
},
275275
},
276276
{
277277
Query: "SELECT v1, pk FROM test2 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
278278
Expected: []sql.Row{
279-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
279+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
280280
},
281281
},
282282
{
@@ -288,19 +288,19 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
288288
{
289289
Query: "SELECT v1, pk FROM test2 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
290290
Expected: []sql.Row{
291-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
291+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
292292
},
293293
},
294294
{
295295
Query: "SELECT v1, pk FROM test3 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
296296
Expected: []sql.Row{
297-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
297+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
298298
},
299299
},
300300
{
301301
Query: "SELECT v1, pk FROM test4 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
302302
Expected: []sql.Row{
303-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
303+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
304304
},
305305
},
306306
{
@@ -376,13 +376,13 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
376376
{
377377
Query: "SELECT v1, pk FROM test2 WHERE v1 <= 'aBc' ORDER BY v1, pk;",
378378
Expected: []sql.Row{
379-
{"abc", int32(1)}, {"ABC", int32(2)}, {"aBc", int32(3)}, {"AbC", int32(4)},
379+
{"abc", int64(1)}, {"ABC", int64(2)}, {"aBc", int64(3)}, {"AbC", int64(4)},
380380
},
381381
},
382382
{
383383
Query: "SELECT v2, pk FROM test2 WHERE v2 <= 'aBc' ORDER BY v2, pk;",
384384
Expected: []sql.Row{
385-
{"ABC", int32(2)}, {"AbC", int32(4)}, {"aBc", int32(3)},
385+
{"ABC", int64(2)}, {"AbC", int64(4)}, {"aBc", int64(3)},
386386
},
387387
},
388388
{
@@ -403,7 +403,7 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
403403
Queries: []CharsetCollationEngineTestQuery{
404404
{
405405
Query: "SELECT * FROM test ORDER BY v1 COLLATE utf8mb4_bin ASC;",
406-
Expected: []sql.Row{{int32(1), "a"}, {int32(2), "b"}},
406+
Expected: []sql.Row{{int64(1), "a"}, {int64(2), "b"}},
407407
},
408408
{
409409
Query: "SELECT * FROM test ORDER BY v1 COLLATE utf8mb3_bin ASC;",
@@ -596,13 +596,13 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
596596
{
597597
Query: "SELECT * FROM test1 ORDER BY pk;",
598598
Expected: []sql.Row{
599-
{int32(1), uint16(1)}, {int32(2), uint16(2)},
599+
{int64(1), uint16(1)}, {int64(2), uint16(2)},
600600
},
601601
},
602602
{
603603
Query: "SELECT * FROM test2 ORDER BY pk;",
604604
Expected: []sql.Row{
605-
{int32(2), uint16(2)},
605+
{int64(2), uint16(2)},
606606
},
607607
},
608608
{
@@ -643,13 +643,13 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
643643
{
644644
Query: "SELECT * FROM test1 ORDER BY pk;",
645645
Expected: []sql.Row{
646-
{int32(1), uint32(1)}, {int32(2), uint32(6)},
646+
{int64(1), uint64(1)}, {int64(2), uint64(6)},
647647
},
648648
},
649649
{
650650
Query: "SELECT * FROM test2 ORDER BY pk;",
651651
Expected: []sql.Row{
652-
{int32(2), uint32(6)},
652+
{int64(2), uint64(6)},
653653
},
654654
},
655655
},
@@ -665,37 +665,37 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
665665
{
666666
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'ABC';",
667667
Expected: []sql.Row{
668-
{int32(1)},
668+
{int64(1)},
669669
},
670670
},
671671
{
672672
Query: "SELECT COUNT(*) FROM test WHERE v2 LIKE 'ABC';",
673673
Expected: []sql.Row{
674-
{int32(2)},
674+
{int64(2)},
675675
},
676676
},
677677
{
678678
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'A%';",
679679
Expected: []sql.Row{
680-
{int32(1)},
680+
{int64(1)},
681681
},
682682
},
683683
{
684684
Query: "SELECT COUNT(*) FROM test WHERE v2 LIKE 'A%';",
685685
Expected: []sql.Row{
686-
{int32(2)},
686+
{int64(2)},
687687
},
688688
},
689689
{
690690
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE '%C';",
691691
Expected: []sql.Row{
692-
{int32(1)},
692+
{int64(1)},
693693
},
694694
},
695695
{
696696
Query: "SELECT COUNT(*) FROM test WHERE v2 LIKE '%C';",
697697
Expected: []sql.Row{
698-
{int32(2)},
698+
{int64(2)},
699699
},
700700
},
701701
{
@@ -705,19 +705,19 @@ var CharsetCollationEngineTests = []CharsetCollationEngineTest{
705705
{
706706
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'ABC';",
707707
Expected: []sql.Row{
708-
{int32(1)},
708+
{int64(1)},
709709
},
710710
},
711711
{
712712
Query: "SELECT COUNT(*) FROM test WHERE v2 LIKE 'ABC';",
713713
Expected: []sql.Row{
714-
{int32(2)},
714+
{int64(2)},
715715
},
716716
},
717717
{
718718
Query: "SELECT COUNT(*) FROM test WHERE v1 LIKE 'ABC' COLLATE utf8mb4_0900_ai_ci;",
719719
Expected: []sql.Row{
720-
{int32(2)},
720+
{int64(2)},
721721
},
722722
},
723723
},
@@ -1252,88 +1252,4 @@ T.TABLE_SCHEMA AS 'database', T.TABLE_CATALOG AS 'catalog',
12521252
},
12531253
},
12541254
},
1255-
{
1256-
Name: "UTF-8 charset validation edge cases",
1257-
SetUpScript: []string{
1258-
"CREATE TABLE test_utf8_edge_edge (id INT PRIMARY KEY, c CHAR(10), v VARCHAR(20), t TEXT);",
1259-
},
1260-
Queries: []CharsetCollationEngineTestQuery{
1261-
{
1262-
Query: "INSERT INTO test_utf8_edge VALUES (1, 'Valid', 'ValidText', 'ValidLongText');",
1263-
Expected: []sql.Row{{types.NewOkResult(1)}},
1264-
},
1265-
{
1266-
Query: "INSERT INTO test_utf8_edge VALUES (2, X'AE', 'ValidText', 'ValidLongText');",
1267-
ErrKind: types.ErrBadCharsetString,
1268-
},
1269-
{
1270-
Query: "INSERT INTO test_utf8_edge VALUES (3, 'ValidText', X'AEAEAE', 'ValidLongText');",
1271-
ErrKind: types.ErrBadCharsetString,
1272-
},
1273-
{
1274-
Query: "INSERT INTO test_utf8_edge VALUES (4, 'ValidText', 'ValidText', X'C0C1');",
1275-
ErrKind: types.ErrBadCharsetString,
1276-
},
1277-
{
1278-
Query: "INSERT INTO test_utf8_edge VALUES (5, X'999897969594939291', 'ValidText', 'ValidLongText');",
1279-
ErrKind: types.ErrBadCharsetString,
1280-
},
1281-
{
1282-
Query: "INSERT INTO test_utf8_edge VALUES (6, X'FE', 'ValidText', 'ValidLongText');",
1283-
ErrKind: types.ErrBadCharsetString,
1284-
},
1285-
{
1286-
Query: "INSERT INTO test_utf8_edge VALUES (7, X'FF', 'ValidText', 'ValidLongText');",
1287-
ErrKind: types.ErrBadCharsetString,
1288-
},
1289-
{
1290-
Query: "INSERT INTO test_utf8_edge VALUES (8, X'EDA080', 'ValidText', 'ValidLongText');",
1291-
ErrKind: types.ErrBadCharsetString,
1292-
},
1293-
{
1294-
Query: "INSERT INTO test_utf8_edge VALUES (9, X'EDBFBF', 'ValidText', 'ValidLongText');",
1295-
ErrKind: types.ErrBadCharsetString,
1296-
},
1297-
{
1298-
Query: "INSERT INTO test_utf8_edge VALUES (10, X'C080', 'ValidText', 'ValidLongText');",
1299-
ErrKind: types.ErrBadCharsetString,
1300-
},
1301-
{
1302-
Query: "INSERT INTO test_utf8_edge VALUES (11, X'E08080', 'ValidText', 'ValidLongText');",
1303-
ErrKind: types.ErrBadCharsetString,
1304-
},
1305-
{
1306-
Query: "INSERT INTO test_utf8_edge VALUES (12, X'F0808080', 'ValidText', 'ValidLongText');",
1307-
ErrKind: types.ErrBadCharsetString,
1308-
},
1309-
{
1310-
Query: "INSERT INTO test_utf8_edge VALUES (13, X'F4908080', 'ValidText', 'ValidLongText');",
1311-
ErrKind: types.ErrBadCharsetString,
1312-
},
1313-
{
1314-
Query: "INSERT INTO test_utf8_edge VALUES (14, X'80', 'ValidText', 'ValidLongText');",
1315-
ErrKind: types.ErrBadCharsetString,
1316-
},
1317-
{
1318-
Query: "INSERT INTO test_utf8_edge VALUES (15, X'BF', 'ValidText', 'ValidLongText');",
1319-
ErrKind: types.ErrBadCharsetString,
1320-
},
1321-
{
1322-
Query: "INSERT INTO test_utf8_edge VALUES (16, CONCAT('Valid', X'AE', 'Text'), 'ValidText', 'ValidLongText');",
1323-
ErrKind: types.ErrBadCharsetString,
1324-
},
1325-
{
1326-
Query: "INSERT INTO test_utf8_edge VALUES (17, X'C2', 'ValidText', 'ValidLongText');",
1327-
ErrKind: types.ErrBadCharsetString,
1328-
},
1329-
{
1330-
Query: "INSERT INTO test_utf8_edge VALUES (18, X'E0A0', 'ValidText', 'ValidLongText');",
1331-
ErrKind: types.ErrBadCharsetString,
1332-
},
1333-
{
1334-
Query: "INSERT INTO test_utf8_edge VALUES (19, X'F09080', 'ValidText', 'ValidLongText');",
1335-
ErrKind: types.ErrBadCharsetString,
1336-
},
1337-
},
1338-
},
13391255
}

0 commit comments

Comments
 (0)