You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by br...@apache.org on 2005/04/13 21:19:39 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker PersistenceBrokerInternal.java
brj 2005/04/13 12:19:39
Modified: src/java/org/apache/ojb/broker/core
PersistenceBrokerImpl.java
QueryReferenceBroker.java
DelegatingPersistenceBroker.java
src/java/org/apache/ojb/broker/util/sequence
SequenceManagerNativeImpl.java
AbstractSequenceManager.java
SequenceManagerMSSQLGuidImpl.java
SequenceManagerInMemoryImpl.java
SequenceManagerNextValImpl.java
SequenceManagerStoredProcedureImpl.java
SequenceManagerHighLowImpl.java
SequenceManagerSeqHiLoImpl.java
src/java/org/apache/ojb/broker/accesslayer
MtoNCollectionPrefetcher.java BasePrefetcher.java
src/java/org/apache/ojb/broker/util BrokerHelper.java
src/java/org/apache/ojb/broker
PersistenceBrokerInternal.java
Log:
get QueryFactory from PBInternal
Revision Changes Path
1.113 +13 -2 db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java
Index: PersistenceBrokerImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/PersistenceBrokerImpl.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- PersistenceBrokerImpl.java 2 Apr 2005 09:44:38 -0000 1.112
+++ PersistenceBrokerImpl.java 13 Apr 2005 19:19:38 -0000 1.113
@@ -67,7 +67,6 @@
import org.apache.ojb.broker.metadata.DescriptorRepository;
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
-import org.apache.ojb.broker.metadata.MetadataManager;
import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
import org.apache.ojb.broker.metadata.SequenceDescriptor;
import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
@@ -75,6 +74,7 @@
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryByIdentity;
import org.apache.ojb.broker.query.QueryBySQL;
+import org.apache.ojb.broker.query.QueryFactoryNew;
import org.apache.ojb.broker.util.BrokerHelper;
import org.apache.ojb.broker.util.IdentityArrayList;
import org.apache.ojb.broker.util.ObjectModification;
@@ -107,6 +107,8 @@
protected QueryReferenceBroker referencesBroker;
/** The proxy factory */
private ProxyFactory proxyFactory;
+ /** The query factory */
+ private QueryFactoryNew queryFactory;
/**
* signs if this broker was closed
@@ -230,6 +232,7 @@
referencesBroker = new QueryReferenceBroker(this);
localCache = (LocalCache)subContainer.getSingletonInstance(LocalCache.class);
proxyFactory = (ProxyFactory)subContainer.getSingletonInstance(ProxyFactory.class);
+ queryFactory = (QueryFactoryNew)subContainer.getSingletonInstance(QueryFactoryNew.class);
}
public LocalCache ojbLocalCache()
@@ -2202,4 +2205,12 @@
return oid;
}
+
+ /**
+ * @see org.apache.ojb.broker.PersistenceBrokerInternal#getQueryFactory()
+ */
+ public QueryFactoryNew getQueryFactory()
+ {
+ return queryFactory;
+ }
}
1.32 +4 -5 db-ojb/src/java/org/apache/ojb/broker/core/QueryReferenceBroker.java
Index: QueryReferenceBroker.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/QueryReferenceBroker.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- QueryReferenceBroker.java 12 Apr 2005 20:53:20 -0000 1.31
+++ QueryReferenceBroker.java 13 Apr 2005 19:19:38 -0000 1.32
@@ -48,7 +48,6 @@
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
-import org.apache.ojb.broker.query.QueryFactory;
import org.apache.ojb.broker.util.BrokerHelper;
import org.apache.ojb.broker.util.collections.ManageableListImpl;
import org.apache.ojb.broker.util.collections.ManageableSetImpl;
@@ -756,7 +755,7 @@
refCld.getPkFields()[i].getAttributeName());
}
- return QueryFactory.newQuery(refCld.getClassOfObject(), cod.getIndirectionTable(), criteria);
+ return pb.getQueryFactory().newQuery(refCld.getClassOfObject(), cod.getIndirectionTable(), criteria);
}
/**
@@ -779,7 +778,7 @@
criteria.addEqualTo(fld.getAttributeName(), values[i].getValue());
}
- return QueryFactory.newQuery(refCld.getClassOfObject(), criteria);
+ return pb.getQueryFactory().newQuery(refCld.getClassOfObject(), criteria);
}
/**
@@ -800,7 +799,7 @@
FieldDescriptor fld = fields[i];
criteria.addEqualTo(fld.getAttributeName(), values[i]);
}
- return QueryFactory.newQuery(cld.getClassOfObject(), criteria);
+ return pb.getQueryFactory().newQuery(cld.getClassOfObject(), criteria);
}
/**
1.19 +6 -0 db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java
Index: DelegatingPersistenceBroker.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/core/DelegatingPersistenceBroker.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DelegatingPersistenceBroker.java 18 Dec 2004 13:39:25 -0000 1.18
+++ DelegatingPersistenceBroker.java 13 Apr 2005 19:19:38 -0000 1.19
@@ -33,6 +33,7 @@
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.DescriptorRepository;
import org.apache.ojb.broker.query.Query;
+import org.apache.ojb.broker.query.QueryFactoryNew;
import org.apache.ojb.broker.util.BrokerHelper;
import org.apache.ojb.broker.util.ObjectModification;
import org.apache.ojb.broker.util.sequence.SequenceManager;
@@ -234,6 +235,11 @@
return getBroker().getProxyFactory();
}
+ public QueryFactoryNew getQueryFactory()
+ {
+ return getBroker().getQueryFactory();
+ }
+
public Object createProxy(Class proxyClass, Identity realSubjectsIdentity)
{
return getBroker().createProxy(proxyClass, realSubjectsIdentity);
1.22 +3 -3 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNativeImpl.java
Index: SequenceManagerNativeImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNativeImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SequenceManagerNativeImpl.java 28 Nov 2004 03:15:13 -0000 1.21
+++ SequenceManagerNativeImpl.java 13 Apr 2005 19:19:38 -0000 1.22
@@ -21,7 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.JdbcAccess;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
@@ -98,7 +98,7 @@
*/
private static volatile long tempKey = -1;
- public SequenceManagerNativeImpl(PersistenceBroker broker)
+ public SequenceManagerNativeImpl(PersistenceBrokerInternal broker)
{
super(broker);
}
1.20 +5 -5 db-ojb/src/java/org/apache/ojb/broker/util/sequence/AbstractSequenceManager.java
Index: AbstractSequenceManager.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/AbstractSequenceManager.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractSequenceManager.java 14 Sep 2004 16:18:38 -0000 1.19
+++ AbstractSequenceManager.java 13 Apr 2005 19:19:38 -0000 1.20
@@ -17,7 +17,7 @@
import java.util.Properties;
-import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.JdbcAccess;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
@@ -39,7 +39,7 @@
// private Logger log = LoggerFactory.getLogger(AbstractSequenceManager.class);
public static final String PROPERTY_AUTO_NAMING = "autoNaming";
- private PersistenceBroker brokerForClass;
+ private PersistenceBrokerInternal brokerForClass;
private Platform platform;
private Properties configurationProperties;
@@ -50,7 +50,7 @@
* @param broker PB instance to perform the
* id generation.
*/
- public AbstractSequenceManager(PersistenceBroker broker)
+ public AbstractSequenceManager(PersistenceBrokerInternal broker)
{
this.brokerForClass = broker;
this.configurationProperties = new Properties();
@@ -75,7 +75,7 @@
return platform;
}
- public PersistenceBroker getBrokerForClass()
+ public PersistenceBrokerInternal getBrokerForClass()
{
return brokerForClass;
}
1.6 +7 -7 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerMSSQLGuidImpl.java
Index: SequenceManagerMSSQLGuidImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerMSSQLGuidImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SequenceManagerMSSQLGuidImpl.java 14 Sep 2004 16:18:38 -0000 1.5
+++ SequenceManagerMSSQLGuidImpl.java 13 Apr 2005 19:19:38 -0000 1.6
@@ -15,17 +15,17 @@
* limitations under the License.
*/
+import java.sql.SQLException;
+
import org.apache.commons.lang.SystemUtils;
-import org.apache.ojb.broker.PersistenceBroker;
import org.apache.ojb.broker.PersistenceBrokerException;
-import org.apache.ojb.broker.util.JdbcTypesHelper;
-import org.apache.ojb.broker.util.logging.LoggerFactory;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.ResultSetAndStatement;
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.metadata.JdbcType;
import org.apache.ojb.broker.query.Query;
-
-import java.sql.SQLException;
+import org.apache.ojb.broker.util.JdbcTypesHelper;
+import org.apache.ojb.broker.util.logging.LoggerFactory;
/**
@@ -50,7 +50,7 @@
* @param broker PB instance to perform the
* id generation.
*/
- public SequenceManagerMSSQLGuidImpl(PersistenceBroker broker)
+ public SequenceManagerMSSQLGuidImpl(PersistenceBrokerInternal broker)
{
super(broker);
}
1.15 +5 -5 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerInMemoryImpl.java
Index: SequenceManagerInMemoryImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerInMemoryImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SequenceManagerInMemoryImpl.java 4 Apr 2004 23:53:38 -0000 1.14
+++ SequenceManagerInMemoryImpl.java 13 Apr 2005 19:19:38 -0000 1.15
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.metadata.FieldDescriptor;
-
import java.util.HashMap;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
+import org.apache.ojb.broker.metadata.FieldDescriptor;
+
/**
* <p>
* Very fast in memory sequence manager implementation, only the first
@@ -72,7 +72,7 @@
{
private static HashMap sequenceNameKeyMap = new HashMap();
- public SequenceManagerInMemoryImpl(PersistenceBroker broker)
+ public SequenceManagerInMemoryImpl(PersistenceBrokerInternal broker)
{
super(broker);
}
1.19 +3 -3 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNextValImpl.java
Index: SequenceManagerNextValImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerNextValImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- SequenceManagerNextValImpl.java 14 Sep 2004 16:18:38 -0000 1.18
+++ SequenceManagerNextValImpl.java 13 Apr 2005 19:19:38 -0000 1.19
@@ -19,7 +19,7 @@
import java.sql.Statement;
import org.apache.commons.lang.SystemUtils;
-import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.StatementManagerIF;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
@@ -94,7 +94,7 @@
/**
*
*/
- public SequenceManagerNextValImpl(PersistenceBroker broker)
+ public SequenceManagerNextValImpl(PersistenceBrokerInternal broker)
{
super(broker);
}
1.13 +9 -8 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerStoredProcedureImpl.java
Index: SequenceManagerStoredProcedureImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerStoredProcedureImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SequenceManagerStoredProcedureImpl.java 14 Sep 2004 16:18:38 -0000 1.12
+++ SequenceManagerStoredProcedureImpl.java 13 Apr 2005 19:19:38 -0000 1.13
@@ -15,21 +15,22 @@
* limitations under the License.
*/
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
import org.apache.commons.lang.SystemUtils;
import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.platforms.PlatformException;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.accesslayer.LookupException;
import org.apache.ojb.broker.metadata.ClassDescriptor;
import org.apache.ojb.broker.metadata.FieldDescriptor;
+import org.apache.ojb.broker.platforms.PlatformException;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
-import java.sql.CallableStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Connection;
-
/**
* This solution will give those seeking an oracle-style
* sequence generator a final answer (Identity columns really suck).
@@ -134,7 +135,7 @@
* Constructor
* @param broker
*/
- public SequenceManagerStoredProcedureImpl(PersistenceBroker broker)
+ public SequenceManagerStoredProcedureImpl(PersistenceBrokerInternal broker)
{
super(broker);
}
1.32 +9 -10 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHighLowImpl.java
Index: SequenceManagerHighLowImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerHighLowImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- SequenceManagerHighLowImpl.java 25 Mar 2005 19:07:18 -0000 1.31
+++ SequenceManagerHighLowImpl.java 13 Apr 2005 19:19:38 -0000 1.32
@@ -20,11 +20,10 @@
import org.apache.commons.lang.SystemUtils;
import org.apache.ojb.broker.OptimisticLockException;
-import org.apache.ojb.broker.PersistenceBroker;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
import org.apache.ojb.broker.metadata.FieldDescriptor;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
-import org.apache.ojb.broker.query.QueryFactory;
import org.apache.ojb.broker.util.ObjectModificationDefaultImpl;
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
@@ -120,7 +119,7 @@
protected long globalSequenceStart;
protected int attempts;
- public SequenceManagerHighLowImpl(PersistenceBroker broker)
+ public SequenceManagerHighLowImpl(PersistenceBrokerInternal broker)
{
super(broker);
grabSize = Integer.parseInt(getConfigurationProperty(PROPERTY_GRAB_SIZE, "20"));
@@ -169,12 +168,12 @@
}
}
- protected HighLowSequence getSequence(PersistenceBroker brokerForSequence,
+ protected HighLowSequence getSequence(PersistenceBrokerInternal brokerForSequence,
FieldDescriptor field,
String sequenceName) throws SequenceManagerException
{
HighLowSequence newSequence = null;
- PersistenceBroker internBroker = null;
+ PersistenceBrokerInternal internBroker = null;
try
{
/*
@@ -186,7 +185,7 @@
Thus we use a new internBroker instance (with new connection) to
avoid this problem.
*/
- internBroker = brokerForSequence.getConfiguration().createPersistenceBroker();
+ internBroker = (PersistenceBrokerInternal) brokerForSequence.getConfiguration().createPersistenceBroker();
internBroker.beginTransaction();
newSequence = lookupStoreSequence(internBroker, field, sequenceName);
@@ -211,14 +210,14 @@
return newSequence;
}
- protected HighLowSequence lookupStoreSequence(PersistenceBroker broker, FieldDescriptor field, String seqName)
+ protected HighLowSequence lookupStoreSequence(PersistenceBrokerInternal broker, FieldDescriptor field, String seqName)
{
HighLowSequence newSequence = null;
boolean needsInsert = false;
Criteria c = new Criteria();
c.addEqualTo(PK_FIELD, seqName);
- Query q = QueryFactory.newQuery(HighLowSequence.class, c);
+ Query q = broker.getQueryFactory().newQuery(HighLowSequence.class, c);
// first we lookup sequence object in database
newSequence = (HighLowSequence) broker.getObjectByQuery(q);
@@ -276,7 +275,7 @@
return seq;
}
- protected long getMaxKeyForSequence(PersistenceBroker broker,
+ protected long getMaxKeyForSequence(PersistenceBrokerInternal broker,
FieldDescriptor field)
{
long maxKey = 0;
1.10 +5 -5 db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerSeqHiLoImpl.java
Index: SequenceManagerSeqHiLoImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/sequence/SequenceManagerSeqHiLoImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SequenceManagerSeqHiLoImpl.java 4 Apr 2004 23:53:38 -0000 1.9
+++ SequenceManagerSeqHiLoImpl.java 13 Apr 2005 19:19:38 -0000 1.10
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-import org.apache.ojb.broker.PersistenceBroker;
-import org.apache.ojb.broker.metadata.FieldDescriptor;
-
import java.util.HashMap;
+import org.apache.ojb.broker.PersistenceBrokerInternal;
+import org.apache.ojb.broker.metadata.FieldDescriptor;
+
/**
* <p>
* A High/Low database sequence based implementation.
@@ -76,7 +76,7 @@
protected int grabSize;
- public SequenceManagerSeqHiLoImpl(PersistenceBroker broker)
+ public SequenceManagerSeqHiLoImpl(PersistenceBrokerInternal broker)
{
super(broker);
grabSize = Integer.parseInt(getConfigurationProperty(PROPERTY_GRAB_SIZE, "20"));
1.20 +3 -4 db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java
Index: MtoNCollectionPrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- MtoNCollectionPrefetcher.java 12 Apr 2005 20:53:20 -0000 1.19
+++ MtoNCollectionPrefetcher.java 13 Apr 2005 19:19:38 -0000 1.20
@@ -37,7 +37,6 @@
import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
-import org.apache.ojb.broker.query.QueryFactory;
import org.apache.ojb.broker.query.ReportQueryByCriteria;
import org.apache.ojb.broker.util.BrokerHelper;
@@ -127,7 +126,7 @@
//
// Without the distinct the resultset may contain duplicate rows
- return QueryFactory.newQuery(cds.getItemClass(), cds.getIndirectionTable(), crit, false);
+ return getQueryFactory().newQuery(cds.getItemClass(), cds.getIndirectionTable(), crit, false);
}
/**
@@ -160,7 +159,7 @@
jdbcTypes[pkFields.length + i] = itemPkFields[i].getJdbcType().getType();
}
- ReportQueryByCriteria q = QueryFactory.newMtoNReportQuery(getItemClassDescriptor().getClassOfObject(), cols,
+ ReportQueryByCriteria q = getQueryFactory().newMtoNReportQuery(getItemClassDescriptor().getClassOfObject(), cols,
crit, false, getCollectionDescriptor().getIndirectionTable());
q.setJdbcTypes(jdbcTypes);
1.14 +12 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java
Index: BasePrefetcher.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/BasePrefetcher.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- BasePrefetcher.java 13 Jan 2005 19:49:56 -0000 1.13
+++ BasePrefetcher.java 13 Apr 2005 19:19:38 -0000 1.14
@@ -27,7 +27,7 @@
import org.apache.ojb.broker.query.Criteria;
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
-import org.apache.ojb.broker.query.QueryFactory;
+import org.apache.ojb.broker.query.QueryFactoryNew;
import org.apache.ojb.broker.util.logging.Logger;
import org.apache.ojb.broker.util.logging.LoggerFactory;
@@ -137,7 +137,7 @@
*/
protected QueryByCriteria buildPrefetchQuery(Class clazz, Collection ids, FieldDescriptor[] fields)
{
- return QueryFactory.newQuery(clazz, buildPrefetchCriteria(ids, fields));
+ return broker.getQueryFactory().newQuery(clazz, buildPrefetchCriteria(ids, fields));
}
/**
@@ -239,6 +239,15 @@
}
/**
+ * Returns the QueryFactory.
+ * @return QueryFactory
+ */
+ protected QueryFactoryNew getQueryFactory()
+ {
+ return getBroker().getQueryFactory();
+ }
+
+ /**
* Returns the logger.
* @return Logger
*/
1.81 +15 -7 db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
Index: BrokerHelper.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- BrokerHelper.java 2 Apr 2005 09:44:39 -0000 1.80
+++ BrokerHelper.java 13 Apr 2005 19:19:38 -0000 1.81
@@ -51,7 +51,7 @@
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryBySQL;
-import org.apache.ojb.broker.query.QueryFactory;
+import org.apache.ojb.broker.query.QueryFactoryNew;
import org.apache.ojb.broker.query.ReportQueryByCriteria;
import org.apache.ojb.broker.util.sequence.SequenceManagerException;
@@ -558,7 +558,7 @@
countSql = countSql.substring(0, orderPos);
}
- return QueryFactory.newQuery(aQuery.getSearchClass(), countSql);
+ return getQueryFactory().newQuery(aQuery.getSearchClass(), countSql);
}
/**
@@ -624,12 +624,12 @@
if(aQuery instanceof MtoNQuery)
{
MtoNQuery mnQuery = (MtoNQuery) aQuery;
- countQuery = QueryFactory.newMtoNReportQuery(searchClass,
+ countQuery = getQueryFactory().newMtoNReportQuery(searchClass,
columns, countCrit, false, mnQuery.getIndirectionTable());
}
else
{
- countQuery = QueryFactory.newReportQuery(searchClass, columns, countCrit, false);
+ countQuery = getQueryFactory().newReportQuery(searchClass, columns, countCrit, false);
}
// BRJ: we have to preserve outer-join-settings (by Andr� Markwalder)
@@ -885,7 +885,7 @@
if (fd != null)
{
String discriminator = aCld.getDiscriminatorValue();
- QueryByCriteria copyQuery = QueryFactory.copyQuery(aQuery);
+ QueryByCriteria copyQuery = getQueryFactory().copyQuery(aQuery);
copyQuery.getCriteria().addColumnEqualTo(fd.getColumnName(), discriminator);
copyQuery.preprocess(aPb);
@@ -912,7 +912,7 @@
if (fd != null && concreteClasses != null && !concreteClasses.isEmpty())
{
- QueryByCriteria copyQuery = QueryFactory.copyQuery(aQuery);
+ QueryByCriteria copyQuery = getQueryFactory().copyQuery(aQuery);
if (concreteClasses.size() > 1)
{
@@ -1148,4 +1148,12 @@
}
}
+ /**
+ * Returns the QueryFactory.
+ * @return QueryFactory
+ */
+ protected QueryFactoryNew getQueryFactory()
+ {
+ return m_broker.getQueryFactory();
+ }
}
1.6 +9 -1 db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerInternal.java
Index: PersistenceBrokerInternal.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerInternal.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PersistenceBrokerInternal.java 18 Dec 2004 13:39:26 -0000 1.5
+++ PersistenceBrokerInternal.java 13 Apr 2005 19:19:38 -0000 1.6
@@ -4,6 +4,7 @@
import org.apache.ojb.broker.accesslayer.batch.BatchManager;
import org.apache.ojb.broker.core.proxy.ProxyFactory;
import org.apache.ojb.broker.metadata.ClassDescriptor;
+import org.apache.ojb.broker.query.QueryFactoryNew;
/* Copyright 2002-2004 The Apache Software Foundation
*
@@ -89,4 +90,11 @@
* done with this instance after calling this method.
*/
public void destroy();
+
+ /**
+ * Answer the QueryFactory.
+ * @return the QueryFactory
+ */
+ public QueryFactoryNew getQueryFactory();
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org