jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1202790 - in /jackrabbit/branches/2.2: ./ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java
Date Wed, 16 Nov 2011 17:19:55 GMT
Author: jukka
Date: Wed Nov 16 17:19:55 2011
New Revision: 1202790

URL: http://svn.apache.org/viewvc?rev=1202790&view=rev
Log:
2.2: Merged revision 1179124 (JCR-3089)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java
    jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 16 17:19:55 2011
@@ -3,4 +3,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064213,1064670,1065599,1065622,1066059,1066071,1066794,1069831,1071562,1071573,1071680,1072087,1074140,1077927,1077970,1079314,1079317,1080186,1080540,1082599,1082611,1082620,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-109
 8964,1099033,1099172,1100242,1100286,1101046,1102262,1102268-1102270,1102299,1102601,1104027,1126987,1128175,1129206,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179548,1180922,1181712,1182281,1182667,1182929,1183409,1185691,1186285,1186802,1187344,1188541,1188590,1198827
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,1050212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064213,1064670,1065599,1065622,1066059,1066071,1066794,1069831,1071562,1071573,1071680,1072087,1074140,1077927,1077970,1079314,1079317,1080186,1080540,1082599,1082611,1082620,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1092683,1097363,1097513-1097514,1098963-109
 8964,1099033,1099172,1100242,1100286,1101046,1102262,1102268-1102270,1102299,1102601,1104027,1126987,1128175,1129206,1130192,1130228,1132993,1136353,1136360,1138511,1141141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,1157175,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1177249,1177340,1178251,1178892,1179124,1179548,1180922,1181712,1182281,1182667,1182929,1183409,1185691,1186285,1186802,1187344,1188541,1188590,1198827

Modified: jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java?rev=1202790&r1=1202789&r2=1202790&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResourceImpl.java
Wed Nov 16 17:19:55 2011
@@ -241,9 +241,16 @@ public class SearchResourceImpl implemen
                 values.add(rv.getValue(row));
             }
 
-            // get the path for the first selector and build
-            // a webdav compliant resource path of it.
-            String itemPath = row.getPath();
+            /*
+             * get the path for the first selector and build a webdav compliant
+             * resource path based on it.
+             * 
+             * Use Row#getPath(String) which works for both simple rows and join
+             * rows (in contrast to Row#getPath()).
+             * 
+             * see also https://issues.apache.org/jira/browse/JCR-3089
+             */
+            final String itemPath = row.getPath(sn.get(0));
             // create a new ms-response for this row of the result set
             DavResourceLocator loc = locator.getFactory().createResourceLocator(locator.getPrefix(),
locator.getWorkspacePath(), itemPath, false);
             String href = loc.getHref(true);

Modified: jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java?rev=1202790&r1=1202789&r2=1202790&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/query/QueryTest.java
Wed Nov 16 17:19:55 2011
@@ -22,6 +22,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.NodeIterator;
 import javax.jcr.Node;
 import javax.jcr.NamespaceRegistry;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryResult;
 import java.util.List;
 import java.util.ArrayList;
 
@@ -55,7 +57,7 @@ public class QueryTest extends AbstractQ
         }
 
         Node n = testRootNode.addNode("spiTest:node");
-        testRootNode.save();
+        superuser.save();
 
         for (int i = 0; i < 10; i++) {
             String prefix = defaultPrefix + i;
@@ -63,4 +65,42 @@ public class QueryTest extends AbstractQ
             executeXPathQuery(superuser, testPath + "/" + prefix + ":node", new Node[]{n});
         }
     }
+
+    /**
+     * https://issues.apache.org/jira/browse/JCR-3089
+     */
+    public void testSQL2Simple() throws Exception {
+        Query q = qm.createQuery("SELECT * FROM [nt:unstructured]",
+                Query.JCR_SQL2);
+        QueryResult r = q.execute();
+        assertTrue(r.getNodes().hasNext());
+    }
+
+    /**
+     * https://issues.apache.org/jira/browse/JCR-2543
+     */
+    public void testSQL2Limit() throws Exception {
+        Query q = qm.createQuery("SELECT * FROM [nt:unstructured]",
+                Query.JCR_SQL2);
+        q.setLimit(1);
+        QueryResult r = q.execute();
+
+        NodeIterator it = r.getNodes();
+        assertTrue(it.hasNext());
+        it.next();
+        assertFalse(it.hasNext());
+    }
+
+    /**
+     * https://issues.apache.org/jira/browse/JCR-3089
+     */
+    public void testSQL2Join() throws Exception {
+        // he query is not supposed to return anything, it will just check that
+        // the back and forth between the client and the server works
+        Query q = qm
+                .createQuery(
+                        "SELECT * FROM [nt:unstructured] AS a INNER JOIN [nt:unstructured]
AS b ON b.[refid] = a.[jcr:uuid]",
+                        Query.JCR_SQL2);
+        assertNotNull(q.execute());
+    }
 }



Mime
View raw message