unico 2004/07/08 08:22:10
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSIsDefinedExpression.java
RDBMSExpressionFactory.java
RDBMSNotIsDefinedExpression.java
Log:
fix is-defined and is-not-defined expressions
Revision Changes Path
1.2 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsDefinedExpression.java
Index: RDBMSIsDefinedExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSIsDefinedExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RDBMSIsDefinedExpression.java 4 Jul 2004 18:57:35 -0000 1.1
+++ RDBMSIsDefinedExpression.java 8 Jul 2004 15:22:10 -0000 1.2
@@ -38,7 +38,7 @@
protected String compile() {
Element property = (Element) _element.getChild(Literals.PROP,
NamespaceCache.DEFAULT_NAMESPACE).getChildren().get(0);
return "(p" + _tableIndex + ".PROPERTY_NAME = '" + property.getName() + "'
AND " +
- "p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "'";
+ "p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "')";
}
}
1.6 +10 -13
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RDBMSExpressionFactory.java 7 Jul 2004 14:22:42 -0000 1.5
+++ RDBMSExpressionFactory.java 8 Jul 2004 15:22:10 -0000 1.6
@@ -135,6 +135,12 @@
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);
+ }
+ else if (element.getName().equals(Literals.NOT_ISDEFINED)) {
+ return new RDBMSNotIsDefinedExpression(element, _context);
+ }
}
else if (element.getName().equals(Literals.ISCOLLECTION)) {
return new RDBMSIsCollectionExpression(element, _context);
@@ -142,20 +148,11 @@
else if (element.getName().equals(Literals.NOT_ISCOLLECTION)) {
return new RDBMSNotIsCollectionExpression(element, _context);
}
- else if (element.getName().equals(Literals.ISDEFINED)) {
- return new RDBMSIsDefinedExpression(element, _context);
- }
- else if (element.getName().equals(Literals.NOT_ISDEFINED)) {
- return new RDBMSNotIsDefinedExpression(element, _context);
- }
return super.createExpression(element);
}
protected IBasicExpression createSlideExpression(Element element) throws
BadQueryException {
- if (isSQLCompilableProperty(element)) {
- // TODO:
- }
- else if (element.getName().equals(Literals.ISPRINCIPAL)) {
+ if (element.getName().equals(Literals.ISPRINCIPAL)) {
return new RDBMSIsPrincipalExpression(element, _context);
}
else if (element.getName().equals(Literals.NOT_ISPRINCIPAL)) {
1.2 +4 -4
jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsDefinedExpression.java
Index: RDBMSNotIsDefinedExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/expression/RDBMSNotIsDefinedExpression.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RDBMSNotIsDefinedExpression.java 4 Jul 2004 18:57:35 -0000 1.1
+++ RDBMSNotIsDefinedExpression.java 8 Jul 2004 15:22:10 -0000 1.2
@@ -38,7 +38,7 @@
protected String compile() {
Element property = (Element) _element.getChild(Literals.PROP,
NamespaceCache.DEFAULT_NAMESPACE).getChildren().get(0);
return "NOT (p" + _tableIndex + ".PROPERTY_NAME = '" + property.getName() +
"' AND " +
- "p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "'";
+ "p" + _tableIndex + ".PROPERTY_NAMESPACE = '" +
property.getNamespaceURI() + "')";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
