User: dsundstrom
Date: 01/08/18 20:32:24
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql
EJBQLParser.java SQLTarget.java
Log:
Changed ejb-ql command to set select distinct when an Set is to be returned.
Revision Changes Path
1.2 +8 -5
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql/EJBQLParser.java
Index: EJBQLParser.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql/EJBQLParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBQLParser.java 2001/08/18 15:53:20 1.1
+++ EJBQLParser.java 2001/08/19 03:32:24 1.2
@@ -203,22 +203,25 @@
if(element.equalsIgnoreCase("SELECT"))
{
Collections.reverse(path);
- target.setSelectPath(path,
false);
+ target.setSelectPath(path);
return;
}
if(element.equalsIgnoreCase("DISTINCT")) {
a.pop(); // pop the word
'SELECT'
+ target.setSelectDistinct(true);
Collections.reverse(path);
- target.setSelectPath(path,
true);
+ target.setSelectPath(path);
return;
}
if(element.equalsIgnoreCase("OBJECT"))
{
- boolean isDistinct =
"DISTINCT".equalsIgnoreCase(a.pop().toString());
- if(isDistinct) {
+ // pop the next word (will be
distinct or select)
+ String word =
a.pop().toString();
+
if("DISTINCT".equalsIgnoreCase(word)) {
+
target.setSelectDistinct(true);
a.pop(); // pop the
word 'SELECT'
}
Collections.reverse(path);
- target.setSelectPath(path,
isDistinct);
+ target.setSelectPath(path);
return;
}
path.add(element);
1.2 +4 -1
jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql/SQLTarget.java
Index: SQLTarget.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql/SQLTarget.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SQLTarget.java 2001/08/18 15:53:20 1.1
+++ SQLTarget.java 2001/08/19 03:32:24 1.2
@@ -69,8 +69,11 @@
whereClause = target.whereClause;
}
- public void setSelectPath(List selectPath, boolean isSelectDistinct) {
+ public void setSelectDistinct(boolean isSelectDistinct) {
this.isSelectDistinct = isSelectDistinct;
+ }
+
+ public void setSelectPath(List selectPath) {
this.selectPath = selectPath;
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
