unico 2004/08/10 07:40:44
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression Tag:
SLIDE_2_1_RELEASE_BRANCH
RDBMSExpressionFactory.java
Log:
propcontains expression is a proprietary extension,
put it in the slide namespace instead of DAV:
Revision Changes Path
No revision
No revision
1.9.2.1 +11 -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.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- RDBMSExpressionFactory.java 28 Jul 2004 09:34:09 -0000 1.9
+++ RDBMSExpressionFactory.java 10 Aug 2004 14:40:44 -0000 1.9.2.1
@@ -128,12 +128,6 @@
if
(RDBMSCompareExpression.COMPARE_OPERATORS.containsKey(element.getName())) {
return new RDBMSCompareExpression(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);
- }
else if (element.getName().equals(Literals.ISDEFINED)) {
return new RDBMSIsDefinedExpression(element, _context);
}
@@ -151,6 +145,14 @@
}
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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
