svn commit: r822288 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/

[curtisr7]

Author: curtisr7
Date: Tue Oct  6 14:14:49 2009
New Revision: 822288

URL: http://svn.apache.org/viewvc?rev=822288&view=rev
Log:
OPENJPA-1224: backing out changes while investigating a test regression.

Modified:
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
    
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java?rev=822288&r1=822287&r2=822288&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/AbstractDB2Dictionary.java
 Tue Oct  6 14:14:49 2009
@@ -29,6 +29,7 @@
     public int varcharCastLength = 1000;
 
     public AbstractDB2Dictionary() {
+        numericTypeName = "DOUBLE";
         bitTypeName = "SMALLINT";
         smallintTypeName = "SMALLINT";
         tinyintTypeName = "SMALLINT";

Modified: 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=822288&r1=822287&r2=822288&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
 (original)
+++ 
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
 Tue Oct  6 14:14:49 2009
@@ -404,7 +404,7 @@
     public DBDictionary() {
         fixedSizeTypeNameSet.addAll(Arrays.asList(new String[]{
             "BIGINT", "BIT", "BLOB", "CLOB", "DATE", "DECIMAL", "DISTINCT",
-            "DOUBLE", "FLOAT", "INTEGER", "JAVA_OBJECT", "NULL", 
+            "DOUBLE", "FLOAT", "INTEGER", "JAVA_OBJECT", "NULL", "NUMERIC", 
             "OTHER", "REAL", "REF", "SMALLINT", "STRUCT", "TIME", "TIMESTAMP",
             "TINYINT",
         }));

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java?rev=822288&r1=822287&r2=822288&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/identity/TestSQLBigDecimalId.java
 Tue Oct  6 14:14:49 2009
@@ -24,6 +24,9 @@
 
 import junit.textui.TestRunner;
 
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.jdbc.sql.MySQLDictionary;
 import org.apache.openjpa.persistence.test.SingleEMFTestCase;
 
 /**
@@ -44,6 +47,18 @@
         e.setId(decimal);
         e.setData(1);
         
+        // trigger schema definition
+        JDBCConfiguration jdbccfg = (JDBCConfiguration) emf.getConfiguration();
+        DBDictionary dict = jdbccfg.getDBDictionaryInstance();
+        // currently BigDecimal is mapped to NUMERIC column type. This causes
+        // truncation error from MySQL. Without knowing the implication of 
changing the
+        // mapping of BigDecimal universally to DOUBLE, I will just change the 
mapping
+        // for this test case.
+        if (dict instanceof MySQLDictionary) {
+            dict.numericTypeName = "DOUBLE";
+        }
+
+        
         EntityManager em = emf.createEntityManager();
         em.getTransaction().begin();
         em.persist(e);
@@ -74,7 +89,6 @@
             (SQLBigDecimalIdEntity) em.createQuery("SELECT a FROM 
SQLBigDecimalIdEntity a WHERE a.data=" + data)
                 .getSingleResult();
         
-        // This would fail prior to OPENJPA-1224.
         assertEquals(e, e2);
         em.close();