Merge pull request #29 from dantleech/fix_root_descendent_query

Fixed edge case for getPathForDescendantQuery

Author: dbu

src/PHPCR/Util/Console/Command/QueryCommand.php

@@ -58,14 +58,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $query->setOffset($offset);
         }
 
+        $output->writeln(sprintf('<info>Executing, language:</info> %s', $query->getLanguage()));
+
+        $start = microtime(true);
         $result = $query->execute();
+        $elapsed = microtime(true) - $start; 
+
         $output->writeln("Results:\n");
         foreach ($result as $i => $row) {
             $output->writeln("\n".($i+1).'. Row (Path: '. $row->getPath() .', Score: '. $row->getScore() .'):');
             foreach ($row as $column => $value) {
                 $output->writeln("$column: $value");
             }
         }
+        $output->writeln(sprintf('<info>%.2f seconds</info>', $elapsed));
 
         return 0;
     }

src/PHPCR/Util/QOM/QueryBuilder.php

@@ -412,7 +412,7 @@ public function getSource()
      *
      * @return QueryBuilder This QueryBuilder instance.
      *
-     * @trows RuntimeException if there is not an existing source.
+     * @throws RuntimeException if there is not an existing source.
      */
     public function join(SourceInterface $rightSource, JoinConditionInterface $joinCondition)
     {
@@ -427,7 +427,7 @@ public function join(SourceInterface $rightSource, JoinConditionInterface $joinC
      *
      * @return QueryBuilder This QueryBuilder instance.
      *
-     * @trows RuntimeException if there is not an existing source.
+     * @throws RuntimeException if there is not an existing source.
      */
     public function innerJoin(SourceInterface $rightSource, JoinConditionInterface $joinCondition)
     {
@@ -442,7 +442,7 @@ public function innerJoin(SourceInterface $rightSource, JoinConditionInterface $
      *
      * @return QueryBuilder This QueryBuilder instance.
      *
-     * @trows RuntimeException if there is not an existing source.
+     * @throws RuntimeException if there is not an existing source.
      */
     public function leftJoin(SourceInterface $rightSource, JoinConditionInterface $joinCondition)
     {
@@ -457,7 +457,7 @@ public function leftJoin(SourceInterface $rightSource, JoinConditionInterface $j
      *
      * @return QueryBuilder This QueryBuilder instance.
      *
-     * @trows RuntimeException if there is not an existing source.
+     * @throws RuntimeException if there is not an existing source.
      */
     public function rightJoin(SourceInterface $rightSource, JoinConditionInterface $joinCondition)
     {
@@ -473,7 +473,7 @@ public function rightJoin(SourceInterface $rightSource, JoinConditionInterface $
      *
      * @return QueryBuilder This QueryBuilder instance.
      *
-     * @trows RuntimeException if there is not an existing source.
+     * @throws RuntimeException if there is not an existing source.
      */
     public function joinWithType(SourceInterface $rightSource, $joinType, JoinConditionInterface $joinCondition)
     {

src/PHPCR/Util/QOM/Sql1Generator.php

@@ -26,9 +26,13 @@ public function evalSelector($nodeTypeName, $selectorName = null)
 
     protected function getPathForDescendantQuery($path)
     {
-        $path = trim($path,"\"'/");
-        $sql1 = "/" . str_replace("/","[%]/",$path) ;
-        $sql1 .= "[%]/%";
+        if ($path == '/') {
+            $sql1 = '/%';
+        } else {
+            $path = trim($path,"\"'/");
+            $sql1 = "/" . str_replace("/","[%]/",$path) ;
+            $sql1 .= "[%]/%";
+        }
 
         return $sql1;
     }

tests/PHPCR/Tests/Util/QOM/Sql1GeneratorTest.php

@@ -45,12 +45,18 @@ public function testDoubleLiteral()
 
     public function testChildNode()
     {
+        $literal = $this->generator->evalChildNode("/");
+        $this->assertSame("jcr:path LIKE '/%' AND NOT jcr:path LIKE '/%/%'", $literal);
+
         $literal = $this->generator->evalChildNode("/foo/bar/baz");
         $this->assertSame("jcr:path LIKE '/foo[%]/bar[%]/baz[%]/%' AND NOT jcr:path LIKE '/foo[%]/bar[%]/baz[%]/%/%'", $literal);
     }
 
     public function testDescendantNode()
     {
+        $literal = $this->generator->evalDescendantNode("/");
+        $this->assertSame("jcr:path LIKE '/%'", $literal);
+
         $literal = $this->generator->evalDescendantNode("/foo/bar/baz");
         $this->assertSame("jcr:path LIKE '/foo[%]/bar[%]/baz[%]/%'", $literal);
     }