fixing cdm database detection for h2 databases
authorAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Thu, 10 Mar 2016 21:09:36 +0000 (22:09 +0100)
committerAndreas Kohlbecker <a.kohlbecker@bgbm.org>
Thu, 10 Mar 2016 21:09:36 +0000 (22:09 +0100)
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java

index a44bcf605a5ac5506f3f463c9f2f8541902b9393..0d6b8c793148f3619675cb3332599f868f34cd1c 100644 (file)
@@ -163,7 +163,11 @@ public class DataSourceConfigurer extends AbstractWebApplicationConfigurer {
         try {\r
 \r
             Connection connection = dataSource.getConnection();\r
-            ResultSet tables = connection.getMetaData().getTables(connection.getCatalog(), null, "CdmMetaData", null);\r
+            String metadataTableName = "CdmMetaData";\r
+            if(inferHibernateDialectName(dataSource).equals(H2CorrectedDialect.class.getName())){\r
+                metadataTableName = metadataTableName.toUpperCase();\r
+            }\r
+            ResultSet tables = connection.getMetaData().getTables(connection.getCatalog(), null, metadataTableName, null);\r
             if(tables.first()){\r
                 ResultSet resultSet = connection.createStatement().executeQuery(MetaDataPropertyName.DB_SCHEMA_VERSION.getSqlQuery());\r
                 String version = null;\r