openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fa...@apache.org
Subject svn commit: r899528 - in /openjpa/trunk: openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xm...
Date Fri, 15 Jan 2010 05:12:45 GMT
Author: fancy
Date: Fri Jan 15 05:12:44 2010
New Revision: 899528

URL: http://svn.apache.org/viewvc?rev=899528&view=rev
Log:
OPENJPA-1461: Incorrect Oracle CREATE TABLE DDL for XML column

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
    openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java?rev=899528&r1=899527&r2=899528&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/OracleDictionary.java
Fri Jan 15 05:12:44 2010
@@ -897,7 +897,7 @@
     @Override
     public int getJDBCType(int metaTypeCode, boolean lob, int precis, 
         int scale, boolean xml) {        
-        return getJDBCType(metaTypeCode, lob && !xml, precis, scale);        
+        return getJDBCType(metaTypeCode, lob || xml, precis, scale);        
     }
 
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java?rev=899528&r1=899527&r2=899528&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/kernel/TestUpdateWithSubSelect.java
Fri Jan 15 05:12:44 2010
@@ -64,7 +64,8 @@
         assertEquals(1,sql.size());
         String sqlString = sql.get(0).toUpperCase().trim();
         assertTrue(sqlString.startsWith("UPDATE"));
-        assertTrue(sqlString.indexOf("JOIN") != -1);
+        // assert JOIN condition
+        assertTrue(sqlString.indexOf("T0.ADDRESS_ID = T1.ID") != -1);
     }
 
 }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java?rev=899528&r1=899527&r2=899528&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
(original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/xmlmapping/query/TestXMLCustomerOrder.java
Fri Jan 15 05:12:44 2010
@@ -63,7 +63,7 @@
 
     public void setUp() {
         setUp(Customer.class, Customer.CustomerKey.class, Order.class,
-            EAddress.class, CLEAR_TABLES);
+            EAddress.class, DROP_TABLES);  // test create table DDL for XML column
 
         // skip test if dictionary has no support for XML column type
         setTestsDisabled(!dictionarySupportsXMLColumn());



Mime
View raw message