(no commit message)

diff --git a/.gitattributes b/.gitattributes
index dd18fd2a7ea2733f2539c6df3468f06ec05a972e..a43d5f1e6226dc195cf2e03b5fa7770b70df65cb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1025,6 +1025,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IRef
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/fetch/CdmFetch.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmHibernateInterceptor.java -text
+cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java -text
+cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5InnoDBUtf8Dialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/H2DatabaseType.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/H2DatabaseType.java
index 824d920d46235c3e47655c3ddf9f10fca6496aea..f843ff19afea674913d1f68529bf400d75432915 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/H2DatabaseType.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/H2DatabaseType.java
@@ -44,7 +44,7 @@ public class H2DatabaseType extends DatabaseTypeBase {
     private int defaultPort = 9092;\r
     \r
     //hibernate dialect\r
-    private String hibernateDialect = "H2Dialect";\r
+    private String hibernateDialect = "H2CorrectedDialect";\r
     \r
     //init method\r
     private String initMethod = "init";\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
index 7853345a2c9fea013c120ecddf564207e012e897..b6536c7e7c1ee67ba71daf4a7ca59723448c6fdc 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
@@ -34,7 +34,7 @@ public class HSqlDbDatabaseType extends DatabaseTypeBase {
     private int defaultPort = 9001;\r
     \r
     //hibernate dialect\r
-    private String hibernateDialect = "HSQLDialect";\r
+    private String hibernateDialect = "HSQLCorrectDialect";\r
     \r
     //init method\r
     private String initMethod = "init";\r

diff --git a/cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java b/cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java
new file mode 100644 (file)
index 0000000..7c15df7
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java
@@ -0,0 +1,34 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
+package org.hibernate.dialect;\r
+\r
+import java.sql.Types;\r
+\r
+import org.hibernate.dialect.H2Dialect;\r
+\r
+/**\r
+ *  Extends H2Dialect and registers Types.BIT for boolean and Types.FLOAT as double.\r
+ *  This is a work around for a known bug in the H2Dialect\r
+ *  \r
+ *  @see http://opensource.atlassian.com/projects/hibernate/browse/HHH-1598\r
+ *     @author a.mueller\r
+ */\r
+public class H2CorrectedDialect extends H2Dialect {\r
+\r
+        public H2CorrectedDialect() {\r
+               super();\r
+               registerColumnType(Types.BIT, "boolean");\r
+               registerColumnType(Types.FLOAT, "double");\r
+               \r
+               \r
+        }\r
+\r
+    \r
+}
\ No newline at end of file

diff --git a/cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java b/cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java
new file mode 100644 (file)
index 0000000..ce52a7f
--- /dev/null
+++ b/cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java
@@ -0,0 +1,32 @@
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
+package org.hibernate.dialect;\r
+\r
+import java.sql.Types;\r
+\r
+/**\r
+ *  Extends H2Dialect and registers Types.BIT for boolean and Types.FLOAT as double.\r
+ *  This is a work around for a known bug in the H2Dialect\r
+ *  \r
+ *  @see http://opensource.atlassian.com/projects/hibernate/browse/HHH-1598\r
+ *     @author a.mueller\r
+ */\r
+public class HSQLCorrectedDialect extends HSQLDialect {\r
+\r
+        public HSQLCorrectedDialect() {\r
+               super();\r
+               registerColumnType(Types.BIT, "boolean");\r
+               registerColumnType(Types.FLOAT, "double");\r
+               \r
+               \r
+        }\r
+\r
+    \r
+}
\ No newline at end of file