qom always has a selector name

Author: dbu

src/PHPCR/Util/QOM/QueryBuilder.php

@@ -352,33 +352,33 @@ public function setColumns(array $columns)
      * Identifies a property in the specified or default selector to include in the tabular view of query results.
      * Replaces any previously specified columns to be selected if any.
      *
+     * @param string $selectorName
      * @param string $propertyName
      * @param string $columnName
-     * @param string $selectorName
      *
      * @return QueryBuilder This QueryBuilder instance.
      */
-    public function select($propertyName, $columnName = null, $selectorName = null)
+    public function select($selectorName, $propertyName, $columnName = null)
     {
         $this->state = self::STATE_DIRTY;
-        $this->columns = array($this->qomFactory->column($propertyName, $columnName, $selectorName));
+        $this->columns = array($this->qomFactory->column($selectorName, $propertyName, $columnName));
 
         return $this;
     }
 
     /**
      * Adds a property in the specified or default selector to include in the tabular view of query results.
      *
+     * @param string $selectorName
      * @param string $propertyName
      * @param string $columnName
-     * @param string $selectorName
      *
      * @return QueryBuilder This QueryBuilder instance.
      */
-    public function addSelect($propertyName, $columnName = null, $selectorName = null)
+    public function addSelect($selectorName, $propertyName, $columnName = null)
     {
         $this->state = self::STATE_DIRTY;
-        $this->columns[] = $this->qomFactory->column($propertyName, $columnName, $selectorName);
+        $this->columns[] = $this->qomFactory->column($selectorName, $propertyName, $columnName);
 
         return $this;
     }

src/PHPCR/Util/QOM/Sql2Generator.php

@@ -26,9 +26,9 @@ public function evalSelector($nodeTypeName, $selectorName = null)
     {
         $sql2 = $this->addBracketsIfNeeded($nodeTypeName);
 
-        $name = $selectorName;
-        if (! is_null($name)) {
-            $sql2 .= ' AS ' . $name;
+        if (! is_null($selectorName) && $nodeTypeName !== $selectorName) {
+            // if the selector name is the same as the type name, this is implicit for sql2
+            $sql2 .= ' AS ' . $selectorName;
         }
 
         return $sql2;
@@ -344,7 +344,10 @@ public function evalColumn($selectorName, $propertyName = null, $colname = null)
             $sql2 .= $this->addBracketsIfNeeded($selectorName) . '.*';
         } else {
             $sql2 .= $this->evalPropertyValue($propertyName, $selectorName);
-            $sql2 .= ! is_null($colname) ? ' AS ' . $colname : '';
+            if (!is_null($colname) && $colname !== $propertyName) {
+                // if the column name is the same as the property name, this is implicit for sql2
+                $sql2 .=  ' AS ' . $colname;
+            }
         }
 
         return $sql2;

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -2,6 +2,8 @@
 
 namespace PHPCR\Util\QOM;
 
+use PHPCR\Query\InvalidQueryException;
+
 /**
  * Split an SQL2 statement into string tokens. Allows lookup and fetching of tokens.
  *
@@ -104,7 +106,7 @@ public function expectToken($token, $case_insensitive = true)
     {
         $nextToken = $this->fetchNextToken();
         if (! $this->tokenIs($nextToken, $token, $case_insensitive)) {
-            throw new \Exception("Syntax error: Expected $token, found $nextToken");
+            throw new InvalidQueryException("Syntax error: Expected '$token', found '$nextToken' in {$this->sql2}");
         }
     }