You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by an...@apache.org on 2009/08/13 16:03:56 UTC
svn commit: r803889 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access:
DataDomainActionBuilder.java DataDomainBatchAction.java jdbc/BatchAction.java
Author: andrey
Date: Thu Aug 13 14:03:55 2009
New Revision: 803889
URL: http://svn.apache.org/viewvc?rev=803889&view=rev
Log:
trying to fix Oracle failures
Removed:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainBatchAction.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainActionBuilder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainActionBuilder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainActionBuilder.java?rev=803889&r1=803888&r2=803889&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainActionBuilder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainActionBuilder.java Thu Aug 13 14:03:55 2009
@@ -45,8 +45,12 @@
return domain;
}
- public SQLAction batchAction(BatchQuery query) {
- return new DataDomainBatchAction(domain, (BatchAction) delegate.batchAction(query));
+ public SQLAction batchAction(BatchQuery query) {
+ SQLAction action = delegate.batchAction(query);
+ if (action instanceof BatchAction) {
+ ((BatchAction) action).setQueryBuilderFactory(domain.getQueryBuilderFactory());
+ }
+ return action;
}
public SQLAction ejbqlAction(EJBQLQuery query) {
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java?rev=803889&r1=803888&r2=803889&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java Thu Aug 13 14:03:55 2009
@@ -51,6 +51,11 @@
protected boolean batch;
protected BatchQuery query;
protected RowDescriptor keyRowDescriptor;
+
+ /**
+ * Custom BatchQueryBuilderFactory. Can be null, then default will be used.
+ */
+ protected BatchQueryBuilderFactory queryBuilderFactory;
public BatchAction(BatchQuery batchQuery, DbAdapter adapter,
EntityResolver entityResolver) {
@@ -90,12 +95,16 @@
/**
* @return factory that creates BatchQueryBuilders
*/
- protected BatchQueryBuilderFactory getBatchQueryBuilderFactory() {
- return null;
+ public BatchQueryBuilderFactory getQueryBuilderFactory() {
+ return queryBuilderFactory;
+ }
+
+ public void setQueryBuilderFactory(BatchQueryBuilderFactory queryBuilderFactory) {
+ this.queryBuilderFactory = queryBuilderFactory;
}
protected BatchQueryBuilder createBuilder() throws CayenneException {
- BatchQueryBuilderFactory factory = getBatchQueryBuilderFactory();
+ BatchQueryBuilderFactory factory = getQueryBuilderFactory();
if (factory == null) {
factory = new DefaultBatchQueryBuilderFactory();