unico 2004/10/01 04:22:03
Modified: src/stores/org/apache/slide/store/impl/rdbms/expression
RDBMSExpressionFactory.java
Log:
complete list of live properties that are not to be queried over SQL
Revision Changes Path
1.13 +13 -7
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- RDBMSExpressionFactory.java 28 Sep 2004 13:36:32 -0000 1.12
+++ RDBMSExpressionFactory.java 1 Oct 2004 11:22:02 -0000 1.13
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.Set;
import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.search.BadQueryException;
@@ -38,6 +39,8 @@
import org.apache.slide.search.basic.Literals;
import org.apache.slide.store.impl.rdbms.AbstractRDBMSStore;
import org.apache.slide.store.impl.rdbms.RDBMSComparableResourcesPool;
+import org.apache.slide.webdav.util.AclConstants;
+import org.apache.slide.webdav.util.DeltavConstants;
import org.jdom.Element;
/**
@@ -46,10 +49,13 @@
*/
public class RDBMSExpressionFactory extends BasicExpressionFactory {
- private static final HashSet UNCOMPILABLE_PROPERTIES = new HashSet(11);
+ private static final Set LIVE_PROPERTIES = new HashSet();
+
static {
- UNCOMPILABLE_PROPERTIES.add("DAV:lockdiscovery");
- UNCOMPILABLE_PROPERTIES.add("DAV:supportedlock");
+ LIVE_PROPERTIES.addAll(DeltavConstants.DELTAV_PROPERTY_LIST);
+ LIVE_PROPERTIES.addAll(AclConstants.ACL_PROPERTY_LIST);
+ LIVE_PROPERTIES.add("lockdiscovery");
+ LIVE_PROPERTIES.add("supportedlock");
}
private final AbstractRDBMSStore _store;
@@ -181,7 +187,7 @@
}
public static boolean isSQLCompilableProperty(String namespace, String name) {
- return !UNCOMPILABLE_PROPERTIES.contains(namespace + name);
+ return "DAV:".equals(namespace) && !LIVE_PROPERTIES.contains(name);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
