Merge pull request #107 from phpcr/selector_without_alias

Selector without alias

Author: lsmith77

tests/06_Query/QueryObjectSql2Test.php

@@ -115,7 +115,7 @@ public function testGetStoredQueryPath()
 
             $p = $query->getStoredQueryPath();
             $this->assertEquals('/tests_general_query/queryNode', $p);
-        } catch(exception $e) {
+        } catch(\Exception $e) {
             //FIXME: finally?
             $this->sharedFixture['ie']->import('general/base');
             throw $e;

tests/06_Query/QuerySql2OperationsTest.php

@@ -38,7 +38,7 @@ public function testQueryField()
         $this->assertEquals(array('bar'), $vals);
     }
 
-    public function testQueryFieldSomenull()
+    public function testQueryFieldSomeNull()
     {
         /** @var $query QueryInterface */
         $query = $this->sharedFixture['qm']->createQuery('
@@ -68,6 +68,28 @@ public function testQueryFieldSomenull()
     }
 
     public function testQueryFieldSelector()
+    {
+        /** @var $query QueryInterface */
+        $query = $this->sharedFixture['qm']->createQuery('
+            SELECT [nt:unstructured].foo
+            FROM [nt:unstructured]
+            WHERE [nt:unstructured].foo = "bar"
+              AND ISDESCENDANTNODE([/tests_general_base])
+            ',
+            QueryInterface::JCR_SQL2
+        );
+
+        $this->assertInstanceOf('\PHPCR\Query\QueryInterface', $query);
+        $result = $query->execute();
+        $this->assertInstanceOf('\PHPCR\Query\QueryResultInterface', $result);
+        $vals = array();
+        foreach ($result->getRows() as $row) {
+            $vals[] = $row->getValue('foo');
+        }
+        $this->assertEquals(array('bar'), $vals);
+    }
+
+    public function testQueryFieldSelectorWithAlias()
     {
         /** @var $query QueryInterface */
         $query = $this->sharedFixture['qm']->createQuery('
@@ -90,6 +112,31 @@ public function testQueryFieldSelector()
     }
 
     public function testQueryJoin()
+    {
+        /** @var $query QueryInterface */
+        $query = $this->sharedFixture['qm']->createQuery('
+            SELECT [nt:unstructured].longNumber
+            FROM [nt:file]
+              INNER JOIN [nt:unstructured]
+                ON ISDESCENDANTNODE([nt:unstructured], [nt:file])
+            WHERE [nt:unstructured].longNumber = 999
+              AND ISDESCENDANTNODE([nt:file], [/tests_general_base])
+            ',
+            QueryInterface::JCR_SQL2
+        );
+
+        $this->assertInstanceOf('\PHPCR\Query\QueryInterface', $query);
+        $result = $query->execute();
+        $this->assertInstanceOf('\PHPCR\Query\QueryResultInterface', $result);
+        $vals = array();
+
+        foreach($result->getRows() as $row) {
+            $vals[] = $row->getValue('nt:unstructured.longNumber');
+        }
+        $this->assertEquals(array(999), $vals);
+    }
+
+    public function testQueryJoinWithAlias()
     {
         /** @var $query QueryInterface */
         $query = $this->sharedFixture['qm']->createQuery('