[jboss-cvs] jboss-seam/src/main/org/jboss/seam/framework ...

[Gavin King]

  User: gavin   
  Date: 07/01/25 12:31:54

  Modified:    src/main/org/jboss/seam/framework  Query.java
  Log:
  use regex
  
  Revision  Changes    Path
  1.16      +2 -1      jboss-seam/src/main/org/jboss/seam/framework/Query.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Query.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Query.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Query.java	25 Jan 2007 07:58:45 -0000	1.15
  +++ Query.java	25 Jan 2007 17:31:54 -0000	1.16
  @@ -18,6 +18,7 @@
   {
      private static final Pattern FROM_PATTERN = Pattern.compile("(^|\\s)(from)\\s", Pattern.CASE_INSENSITIVE);
      private static final Pattern ORDER_PATTERN = Pattern.compile("\\s(order)(\\s)+by\\s", Pattern.CASE_INSENSITIVE);
  +   private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE);
   
      private String ejbql;
      private Integer firstResult;
  @@ -185,7 +186,7 @@
            Object parameterValue = restrictionParameters.get(i).getValue();
            if ( isRestrictionParameterSet(parameterValue) )
            {
  -            if ( builder.toString().toLowerCase().indexOf("where")>0 )
  +            if ( WHERE_PATTERN.matcher(builder).find() )
               {
                  builder.append(" and ");
               }