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 2003/09/19 21:34:05 UTC
cvs commit: db-ojb/src/test/org/apache/ojb/broker QueryTest.java
brj 2003/09/19 12:34:05
Modified: src/java/org/apache/ojb/broker/query Criteria.java
src/java/org/apache/ojb/broker/accesslayer/sql
SqlQueryStatement.java
src/test/org/apache/ojb/broker QueryTest.java
Log:
prefix for parent query attributes moved to criteria
Revision Changes Path
1.33 +5 -1 db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java
Index: Criteria.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/query/Criteria.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Criteria.java 13 Sep 2003 14:33:57 -0000 1.32
+++ Criteria.java 19 Sep 2003 19:34:05 -0000 1.33
@@ -87,6 +87,10 @@
public final static int OR = 0;
public final static int AND = 1;
public final static int NONE = 9;
+
+ // prefix to identify attributes referencing enclosing query
+ public static String PARENT_QUERY_PREFIX = "parentQuery.";
+
private Vector m_criteria;
private int m_type;
private boolean m_embraced;
1.56 +3 -7 db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java
Index: SqlQueryStatement.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- SqlQueryStatement.java 13 Sep 2003 14:33:57 -0000 1.55
+++ SqlQueryStatement.java 19 Sep 2003 19:34:05 -0000 1.56
@@ -102,10 +102,6 @@
private int m_aliasCount = 0;
- // prefix to identify attributes referencing enclosing query
- private static String PARENT_QUERY_PREFIX = "parentQuery.";
-
-
/**
* Constructor for SqlCriteriaStatement.
@@ -193,9 +189,9 @@
// BRJ:
// check if we refer to an attribute in the parent query
// this prefix is temporary !
- if (colName.startsWith(PARENT_QUERY_PREFIX) && m_parentStatement != null)
+ if (colName.startsWith(Criteria.PARENT_QUERY_PREFIX) && m_parentStatement != null)
{
- String[] fieldNameRef = { colName.substring(PARENT_QUERY_PREFIX.length())};
+ String[] fieldNameRef = { colName.substring(Criteria.PARENT_QUERY_PREFIX.length())};
return m_parentStatement.getAttributeInfo(fieldNameRef[0], useOuterJoins, aUserAlias);
}
1.37 +2 -2 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- QueryTest.java 13 Sep 2003 14:33:58 -0000 1.36
+++ QueryTest.java 19 Sep 2003 19:34:05 -0000 1.37
@@ -160,7 +160,7 @@
Criteria subCrit = new Criteria();
Criteria crit = new Criteria();
- subCrit.addEqualToField("productGroupId","parentQuery.groupId");
+ subCrit.addEqualToField("productGroupId",Criteria.PARENT_QUERY_PREFIX + "groupId");
subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
subQuery.setColumns(new String[]{"count(productGroupId)"});
@@ -186,7 +186,7 @@
Criteria subCrit = new Criteria();
Criteria crit = new Criteria();
- subCrit.addEqualToField("productGroupId","parentQuery.groupId");
+ subCrit.addEqualToField("productGroupId",Criteria.PARENT_QUERY_PREFIX + "groupId");
subQuery = QueryFactory.newReportQuery(Article.class, subCrit);
subQuery.setColumns(new String[]{"count(productGroupId)"});
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org