TRUNK-6028 ConceptServiceTest pass on mysql

pwargulak · Oct 8, 2022 · 1789dc1 · 1789dc1
1 parent ef2229b
commit 1789dc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/src/test/java/org/openmrs/test/DbUtil.java b/api/src/test/java/org/openmrs/test/DbUtil.java
@@ -88,7 +88,7 @@ private static void createDatabase() {
 		System.setProperty("databaseDriver", isMySql ? "com.mysql.cj.jdbc.Driver" : "org.postgresql.Driver");
 		System.setProperty("databaseDialect", isMySql ? MySQLDialect.class.getName() : PostgreSQL82Dialect.class.getName());
 
-		String sql = String.format(isMySql ? "create database if not exists %s default character set utf8"
+		String sql = String.format(isMySql ? "create database if not exists %s default character set utf8 collate utf8_bin"
 		        : "create database %s encoding utf8", databaseName);
 		createDatabase(username, password, sql, url.replace(databaseName, ""));
 

diff --git a/api/src/test/resources/org/openmrs/include/standardTestDataset.xml b/api/src/test/resources/org/openmrs/include/standardTestDataset.xml
@@ -69,7 +69,7 @@
   <concept concept_id="24" retired="true" datatype_id="1" class_id="1" is_set="false" creator="1" date_created="2004-08-12 00:00:00.0" version="" uuid="11716f9c-1434-4f8d-b9fc-9aa14c4d6129"/>
   <concept concept_id="25" retired="false" datatype_id="4" class_id="10" is_set="true" creator="1" date_created="2008-08-18 12:38:58.0" version="" uuid="c9386d70-d9c5-11e3-9c1a-0800200c9a66"/>
   <concept concept_id="26" retired="false" datatype_id="4" class_id="10" is_set="true" creator="1" date_created="2008-08-18 12:38:58.0" version="" uuid="d198bec0-d9c5-11e3-9c1a-0800200c9a66"/>
-  <concept concept_id="27" retired="false" datatype_id="4" class_id="10" is_set="true" creator="1" date_created="2008-08-18 12:38:58.1" version="" uuid="54d29840-d9e6-11e3-9c1a-0800200c9a66"/>
+  <concept concept_id="27" retired="false" datatype_id="4" class_id="10" is_set="true" creator="1" date_created="2008-08-18 12:38:59.0" version="" uuid="54d29840-d9e6-11e3-9c1a-0800200c9a66"/>
   <concept concept_id="28" retired="false" datatype_id="3" class_id="20" is_set="false" creator="1" date_created="2004-08-12 00:00:00.0" version="" uuid="7bfdcbf0-d9e7-11e3-9c1a-0800200c9a66"/>
   <concept concept_id="29" retired="false" datatype_id="4" class_id="11" is_set="1" creator="1" date_created="2004-08-12 00:00:00.0" uuid="5e02d1a0-7869-11e4-981f-0800200c9a73"/>
   <concept concept_id="30" retired="false" datatype_id="4" class_id="11" is_set="1" creator="1" date_created="2004-08-12 00:00:00.0" uuid="6e02d1a0-7869-11e4-981f-0800200c9a89"/>