openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgras...@apache.org
Subject svn commit: r1504985 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
Date Fri, 19 Jul 2013 19:58:36 GMT
Author: jgrassel
Date: Fri Jul 19 19:58:36 2013
New Revision: 1504985

URL: http://svn.apache.org/r1504985
Log:
OPENJPA-2400: MariaDB DBDictionaryFactory update

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=1504985&r1=1504984&r2=1504985&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
Fri Jul 19 19:58:36 2013
@@ -74,7 +74,7 @@ public class DBDictionaryFactory {
     public static DBDictionary calculateDBDictionary(JDBCConfiguration conf,
         String url, String driver, String props) {
         String dclass = dictionaryClassForString(getProtocol(url), conf);
-        if (dclass == null || (dclass != null && dclass.contains("MySQL")))
+        if (dclass == null)
             dclass = dictionaryClassForString(driver, conf);
         if (dclass == null)
             return null;

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java?rev=1504985&r1=1504984&r2=1504985&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/dynamicschema/TestDynamicSchemas.java
Fri Jul 19 19:58:36 2013
@@ -121,7 +121,7 @@ public class TestDynamicSchemas extends 
         OpenJPAEntityManagerFactorySPI mysqlEMF = 
             createEMF(EntityVeryLongNames.class, EntityReservedWords.class,
                 "openjpa.ConnectionURL", 
-                "jdbc:mysql://host1:1,host2:2/database?p1=v1&p2=v2",
+                "jdbc:mariadb://host1:1,host2:2/database?p1=v1&p2=v2",
                 "openjpa.jdbc.SynchronizeMappings", "export", 
                 "openjpa.jdbc.SchemaFactory", "dynamic", RETAIN_DATA);
         validateTableName( mysqlEMF );



Mime
View raw message