brj 2005/04/07 12:58:44
Modified: src/test/org/apache/ojb/broker QueryTest.java
Log:
get QueryFactory from OJB
Revision Changes Path
1.85 +97 -98 db-ojb/src/test/org/apache/ojb/broker/QueryTest.java
Index: QueryTest.java
===================================================================
RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/QueryTest.java,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- QueryTest.java 1 Apr 2005 20:43:24 -0000 1.84
+++ QueryTest.java 7 Apr 2005 19:58:43 -0000 1.85
@@ -20,7 +20,6 @@
import org.apache.ojb.broker.query.Query;
import org.apache.ojb.broker.query.QueryByCriteria;
import org.apache.ojb.broker.query.QueryByExample;
-import org.apache.ojb.broker.query.QueryFactory;
import org.apache.ojb.broker.query.ReportQuery;
import org.apache.ojb.broker.query.ReportQueryByCriteria;
import org.apache.ojb.junit.PBTestCase;
@@ -53,12 +52,12 @@
// prepare test
broker.beginTransaction();
- Query q = QueryFactory.newQueryByIdentity(group);
+ Query q = ojb.getQueryFactory().newQueryByIdentity(group);
broker.deleteByQuery(q);
broker.commitTransaction();
broker.clearCache();
- QueryByExample query = QueryFactory.newQueryByExample(group);
+ QueryByExample query =
ojb.getQueryFactory().newQueryByExample(group);
ObjectRepository.Group newGroup = (ObjectRepository.Group)
broker.getObjectByQuery(query);
assertNull(newGroup);
@@ -68,7 +67,7 @@
ObjectRepository.Group groupTemp = new ObjectRepository.Group();
groupTemp.setId(new Integer(0));
- Query queryNew = QueryFactory.newQueryByIdentity(groupTemp);
+ Query queryNew = ojb.getQueryFactory().newQueryByIdentity(groupTemp);
newGroup = (ObjectRepository.Group)
broker.getObjectByQuery(queryNew);
assertNotNull(newGroup);
assertEquals(new Integer(0), newGroup.getId());
@@ -120,7 +119,7 @@
crit1.addAndCriteria(crit2);
crit1.addAndCriteria(crit3);
- Query q = QueryFactory.newQuery(Person.class, crit1);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit1);
Collection results = broker.getCollectionByQuery(q);
// all persons except tom
@@ -144,7 +143,7 @@
Criteria crit = new Criteria();
crit.addIdentityEqualTo("", id);
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
// 1 person
@@ -168,7 +167,7 @@
Criteria crit = new Criteria();
crit.addIdentityEqualTo("", id);
- Query q = QueryFactory.newQuery(Article.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Article.class, crit);
Collection results = broker.getCollectionByQuery(q);
// 1 article
@@ -212,7 +211,7 @@
Criteria crit = new Criteria();
crit.addIdentityEqualTo("persons", id);
- Query q = QueryFactory.newQuery(Project.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Project.class, crit);
Collection results = broker.getCollectionByQuery(q);
// 2 Projects
@@ -240,7 +239,7 @@
Criteria crit = new Criteria();
crit.addIdentityEqualTo("allArticlesInGroup", id);
- Query q = QueryFactory.newQuery(ProductGroup.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
Collection results = broker.getCollectionByQuery(q);
// 1 article
@@ -263,7 +262,7 @@
Criteria crit = new Criteria();
crit.addIdentityEqualTo("", id);
- Query q = QueryFactory.newQuery(Region.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Region.class, crit);
Collection results = broker.getCollectionByQuery(q);
// 1 Region
@@ -284,7 +283,7 @@
broker.commitTransaction();
broker.clearCache();
- Query q = QueryFactory.newQueryByExample(p);
+ Query q = ojb.getQueryFactory().newQueryByExample(p);
Collection results = broker.getCollectionByQuery(q);
// 1 person
@@ -307,7 +306,7 @@
Article a = new Article();
a.setArticleId(article.getArticleId());
- QueryByExample q = QueryFactory.newQueryByExample(a);
+ QueryByExample q = ojb.getQueryFactory().newQueryByExample(a);
q.setIgnoreZero(true);
Collection results = broker.getCollectionByQuery(q);
@@ -322,7 +321,7 @@
{
Criteria crit = new Criteria();
crit.addEqualTo("firstname", "tom");
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -341,7 +340,7 @@
// sql only
crit = new Criteria();
crit.addSql("upper(firstname) = 'TOM' and id = 1");
- q = QueryFactory.newQuery(Person.class, crit);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit);
results = broker.getCollectionByQuery(q);
int size1 = results.size();
@@ -350,7 +349,7 @@
crit = new Criteria();
crit.addSql("upper(firstname) = 'TOM'");
crit.addEqualTo("id", new Integer(1));
- q = QueryFactory.newQuery(Person.class, crit);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit);
results = broker.getCollectionByQuery(q);
int size2 = results.size();
@@ -359,7 +358,7 @@
crit = new Criteria();
crit.addEqualTo("upper(firstname)", "TOM");
crit.addSql("id = 1");
- q = QueryFactory.newQuery(Person.class, crit);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit);
results = broker.getCollectionByQuery(q);
int size3 = results.size();
@@ -376,7 +375,7 @@
{
Criteria crit = new Criteria();
crit.addEqualTo("firstname", "tom");
- QueryByCriteria q = QueryFactory.newQuery(Person.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Person.class,
crit);
q.addOrderByAscending("firstname");
Collection results = broker.getCollectionByQuery(q);
@@ -430,7 +429,7 @@
Criteria crit = new Criteria();
crit.addLike("title", name);
- QueryByCriteria q = QueryFactory.newQuery(Project.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Project.class,
crit);
q.addOrderByAscending("title");
q.addOrderByAscending("persons.lastname");
q.addOrderByAscending("persons.firstname");
@@ -447,7 +446,7 @@
// next query without join to Person object
crit = new Criteria();
crit.addLike("title", name);
- q = QueryFactory.newQuery(Project.class, crit);
+ q = ojb.getQueryFactory().newQuery(Project.class, crit);
q.addOrderByAscending("title");
results = broker.getCollectionByQuery(q);
@@ -487,13 +486,13 @@
subCrit2.addNotNull("productGroupId");
subCrit.addAndCriteria(subCrit2);
- subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
+ subQuery = ojb.getQueryFactory().newReportQuery(Article.class,
subCrit);
subQuery.setAttributes(new String[]{"productGroupId"});
subQuery.setDistinct(true);
crit.addEqualTo("groupName", "test group " + stamp);
crit.addNotIn("groupId", subQuery);
- Query q = QueryFactory.newQuery(ProductGroup.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -516,11 +515,11 @@
Criteria crit = new Criteria();
subCrit.addLike("articleName", "A%");
- subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
+ subQuery = ojb.getQueryFactory().newReportQuery(Article.class,
subCrit);
subQuery.setAttributes(new String[]{"avg(price)"});
crit.addGreaterOrEqualThan("price", subQuery);
- Query q = QueryFactory.newQuery(Article.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Article.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -542,13 +541,13 @@
Criteria crit = new Criteria();
subCrit.addEqualToField("productGroupId",
Criteria.PARENT_QUERY_PREFIX + "groupId");
- subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
+ subQuery = ojb.getQueryFactory().newReportQuery(Article.class,
subCrit);
subQuery.setAttributes(new String[]{"count(productGroupId)"});
crit.addLessThan("10", subQuery); // MORE than 10 articles, uses
// attribute as value !
crit.addLessThan("groupId", new Integer(987654));
- Query q = QueryFactory.newQuery(ProductGroup.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -568,12 +567,12 @@
Criteria crit = new Criteria();
subCrit.addEqualToField("productGroupId",
Criteria.PARENT_QUERY_PREFIX + "groupId");
- subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
+ subQuery = ojb.getQueryFactory().newReportQuery(Article.class,
subCrit);
subQuery.setAttributes(new String[]{"count(productGroupId)"});
crit.addGreaterThan(subQuery, "10"); // MORE than 10 articles
crit.addLessThan("groupId", new Integer(987654));
- Query q = QueryFactory.newQuery(ProductGroup.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -588,7 +587,7 @@
Criteria crit = new Criteria();
crit.addLike("firstname", "%o%");
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -606,7 +605,7 @@
{
Criteria crit = new Criteria();
crit.addLike("firstname", "h%\\%");
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -626,7 +625,7 @@
Criteria crit = new Criteria();
crit.addLike("firstname", "h%|%");
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -655,7 +654,7 @@
crit2.addLike("lastname", name);
crit.addAndCriteria(crit2);
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -675,7 +674,7 @@
Criteria crit2 = new Criteria();
crit1.addOrCriteria(crit2);
- QueryByCriteria q = QueryFactory.newQuery(Article.class, crit1);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Article.class,
crit1);
result = broker.getCollectionByQuery(q);
assertNotNull(result);
@@ -697,7 +696,7 @@
Criteria crit2 = new Criteria();
crit1.addAndCriteria(crit2);
- QueryByCriteria q = QueryFactory.newQuery(Article.class, crit1);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Article.class,
crit1);
result = broker.getCollectionByQuery(q);
assertNotNull(result);
@@ -714,7 +713,7 @@
Criteria crit = new Criteria();
crit.addBetween("id", new Integer(1), new Integer(5));
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -737,7 +736,7 @@
ids.add(new Integer(5));
crit.addIn("id", ids);
- QueryByCriteria q = QueryFactory.newQuery(Person.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Person.class,
crit);
q.addOrderByAscending("id");
Collection results = broker.getCollectionByQuery(q);
@@ -762,7 +761,7 @@
crit.addNotIn("id", ids);
crit.addLessOrEqualThan("id", new Integer(10));
- QueryByCriteria q = QueryFactory.newQuery(Person.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Person.class,
crit);
q.addOrderByAscending("id");
Collection results = broker.getCollectionByQuery(q);
@@ -782,7 +781,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("productGroup.groupName", "Liquors");
- Query q = QueryFactory.newQuery(Article.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Article.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -801,7 +800,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("upper(productGroup.groupName)", "LIQUORS");
- Query q = QueryFactory.newQuery(Article.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Article.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -821,7 +820,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("roles.project.title", "HSQLDB");
// use decomposed m:n
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -836,7 +835,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("projects.title", "HSQLDB"); // direct m:n
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -852,7 +851,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("projects.roles.roleName", "developer");
crit.addLike("projects.persons.lastname", "%b%");
- Query q = QueryFactory.newQuery(Person.class, crit);
+ Query q = ojb.getQueryFactory().newQuery(Person.class, crit);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -867,7 +866,7 @@
Criteria crit = new Criteria();
crit.addLike("allArticlesInGroup.articleName", "C%");
- QueryByCriteria q = QueryFactory.newQuery(ProductGroup.class, crit,
true);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit, true);
q.addOrderByAscending("groupId");
Collection results = broker.getCollectionByQuery(q);
@@ -886,7 +885,7 @@
{
Criteria crit = new Criteria();
crit.addEqualTo("project_id", new Integer(1));
- QueryByCriteria q = QueryFactory.newQuery(Role.class, crit, true);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Role.class, crit,
true);
Collection results = broker.getCollectionByQuery(q);
assertNotNull(results);
@@ -926,7 +925,7 @@
Criteria crit2 = new Criteria();
crit2.addLike("lastname", name);
crit.addAndCriteria(crit2);
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Person.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Person.class, crit);
q.setAttributes(new String[]{"id", "firstname", "count(*)"});
q.addGroupBy(new String[]{"id", "firstname"});
@@ -978,7 +977,7 @@
Criteria crit2 = new Criteria();
crit2.addLike("lastname", name);
crit.addAndCriteria(crit2);
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Person.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Person.class, crit);
q.setAttributes(new String[]{"max(id)"});
q.addGroupBy(new String[]{"lastname", "firstname"});
@@ -1032,7 +1031,7 @@
crit2.addLike("lastname", name);
crit.addAndCriteria(crit2);
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Person.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Person.class, crit);
q.setAttributes(new String[]{"id", "firstname", "count(*)"});
q.addGroupBy(new String[]{"id", "firstname"});
q.setJdbcTypes(types);
@@ -1065,7 +1064,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addLike("firstname", "%o%");
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Person.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Person.class, crit);
q.setAttributes(new String[]{"id", "firstname", "count(*)"});
q.addGroupBy(new String[]{"id", "firstname"});
@@ -1090,7 +1089,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addLike("articleName", "%o%");
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"articleId", "articleName", "price"});
Iterator iter = broker.getReportQueryIteratorByQuery(q);
@@ -1128,10 +1127,10 @@
Criteria critSub = new Criteria();
critSub.addEqualTo("articleName", name);
- ReportQueryByCriteria querySub =
QueryFactory.newReportQuery(BookArticle.class, critSub);
+ ReportQueryByCriteria querySub =
ojb.getQueryFactory().newReportQuery(BookArticle.class, critSub);
querySub.setAttributes(new String[]{"productGroupId"});
- ReportQueryByCriteria queryMain =
QueryFactory.newReportQuery(AbstractProductGroup.class, critMain);
+ ReportQueryByCriteria queryMain =
ojb.getQueryFactory().newReportQuery(AbstractProductGroup.class, critMain);
queryMain.setAttributes(new String[]{"groupId", "groupName"});
critMain.addIn("groupId", querySub);
@@ -1172,7 +1171,7 @@
Criteria critSub = new Criteria();
critSub.addEqualTo("articleName", name);
- ReportQueryByCriteria querySub =
QueryFactory.newReportQuery(Article.class, critSub);
+ ReportQueryByCriteria querySub =
ojb.getQueryFactory().newReportQuery(Article.class, critSub);
querySub.setAttributes(new String[]{"productGroupId"});
Iterator subIter = broker.getReportQueryIteratorByQuery(querySub);
Collection subIds = new ArrayList();
@@ -1182,7 +1181,7 @@
subIds.add(id[0]);
}
- ReportQueryByCriteria queryMain =
QueryFactory.newReportQuery(AbstractProductGroup.class, critMain);
+ ReportQueryByCriteria queryMain =
ojb.getQueryFactory().newReportQuery(AbstractProductGroup.class, critMain);
queryMain.setAttributes(new String[]{"groupId", "groupName"});
critMain.addIn("groupId", subIds);
@@ -1209,7 +1208,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addLike("articleName", "C%");
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"productGroup.groupName", "articleId",
"articleName", "price"});
Iterator iter = broker.getReportQueryIteratorByQuery(q);
@@ -1234,7 +1233,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addEqualTo("productGroup.groupName", "Liquors");
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"articleId", "articleName", "price"});
q.addOrderByAscending("price");
@@ -1259,7 +1258,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addEqualTo("productGroup.groupName", "Liquors");
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"articleId", "articleName", "price"});
q.addOrderByAscending("productGroup.groupId");
@@ -1285,7 +1284,7 @@
{
Criteria crit = new Criteria();
Collection results = new Vector();
- ReportQueryByCriteria q =
QueryFactory.newReportQuery(ProductGroup.class, crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(ProductGroup.class, crit);
q.setAttributes(new String[]{"groupName",
"sum(allArticlesInGroup.stock)", "sum(allArticlesInGroup.price)"});
q.addGroupBy("groupName");
@@ -1320,7 +1319,7 @@
{
Criteria crit = new Criteria();
Collection results = new Vector();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"productGroup.groupName", "sum(stock)",
"sum(price)"});
q.addGroupBy("productGroup.groupName");
@@ -1365,13 +1364,13 @@
crit = new Criteria();
crit.addEqualTo("articleId", new Integer(200));
- query = QueryFactory.newQuery(CdArticle.class, crit);
+ query = ojb.getQueryFactory().newQuery(CdArticle.class, crit);
cd = (CdArticle) broker.getObjectByQuery(query);
cdPg = (ProductGroupProxy) cd.getProductGroup();
crit = new Criteria();
crit.addEqualTo("allArticlesInGroup.articleId", cd.getArticleId());
- query = QueryFactory.newQuery(ProductGroup.class, crit);
+ query = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
query.setPathClass("allArticlesInGroup", CdArticle.class);
pg = (ProductGroupProxy) broker.getObjectByQuery(query);
@@ -1405,7 +1404,7 @@
Criteria crit = new Criteria();
crit.addLessOrEqualThan("groupId", new Integer(5));
- QueryByCriteria q =
QueryFactory.newQuery(ProductGroupWithArray.class, crit);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroupWithArray.class, crit);
q.addOrderByDescending("groupId");
q.addPrefetchedRelationship("allArticlesInGroup");
@@ -1426,7 +1425,7 @@
crit = new Criteria();
crit.addEqualTo("groupId", new Integer(5));
- q = QueryFactory.newQuery(ProductGroupWithArray.class, crit);
+ q = ojb.getQueryFactory().newQuery(ProductGroupWithArray.class,
crit);
results = broker.getCollectionByQuery(q);
ProductGroupWithArray pg2 = (ProductGroupWithArray)
results.toArray()[0];
InterfaceArticle[] articles = pg2.getAllArticles();
@@ -1478,7 +1477,7 @@
Criteria crit = new Criteria();
crit.addLessOrEqualThan("groupId", new Integer(5));
- QueryByCriteria q = QueryFactory.newQuery(ProductGroup.class, crit);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
q.addOrderByDescending("groupId");
q.addPrefetchedRelationship("allArticlesInGroup");
@@ -1550,7 +1549,7 @@
Criteria crit = new Criteria();
crit.addLessOrEqualThan("groupId", new Integer(5));
- QueryByCriteria q = QueryFactory.newQuery(ProductGroup.class, crit);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
q.addOrderByDescending("groupId");
q.addPrefetchedRelationship("allArticlesInGroup");
@@ -1575,7 +1574,7 @@
crit = new Criteria();
crit.addEqualTo("groupId", new Integer(5));
- q = QueryFactory.newQuery(ProductGroup.class, crit);
+ q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit);
results = broker.getCollectionByQuery(q);
InterfaceProductGroup pg2 = (InterfaceProductGroup)
results.toArray()[0];
// force materialization
@@ -1601,7 +1600,7 @@
ArrayList list = new java.util.ArrayList();
Criteria crit = new Criteria();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Person.class,
crit, true);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Person.class, crit, true);
q.setAttributes(new String[]{"roles.roleName",
"roles.project.title", "firstname", });
@@ -1622,7 +1621,7 @@
ArrayList list = new java.util.ArrayList();
Criteria crit = new Criteria();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Role.class,
crit, true);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Role.class, crit, true);
q.setAttributes(new String[]{"roleName", "project.title",
"person.firstname", });
@@ -1643,7 +1642,7 @@
{
ArrayList list = new ArrayList();
Criteria crit = new Criteria();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Task.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Task.class, crit);
q.setAttributes(new String[]{"role.roleName", "role.project.title",
"role.person.firstname", });
@@ -1679,7 +1678,7 @@
Criteria crit = new Criteria();
crit.addNotNull("productGroupId");
crit.addLessOrEqualThan("productGroupId", new Integer(5));
- QueryByCriteria q = QueryFactory.newQuery(Article.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Article.class,
crit);
q.addOrderByDescending("productGroupId");
q.addPrefetchedRelationship("productGroup");
@@ -1709,7 +1708,7 @@
crit = new Criteria();
crit.addNotNull("productGroupId");
crit.addLessOrEqualThan("productGroupId", new Integer(5));
- q = QueryFactory.newQuery(Article.class, crit);
+ q = ojb.getQueryFactory().newQuery(Article.class, crit);
q.addOrderByDescending("productGroupId");
results = broker.getCollectionByQuery(q);
@@ -1743,7 +1742,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("groupId", new Integer(5));
- ReportQueryByCriteria q =
QueryFactory.newReportQuery(ProductGroupWithAbstractArticles.class, crit, true);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(ProductGroupWithAbstractArticles.class,
crit, true);
q.setAttributes(new String[]{"groupId", "groupName",
"allArticlesInGroup.articleId", "allArticlesInGroup.articleName"});
Iterator iter = broker.getReportQueryIteratorByQuery(q);
@@ -1765,7 +1764,7 @@
Criteria crit = new Criteria();
Collection results = new Vector();
crit.addEqualTo("productGroup.groupName", "Liquors");
- QueryByCriteria q = QueryFactory.newQuery(Article.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Article.class,
crit);
q.addOrderByAscending("productGroup.groupId");
Iterator iter = broker.getIteratorByQuery(q);
@@ -1790,7 +1789,7 @@
crit1.addEqualTo("allArticlesInGroup.articleName", "Faust");
crit.addOrCriteria(crit1);
- QueryByCriteria q =
QueryFactory.newQuery(ProductGroupWithAbstractArticles.class, crit, true);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroupWithAbstractArticles.class, crit,
true);
q.addOrderByAscending("groupId");
Iterator iter = broker.getIteratorByQuery(q);
@@ -1817,7 +1816,7 @@
crit.addGreaterOrEqualThan("allArticlesInGroup.articleId", new
Integer(1));
crit.addLessOrEqualThan("allArticlesInGroup.articleId", new
Integer(5));
- ReportQueryByCriteria q =
QueryFactory.newReportQuery(ProductGroup.class, crit, true);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(ProductGroup.class, crit, true);
q.setAttributes(new String[]{"groupId", "groupName",
"allArticlesInGroup.articleId"});
Iterator iter = broker.getReportQueryIteratorByQuery(q);
@@ -1844,7 +1843,7 @@
crit.addLike("groupName", "%o%");
crit.addLike("allArticlesInGroup.articleName", "%\u00f6%");
//unicode for รถ
- ReportQueryByCriteria q =
QueryFactory.newReportQuery(ProductGroup.class, crit, true);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(ProductGroup.class, crit, true);
q.setAttributes(new String[]{"groupId", "groupName"});
Iterator iter = broker.getReportQueryIteratorByQuery(q);
@@ -1863,7 +1862,7 @@
public void testReportQueryExpressionInStatement1()
{
Criteria crit = new Criteria();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"articleId", "price + 10"});
ClassDescriptor cd = broker.getClassDescriptor(q.getBaseClass());
SqlGenerator sqlg = broker.serviceSqlGenerator();
@@ -1879,7 +1878,7 @@
public void testReportQueryExpressionInStatement2()
{
Criteria crit = new Criteria();
- ReportQueryByCriteria q = QueryFactory.newReportQuery(Article.class,
crit);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(Article.class, crit);
q.setAttributes(new String[]{"articleId", "0.9 * (price * stock)"});
ClassDescriptor cd = broker.getClassDescriptor(q.getBaseClass());
SqlGenerator sqlg = broker.serviceSqlGenerator();
@@ -1897,7 +1896,7 @@
{
Criteria crit = new Criteria();
crit.addGreaterThan("(0.9 * price * stock)",new Integer(3000));
- QueryByCriteria q = QueryFactory.newQuery(Article.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Article.class,
crit);
q.addOrderBy("articleId",true);
Collection result = broker.getCollectionByQuery(q);
@@ -1917,7 +1916,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("allArticlesInGroup.productGroupId", new Integer(5));
- Query q = QueryFactory.newQuery(ProductGroup.class, crit, true);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit,
true);
Iterator iter = broker.getIteratorByQuery(q);
while(iter.hasNext())
@@ -1939,7 +1938,7 @@
Criteria crit = new Criteria();
crit.addLike("upper(allArticlesInGroup.articleName)", "F%");
- Query q = QueryFactory.newQuery(ProductGroup.class, crit, true);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit,
true);
Iterator iter = broker.getIteratorByQuery(q);
while(iter.hasNext())
@@ -1961,7 +1960,7 @@
Criteria crit = new Criteria();
crit.addLike("allArticlesInGroup.musicians", "%");
- QueryByCriteria q = QueryFactory.newQuery(ProductGroup.class, crit,
true);
+ QueryByCriteria q =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit, true);
q.setPathClass("allArticlesInGroup", CdArticle.class);
Iterator iter = broker.getIteratorByQuery(q);
@@ -1984,7 +1983,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("allArticlesInGroup.productGroupId", new Integer(5));
- Query q = QueryFactory.newQuery(AbstractProductGroup.class, crit,
true);
+ Query q = ojb.getQueryFactory().newQuery(AbstractProductGroup.class,
crit, true);
Iterator iter = broker.getIteratorByQuery(q);
while(iter.hasNext())
@@ -2011,7 +2010,7 @@
crit2.addGreaterOrEqualThan("allArticlesInGroup.stock", new
Integer(110));
crit1.addAndCriteria(crit2);
- Query q = QueryFactory.newQuery(ProductGroup.class, crit1, true);
+ Query q = ojb.getQueryFactory().newQuery(ProductGroup.class, crit1,
true);
Iterator iter = broker.getIteratorByQuery(q);
while(iter.hasNext())
@@ -2038,7 +2037,7 @@
crit1.addLike("groupName", "B%");
crit1.addLike("upper(allArticlesInGroup.articleName)", "F%");
- QueryByCriteria q1 = QueryFactory.newQuery(ProductGroup.class,
crit1, true);
+ QueryByCriteria q1 =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit1, true);
Iterator iter1 = broker.getIteratorByQuery(q1);
while(iter1.hasNext())
@@ -2057,7 +2056,7 @@
crit2.addLike("groupName", "B%");
crit2.addLike("upper(allArticlesInGroup.articleName)", "F%");
- QueryByCriteria q2 = QueryFactory.newQuery(ProductGroup.class,
crit2, true);
+ QueryByCriteria q2 =
ojb.getQueryFactory().newQuery(ProductGroup.class, crit2, true);
// set searchclass to Article
q2.setObjectProjectionAttribute("allArticlesInGroup");
@@ -2088,7 +2087,7 @@
crit2.addGreaterOrEqualThan("allArticlesInGroup.stock", new
Integer(110));
crit1.addAndCriteria(crit2);
- ReportQueryByCriteria q =
QueryFactory.newReportQuery(ProductGroup.class, crit1);
+ ReportQueryByCriteria q =
ojb.getQueryFactory().newReportQuery(ProductGroup.class, crit1);
q.setAttributes(new String[]{"groupId", "groupName",
"STOCKS.allArticlesInGroup.articleName",
"NAMES.allArticlesInGroup.articleName",
"NAMES.allArticlesInGroup.stock"});
@@ -2141,7 +2140,7 @@
Criteria crit = new Criteria();
crit.addEqualTo("name", name);
- QueryByCriteria q = QueryFactory.newQuery(Gourmet.class, crit);
+ QueryByCriteria q = ojb.getQueryFactory().newQuery(Gourmet.class,
crit);
q.setStartAtIndex(100);
q.setEndAtIndex(109);
@@ -2156,7 +2155,7 @@
crit = new Criteria();
crit.addEqualTo("name", name);
- q = QueryFactory.newQuery(Gourmet.class, crit);
+ q = ojb.getQueryFactory().newQuery(Gourmet.class, crit);
watch.start();
c = broker.getCollectionByQuery(q);
watch.stop();
@@ -2196,13 +2195,13 @@
private void runQueryRangeTest(int delta)
{
// How many records are there in the table?
- Query countQuery = QueryFactory.newQuery(ProductGroup.class, null,
false);
+ Query countQuery =
ojb.getQueryFactory().newQuery(ProductGroup.class, null, false);
// Get the existing record count
int recordCount =
broker.getCollectionByQuery(countQuery).toArray().length;
// Build a query that will get the range we're looking for.
- Query listQuery = QueryFactory.newQuery(ProductGroup.class, null,
false);
+ Query listQuery = ojb.getQueryFactory().newQuery(ProductGroup.class,
null, false);
listQuery.setStartAtIndex(1);
listQuery.setEndAtIndex(recordCount + delta);
@@ -2239,7 +2238,7 @@
crit2.setAlias("alias2");
crit1.addAndCriteria(crit2);
- q = QueryFactory.newQuery(Person.class, crit1, true);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit1, true);
result = broker.getCollectionByQuery(q);
assertNotNull(result);
assertTrue(result.size() == 2); // bob, tom
@@ -2260,7 +2259,7 @@
crit1.addLike("firstname", "%o%");
crit1.addLike("projects.title", "OJB%");
- q = QueryFactory.newQuery(Person.class, crit1, true);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit1, true);
result1 = broker.getCollectionByQuery(q);
assertNotNull(result1);
assertTrue(result1.size() == 2); // bob, tom
@@ -2270,7 +2269,7 @@
crit2.addLike("firstname", "%o%");
crit2.addLike("projects.title", "OJB%");
- q = QueryFactory.newQuery(Person.class, crit2, true);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit2, true);
result2 = broker.getCollectionByQuery(q);
assertNotNull(result2);
assertTrue(result2.size() == 2); // bob, tom
@@ -2291,7 +2290,7 @@
crit2.addLike("projects.title", "SODA%");
crit1.addOrCriteria(crit2);
- q = QueryFactory.newQuery(Person.class, crit1, true);
+ q = ojb.getQueryFactory().newQuery(Person.class, crit1, true);
result = broker.getCollectionByQuery(q);
assertNotNull(result);
assertTrue(result.size() == 5); // bob, tom, cindy, albert ,betrand
@@ -2312,7 +2311,7 @@
crit2.addOrCriteria(crit3);
crit1.addAndCriteria(crit2);
- QueryByCriteria qry12 = QueryFactory.newQuery(Article.class, crit1);
+ QueryByCriteria qry12 =
ojb.getQueryFactory().newQuery(Article.class, crit1);
qry12.setPathOuterJoin("productGroup");
result = broker.getCollectionByQuery(qry12);
@@ -2338,7 +2337,7 @@
crit2.addOrCriteria(crit3);
crit2.addAndCriteria(crit1);
- QueryByCriteria qry21 = QueryFactory.newQuery(Article.class, crit2);
+ QueryByCriteria qry21 =
ojb.getQueryFactory().newQuery(Article.class, crit2);
qry21.setPathOuterJoin("productGroup");
result = broker.getCollectionByQuery(qry21);
@@ -2372,9 +2371,9 @@
Criteria crit = new Criteria();
crit.addEqualTo("name", name);
- QueryByCriteria queryAnimals =
QueryFactory.newQuery(InterfaceAnimal.class, crit);
- QueryByCriteria queryReptile = QueryFactory.newQuery(Reptile.class,
crit);
- QueryByCriteria queryMammal = QueryFactory.newQuery(Mammal.class,
crit);
+ QueryByCriteria queryAnimals =
ojb.getQueryFactory().newQuery(InterfaceAnimal.class, crit);
+ QueryByCriteria queryReptile =
ojb.getQueryFactory().newQuery(Reptile.class, crit);
+ QueryByCriteria queryMammal =
ojb.getQueryFactory().newQuery(Mammal.class, crit);
Collection resultA = broker.getCollectionByQuery(queryAnimals);
Collection resultR = broker.getCollectionByQuery(queryReptile);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
