better handling of alias removal from selects in CQL

packaged · Jan 22, 2015 · 6346466 · 6346466
1 parent ee7de73
commit 6346466
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Assembler/CQL/CqlAssembler.php b/src/Assembler/CQL/CqlAssembler.php
@@ -19,9 +19,10 @@ public function assembleSegment($segment)
   {
     if($segment instanceof FieldSelectExpression)
     {
-      return $this->assembleFieldSelect($segment);
+      $segment->setAlias(null);
     }
-    elseif($segment instanceof FieldExpression)
+
+    if($segment instanceof FieldExpression)
     {
       return $this->assembleField($segment);
     }
@@ -89,11 +90,6 @@ public function assemblePredicateSet(PredicateSet $predicate)
     );
   }
 
-  public function assembleFieldSelect(FieldSelectExpression $field)
-  {
-    return '"' . $field->getField()->getField() . '"';
-  }
-
   public function assembleTableExpression(TableExpression $expr)
   {
     return '"' . $expr->getTableName() . '"';

diff --git a/tests/Assembler/CQL/CqlAssemblerTest.php b/tests/Assembler/CQL/CqlAssemblerTest.php
@@ -10,6 +10,7 @@
 use Packaged\QueryBuilder\Predicate\BetweenPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
+use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
 
 class CqlAssemblerTest extends \PHPUnit_Framework_TestCase
@@ -96,6 +97,12 @@ public function testNoPredicates()
     $this->assertEquals('WHERE ', CqlAssembler::stringify($where));
   }
 
+  public function testCountExpression()
+  {
+    $predicate = (new CountSelectExpression())->setAlias('c');
+    $this->assertEquals('COUNT(*)', CqlAssembler::stringify($predicate));
+  }
+
   public function testTableExpression()
   {
     $this->assertEquals(