Author: thomasm
Date: Wed Oct 30 14:07:43 2013
New Revision: 1537096
URL: http://svn.apache.org/r1537096
Log:
OAK-1106 Query engine does not deal with remapped namespaces (reverse namespace
remapping when using select * to fill the column list)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
jackrabbit/oak/trunk/oak-jcr/pom.xml
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java?rev=1537096&r1=1537095&r2=1537096&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java
Wed Oct 30 14:07:43 2013
@@ -854,6 +854,9 @@ public class SQL2Parser {
boolean includeSelectorName) {
String selectorName = selector.getSelectorName();
for (String property : selector.getWildcardColumns()) {
+ if (namePathMapper != null) {
+ property = namePathMapper.getJcrName(property);
+ }
String columnName = property;
if (includeSelectorName) {
columnName = selectorName + "." + property;
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1537096&r1=1537095&r2=1537096&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Oct 30 14:07:43 2013
@@ -117,7 +117,6 @@
<!-- User Management -->
org.apache.jackrabbit.oak.jcr.security.user.MemberNodeImportTest
<!-- OAK-414, OAK-482 -->
- org.apache.jackrabbit.oak.jcr.security.user.RemappingTest#testQuery
<!-- OAK-1098 -->
<!-- Query -->
org.apache.jackrabbit.test.api.query.ElementTest#testElementTestNameTestSomeNTWithSNS
<!-- OAK-203 -->
