Cql does not accept the table name prepended to *

packaged · Nov 20, 2014 · 5ce7226 · 5ce7226
1 parent 995216e
commit 5ce7226
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/Assembler/CQL/CqlAssembler.php b/src/Assembler/CQL/CqlAssembler.php
@@ -9,12 +9,17 @@
 use Packaged\QueryBuilder\Predicate\GreaterThanOrEqualPredicate;
 use Packaged\QueryBuilder\Predicate\LessThanOrEqualPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
+use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
 class CqlAssembler extends MySQLAssembler
 {
   public function assembleSegment($segment)
   {
-    if($segment instanceof BetweenPredicate)
+    if($segment instanceof AllSelectExpression)
+    {
+      $segment->setTable(null);
+    }
+    else if($segment instanceof BetweenPredicate)
     {
       return $this->assembleBetween($segment);
     }

diff --git a/tests/Assembler/CQL/CqlAssemblerTest.php b/tests/Assembler/CQL/CqlAssemblerTest.php
@@ -6,6 +6,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
 use Packaged\QueryBuilder\Predicate\BetweenPredicate;
+use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
 class CqlAssemblerTest extends \PHPUnit_Framework_TestCase
 {
@@ -43,6 +44,14 @@ public function testBetween()
     );
   }
 
+  public function testAllSelect()
+  {
+    $selector = new AllSelectExpression();
+    $this->assertEquals('*', CqlAssembler::stringify($selector));
+    $selector->setTable('test');
+    $this->assertEquals('*', CqlAssembler::stringify($selector));
+  }
+
   public function testTableName()
   {
     $this->assertEquals(