User: dsundstrom
Date: 01/11/13 14:26:25
Modified: src/main/org/jboss/ejb/plugins/cmp/jdbc/ejbql
EJBQLParser.java SQLTarget.java
Log:
Remove typo that caused the literal "WHERE" to be case sensitive.
Made idenfification variables case insensitive as required by the spec.
Revision Changes Path
1.8 +13 -16
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EJBQLParser.java 2001/11/06 04:21:44 1.7
+++ EJBQLParser.java 2001/11/13 22:26:25 1.8
@@ -247,7 +247,10 @@
SQLTarget target = (SQLTarget)a.getTarget();
List clause = new ArrayList();
- for(String s = a.pop().toString(); !"WHERE".equals(s); s =
a.pop().toString()) {
+ for(String s = a.pop().toString();
+ !"WHERE".equalsIgnoreCase(s);
+ s = a.pop().toString()) {
+
clause.add(s);
}
@@ -975,24 +978,16 @@
}
protected Parser identifier() {
- return new Word();
- }
-
-/*
- protected Parser inputParameter() {
- Parser inputParam = new InputParameter();
- inputParam.setAssembler(new Assembler() {
+ Word identifier = new Word();
+ identifier.setAssembler(new Assembler() {
public void workOn(Assembly a) {
- SQLTarget target = (SQLTarget)a.getTarget();
- InputParameterToken token = (InputParameterToken)a.pop();
-
- target.registerParameter(token);
- a.push("?");
+ // convert identifier to lowercase
+ // identifiers are case insensitive
+ a.push(a.pop().toString().toLowerCase());
}
});
- return inputParam;
+ return identifier;
}
-*/
protected Parser cmpField() {
Word cmpFieldParser = new Word();
@@ -1056,7 +1051,9 @@
identificationVariable.setAssembler(new Assembler() {
public void workOn(Assembly a) {
SQLTarget target = (SQLTarget)a.getTarget();
- String identifier = a.pop().toString();
+ // convert identifier to lowercase
+ // identifiers are case insensitive
+ String identifier = a.pop().toString().toLowerCase();
if(!target.isIdentifierRegistered(identifier)) {
a.setInvalid();
1.8 +2 -2
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SQLTarget.java 2001/11/06 04:21:44 1.7
+++ SQLTarget.java 2001/11/13 22:26:25 1.8
@@ -122,7 +122,7 @@
// is this a select object(o) style query?
if(selectPathList.size() == 1) {
- String identifier = (String)selectPathList.get(0);
+ String identifier = ((String)selectPathList.get(0)).toLowerCase();
// verify that the abstract schema already exists
// this method will throw an exception if the identifier
@@ -131,7 +131,7 @@
selectPath = identifier;
} else {
// select a.b.c.d style query
- String path = (String)selectPathList.get(0);
+ String path = ((String)selectPathList.get(0)).toLowerCase();
for(int i=1; i < selectPathList.size(); i++) {
// are we done yet?
if(i<selectPathList.size()-1) {
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
