Skip to content

Commit 2768dfc

Browse files
committed
Use an OR clause to select either utf8 or utf8mb3, and treat the result
appropriately.
1 parent f2b50f5 commit 2768dfc

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

integration-tests/source/mysql/test/integration.d

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -967,13 +967,15 @@ unittest
967967
mixin(scopedCn);
968968
auto stmt = cn.prepare(
969969
"SELECT * FROM information_schema.character_sets"~
970-
" WHERE CHARACTER_SET_NAME=?");
971-
auto val = "utf8";
972-
stmt.setArg(0, val);
970+
" WHERE CHARACTER_SET_NAME=? OR CHARACTER_SET_NAME=?");
971+
auto val1 = "utf8";
972+
auto val2 = "utf8mb3";
973+
stmt.setArg(0, val1);
974+
stmt.setArg(1, val2);
973975
auto row = cn.queryRow(stmt).get;
974976
assert(row.length == 4);
975-
assert(row[0] == "utf8");
976-
assert(row[1] == "utf8_general_ci");
977+
assert(row[0] == "utf8" || row[0] == "utf8mb3");
978+
assert(row[1] == "utf8_general_ci" || row[1] == "utf8mb3_general_ci");
977979
assert(row[2] == "UTF-8 Unicode");
978980
assert(row[3] == 3);
979981
}

0 commit comments

Comments
 (0)