@@ -2364,7 +2364,7 @@ void connectionmetadata::getSchemaCharset()
2364
2364
2365
2365
stmt.reset (con->createStatement ());
2366
2366
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" );
2368
2368
2369
2369
/* SchemaCharset */
2370
2370
res.reset (dbmeta->getSchemaCharset (con->getCatalog (), " charsetTestDatabase" ));
@@ -2376,7 +2376,7 @@ void connectionmetadata::getSchemaCharset()
2376
2376
ASSERT_EQUALS (" SCHEMA_CHARSET" , resmeta->getColumnLabel (3 ));
2377
2377
2378
2378
ASSERT (res->getString (" SCHEMA_NAME" ).caseCompare (" charsetTestDatabase" ) == 0 );
2379
- ASSERT_EQUALS (" utf8 " , res->getString (" SCHEMA_CHARSET" ));
2379
+ ASSERT_EQUALS (" utf8mb3 " , res->getString (" SCHEMA_CHARSET" ));
2380
2380
2381
2381
stmt->execute (" DROP DATABASE IF EXISTS charsetTestDatabase" );
2382
2382
}
@@ -2447,11 +2447,11 @@ void connectionmetadata::getTableCharset()
2447
2447
2448
2448
stmt.reset (con->createStatement ());
2449
2449
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" );
2451
2451
stmt->execute (" DROP TABLE IF EXISTS charsetTestDatabase.charsetTestTable" );
2452
2452
stmt->execute (" CREATE TABLE charsetTestDatabase.charsetTestTable(id INT) CHARACTER SET latin1 COLLATE latin1_general_ci" );
2453
2453
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" );
2455
2455
2456
2456
/* TableCharset */
2457
2457
res.reset (dbmeta->getTableCharset (con->getCatalog (), " charsetTestDatabase" , " %charsetTestTable%" ));
@@ -2470,7 +2470,7 @@ void connectionmetadata::getTableCharset()
2470
2470
ASSERT (res->next ());
2471
2471
ASSERT (res->getString (" TABLE_SCHEMA" ).caseCompare (" charsetTestDatabase" ) == 0 );
2472
2472
ASSERT (res->getString (" TABLE_NAME" ).caseCompare (" charsetTestTableAnother" ) == 0 );
2473
- ASSERT_EQUALS (" utf8 " , res->getString (" TABLE_CHARSET" ));
2473
+ ASSERT_EQUALS (" utf8mb3 " , res->getString (" TABLE_CHARSET" ));
2474
2474
2475
2475
stmt->execute (" DROP DATABASE IF EXISTS charsetTestDatabase" );
2476
2476
}
0 commit comments