[jboss-cvs] JBossAS SVN: r63348 - in branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp: jdbc and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2007-06-05 09:56:47 -0400 (Tue, 05 Jun 2007)
New Revision: 63348

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/BasicVisitor.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/SQLUtil.java
Log:
JBAS-4463

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/BasicVisitor.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/BasicVisitor.java	2007-06-05 13:49:50 UTC (rev 63347)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/ejbql/BasicVisitor.java	2007-06-05 13:56:47 UTC (rev 63348)
@@ -198,8 +198,9 @@
       node.jjtGetChild(1).jjtAccept(this, data);
       if(node.jjtGetNumChildren() == 3)
       {
-         buf.append(SQLUtil.ESCAPE);
+         buf.append(" {ESCAPE ");
          node.jjtGetChild(2).jjtAccept(this, data);
+         buf.append('}');
       }
       return data;
    }

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2007-06-05 13:49:50 UTC (rev 63347)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2007-06-05 13:56:47 UTC (rev 63348)
@@ -631,8 +631,9 @@
       node.jjtGetChild(1).jjtAccept(this, data);
       if(node.jjtGetNumChildren() == 3)
       {
-         buf.append(SQLUtil.ESCAPE);
+         buf.append(" {ESCAPE ");         
          node.jjtGetChild(2).jjtAccept(this, data);
+         buf.append('}');
       }
       return data;
    }

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/SQLUtil.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/SQLUtil.java	2007-06-05 13:49:50 UTC (rev 63347)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/SQLUtil.java	2007-06-05 13:56:47 UTC (rev 63348)
@@ -77,7 +77,6 @@
    public static final String BETWEEN = " BETWEEN ";
    public static final String LIKE = " LIKE ";
    public static final String MEMBER_OF = " MEMBER OF ";
-   public static final String ESCAPE = " ESCAPE ";
    public static final String CONCAT = "CONCAT";
    public static final String SUBSTRING = "SUBSTRING";
    public static final String LCASE = "LCASE";