Make InnoDB the default MySQL database system for CDM #3371

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/MySQLDatabaseType.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/MySQLDatabaseType.java
index 20f351163ea7763cd9af792b8dcabe92a5e7de35..a8c92ecd6b478878b9e7afd1b56f5374dba8764f 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/MySQLDatabaseType.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/MySQLDatabaseType.java
@@ -9,6 +9,7 @@
 \r
 package eu.etaxonomy.cdm.database.types;\r
 \r
+import org.hibernate.dialect.MySQL5InnoDBUtf8Dialect;\r
 import org.hibernate.dialect.MySQL5MyISAMUtf8Dialect;\r
 \r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
@@ -37,8 +38,8 @@ public class MySQLDatabaseType extends DatabaseTypeBase {
     //hibernate dialect\r
     // TODO switch to MySQLInnoDBUtf8Dialect !!\r
     // see #3371 (switch cdm to MySQL InnoDB)\r
-    //private String hibernateDialect = MySQLInnoDBUtf8Dialect.class.getSimpleName();\r
-    private final String hibernateDialect = MySQL5MyISAMUtf8Dialect.class.getSimpleName();\r
+     private String hibernateDialect = MySQL5InnoDBUtf8Dialect.class.getSimpleName();\r
+//    private final String hibernateDialect = MySQL5MyISAMUtf8Dialect.class.getSimpleName();\r
 \r
     //connection String\r
        @Override\r

diff --git a/cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java b/cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java
index 2206f803cd4f1cc74db88eaf09cfac281e0854d6..715655d052fa9f58ffa2b6d889aaebabd0b7eaf0 100644 (file)
--- a/cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java
+++ b/cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java
@@ -26,15 +26,17 @@ public class MySQL5MyISAMUtf8Dialect extends MySQL5Dialect {
                registerColumnType(Types.BOOLEAN, "bit");\r
        }\r
        \r
-    public String getTableTypeString() {\r
+    /* (non-Javadoc)\r
+     * @see org.hibernate.dialect.Dialect#getTableTypeString()\r
+     */\r
+    @Override\r
+       public String getTableTypeString() {\r
         return " ENGINE=MYISAM DEFAULT CHARSET=utf8";\r
     }\r
     \r
     \r
        // compare org.hibernate.dialect.MySQLMyISAMDialect\r
-    /* (non-Javadoc)\r
-        * @see org.hibernate.dialect.Dialect#dropConstraints()\r
-        */\r
+    @Override\r
        public boolean dropConstraints() {\r
                return false;\r
        }\r