cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1577859 - /cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/
Date Sat, 15 Mar 2014 13:17:42 GMT
Author: aadamchik
Date: Sat Mar 15 13:17:41 2014
New Revision: 1577859

URL: http://svn.apache.org/r1577859
Log:
CAY-1912 BatchQueryBuilder refactoring

Added:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchTranslator.java
      - copied, changed from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchQueryBuilder.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchTranslator.java
      - copied, changed from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchQueryBuilder.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchTranslator.java
      - copied, changed from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchQueryBuilder.java
Removed:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchQueryBuilder.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchQueryBuilder.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchQueryBuilder.java
Modified:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java?rev=1577859&r1=1577858&r2=1577859&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchAction.java
Sat Mar 15 13:17:41 2014
@@ -66,11 +66,11 @@ class OracleLOBBatchAction implements SQ
 
     public void performAction(Connection connection, OperationObserver observer) throws SQLException,
Exception {
 
-        OracleLOBBatchQueryBuilder queryBuilder;
+        OracleLOBBatchTranslator queryBuilder;
         if (query instanceof InsertBatchQuery) {
-            queryBuilder = new OracleLOBInsertBatchQueryBuilder((InsertBatchQuery) query,
getAdapter());
+            queryBuilder = new OracleLOBInsertBatchTranslator((InsertBatchQuery) query, getAdapter());
         } else if (query instanceof UpdateBatchQuery) {
-            queryBuilder = new OracleLOBUpdateBatchQueryBuilder((UpdateBatchQuery) query,
getAdapter());
+            queryBuilder = new OracleLOBUpdateBatchTranslator((UpdateBatchQuery) query, getAdapter());
         } else {
             throw new CayenneException("Unsupported batch type for special LOB processing:
" + query);
         }
@@ -123,7 +123,7 @@ class OracleLOBBatchAction implements SQ
         }
     }
 
-    void processLOBRow(Connection con, OracleLOBBatchQueryBuilder queryBuilder, OracleLOBBatchQueryWrapper
selectQuery,
+    void processLOBRow(Connection con, OracleLOBBatchTranslator queryBuilder, OracleLOBBatchQueryWrapper
selectQuery,
             List<DbAttribute> qualifierAttributes, BatchQueryRow row) throws SQLException,
Exception {
 
         List<DbAttribute> lobAttributes = selectQuery.getDbAttributesForUpdatedLOBColumns();

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchTranslator.java
(from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchQueryBuilder.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchQueryBuilder.java&r1=1577846&r2=1577859&rev=1577859&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchQueryBuilder.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBBatchTranslator.java
Sat Mar 15 13:17:41 2014
@@ -39,12 +39,12 @@ import org.apache.cayenne.query.BatchQue
  * Superclass of query builders for the DML operations involving LOBs.
  * 
  */
-abstract class OracleLOBBatchQueryBuilder extends BatchTranslator {
+abstract class OracleLOBBatchTranslator extends BatchTranslator {
 
     protected String newClobFunction;
     protected String newBlobFunction;
 
-    OracleLOBBatchQueryBuilder(BatchQuery query, DbAdapter adapter) {
+    OracleLOBBatchTranslator(BatchQuery query, DbAdapter adapter) {
         super(query, adapter);
     }
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchTranslator.java
(from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchQueryBuilder.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchQueryBuilder.java&r1=1577846&r2=1577859&rev=1577859&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchQueryBuilder.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBInsertBatchTranslator.java
Sat Mar 15 13:17:41 2014
@@ -29,9 +29,9 @@ import org.apache.cayenne.map.DbAttribut
 import org.apache.cayenne.query.BatchQueryRow;
 import org.apache.cayenne.query.InsertBatchQuery;
 
-class OracleLOBInsertBatchQueryBuilder extends OracleLOBBatchQueryBuilder {
+class OracleLOBInsertBatchTranslator extends OracleLOBBatchTranslator {
 
-    OracleLOBInsertBatchQueryBuilder(InsertBatchQuery query, DbAdapter adapter) {
+    OracleLOBInsertBatchTranslator(InsertBatchQuery query, DbAdapter adapter) {
         super(query, adapter);
     }
 

Copied: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchTranslator.java
(from r1577846, cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchQueryBuilder.java)
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchTranslator.java?p2=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchTranslator.java&p1=cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchQueryBuilder.java&r1=1577846&r2=1577859&rev=1577859&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchQueryBuilder.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleLOBUpdateBatchTranslator.java
Sat Mar 15 13:17:41 2014
@@ -29,9 +29,9 @@ import org.apache.cayenne.map.DbAttribut
 import org.apache.cayenne.query.BatchQueryRow;
 import org.apache.cayenne.query.UpdateBatchQuery;
 
-class OracleLOBUpdateBatchQueryBuilder extends OracleLOBBatchQueryBuilder {
+class OracleLOBUpdateBatchTranslator extends OracleLOBBatchTranslator {
 
-    OracleLOBUpdateBatchQueryBuilder(UpdateBatchQuery query, DbAdapter adapter) {
+    OracleLOBUpdateBatchTranslator(UpdateBatchQuery query, DbAdapter adapter) {
         super(query, adapter);
     }
 



Mime
View raw message