cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression RDBMSExpressionFactory.java

[unico]

unico       2004/08/10 07:40:17

  Modified:    src/stores/org/apache/slide/store/impl/rdbms/expression
                        RDBMSExpressionFactory.java
  Log:
  check if compilable property
  
  Revision  Changes    Path
  1.11      +13 -9     
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java
  
  Index: RDBMSExpressionFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSExpressionFactory.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RDBMSExpressionFactory.java       10 Aug 2004 13:47:59 -0000      1.10
  +++ RDBMSExpressionFactory.java       10 Aug 2004 14:40:17 -0000      1.11
  @@ -41,6 +41,8 @@
   import org.jdom.Element;
   
   /**
  + * DASL Basic search expression factory that compiles query expressions
  + * to native SQL queries.
    */
   public class RDBMSExpressionFactory extends BasicExpressionFactory {
       
  @@ -145,17 +147,19 @@
       }
   
       protected IBasicExpression createSlideExpression(Element element) throws 
BadQueryException {
  +        if (isSQLCompilableProperty(element)) {
  +            if (element.getName().equals(Literals.PROPCONTAINS)) {
  +                return new RDBMSPropContainsExpression(element, _context);
  +            }
  +            else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
  +                return new RDBMSNotPropContainsExpression(element, _context);
  +            }
  +        }
           if (element.getName().equals(Literals.ISPRINCIPAL)) {
               return new RDBMSIsPrincipalExpression(element, _context);
           }
           else if (element.getName().equals(Literals.NOT_ISPRINCIPAL)) {
               return new RDBMSNotIsPrincipalExpression(element, _context);
  -        }
  -        else if (element.getName().equals(Literals.PROPCONTAINS)) {
  -            return new RDBMSPropContainsExpression(element, _context);
  -        }
  -        else if (element.getName().equals(Literals.NOT_PROPCONTAINS)) {
  -            return new RDBMSNotPropContainsExpression(element, _context);
           }
           return super.createExpression(element);
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]