Skip to content

Commit d78c27c

Browse files
committed
Fix UT for 8.0.29
On 8.0.29, server reports utf8mb3 when creating table using utf8. Change-Id: Ifaea83690ef7dda5270e336c9581d66bd221af85
1 parent b9b9e0e commit d78c27c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

test/unit/classes/connectionmetadata.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,7 +2364,7 @@ void connectionmetadata::getSchemaCharset()
23642364

23652365
stmt.reset(con->createStatement());
23662366
stmt->execute("DROP DATABASE IF EXISTS charsetTestDatabase");
2367-
stmt->execute("CREATE DATABASE charsetTestDatabase CHARACTER SET utf8 COLLATE utf8_bin");
2367+
stmt->execute("CREATE DATABASE charsetTestDatabase CHARACTER SET utf8mb3 COLLATE utf8_bin");
23682368

23692369
/* SchemaCharset */
23702370
res.reset(dbmeta->getSchemaCharset(con->getCatalog(), "charsetTestDatabase"));
@@ -2376,7 +2376,7 @@ void connectionmetadata::getSchemaCharset()
23762376
ASSERT_EQUALS("SCHEMA_CHARSET", resmeta->getColumnLabel(3));
23772377

23782378
ASSERT(res->getString("SCHEMA_NAME").caseCompare("charsetTestDatabase") == 0);
2379-
ASSERT_EQUALS("utf8", res->getString("SCHEMA_CHARSET"));
2379+
ASSERT_EQUALS("utf8mb3", res->getString("SCHEMA_CHARSET"));
23802380

23812381
stmt->execute("DROP DATABASE IF EXISTS charsetTestDatabase");
23822382
}
@@ -2447,11 +2447,11 @@ void connectionmetadata::getTableCharset()
24472447

24482448
stmt.reset(con->createStatement());
24492449
stmt->execute("DROP DATABASE IF EXISTS charsetTestDatabase");
2450-
stmt->execute("CREATE DATABASE charsetTestDatabase CHARACTER SET utf8 COLLATE utf8_bin");
2450+
stmt->execute("CREATE DATABASE charsetTestDatabase CHARACTER SET utf8mb3 COLLATE utf8_bin");
24512451
stmt->execute("DROP TABLE IF EXISTS charsetTestDatabase.charsetTestTable");
24522452
stmt->execute("CREATE TABLE charsetTestDatabase.charsetTestTable(id INT) CHARACTER SET latin1 COLLATE latin1_general_ci");
24532453
stmt->execute("DROP TABLE IF EXISTS charsetTestDatabase.charsetTestTableAnother");
2454-
stmt->execute("CREATE TABLE charsetTestDatabase.charsetTestTableAnother(id INT) CHARACTER SET utf8 COLLATE utf8_bin");
2454+
stmt->execute("CREATE TABLE charsetTestDatabase.charsetTestTableAnother(id INT) CHARACTER SET utf8mb3 COLLATE utf8_bin");
24552455

24562456
/* TableCharset */
24572457
res.reset(dbmeta->getTableCharset(con->getCatalog(), "charsetTestDatabase", "%charsetTestTable%"));
@@ -2470,7 +2470,7 @@ void connectionmetadata::getTableCharset()
24702470
ASSERT(res->next());
24712471
ASSERT(res->getString("TABLE_SCHEMA").caseCompare("charsetTestDatabase") == 0);
24722472
ASSERT(res->getString("TABLE_NAME").caseCompare("charsetTestTableAnother") == 0);
2473-
ASSERT_EQUALS("utf8", res->getString("TABLE_CHARSET"));
2473+
ASSERT_EQUALS("utf8mb3", res->getString("TABLE_CHARSET"));
24742474

24752475
stmt->execute("DROP DATABASE IF EXISTS charsetTestDatabase");
24762476
}

0 commit comments

Comments
 (0)