svn commit: r487388 - /incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java

[mriou]

Author: mriou
Date: Thu Dec 14 15:33:33 2006
New Revision: 487388

URL: http://svn.apache.org/viewvc?view=rev&rev=487388
Log:
Passing a dialect to the store as some drivers don't support dialect detection.

Modified:
    
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java

Modified: 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?view=diff&rev=487388&r1=487387&r2=487388
==============================================================================
--- 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 (original)
+++ 
incubator/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 Thu Dec 14 15:33:33 2006
@@ -1,15 +1,5 @@
 package org.apache.ode.store.hib;
 
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.sql.DataSource;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.ode.bpel.iapi.BpelEngineException;
@@ -25,6 +15,15 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.dialect.DialectFactory;
 
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class DbConfStoreConnectionFactory implements 
ConfStoreConnectionFactory {
     private static final Log __log = 
LogFactory.getLog(DbConfStoreConnectionFactory.class);
 
@@ -60,7 +59,7 @@
 
     final SessionFactory _sessionFactory;
 
-    public DbConfStoreConnectionFactory(DataSource ds, boolean auto) {
+    public DbConfStoreConnectionFactory(DataSource ds, boolean auto, String 
dbname) {
         _ds = ds;
 
         Properties properties = new Properties();
@@ -69,13 +68,17 @@
         _dataSources.put(_guid, ds);
         properties.put("guid", _guid);
         properties.put(Environment.CONNECTION_PROVIDER, 
DataSourceConnectionProvider.class.getName());
-        
-        try {
-            properties.put(Environment.DIALECT, guessDialect(_ds));
-        } catch (Exception ex) {
-            String errmsg = __msgs.msgOdeInitHibernateDialectDetectFailed();
-            __log.error(errmsg, ex);
-            throw new BpelEngineException(errmsg, ex);
+
+        if (dbname != null) {
+            properties.put(Environment.DIALECT, dbname);
+        } else {
+            try {
+                properties.put(Environment.DIALECT, guessDialect(_ds));
+            } catch (Exception ex) {
+                String errmsg = 
__msgs.msgOdeInitHibernateDialectDetectFailed();
+                __log.error(errmsg, ex);
+                throw new BpelEngineException(errmsg, ex);
+            }
         }
         
         if (auto) {