Do not allow CQL queries to contain null values

packaged · May 22, 2015 · 50e6848 · 50e6848
1 parent d32fa0c
commit 50e6848
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 3 deletions.
diff --git a/src/Assembler/CQL/CqlAssembler.php b/src/Assembler/CQL/CqlAssembler.php
@@ -4,12 +4,12 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Clause\CQL\AllowFilteringClause;
 use Packaged\QueryBuilder\Clause\CQL\UsingClause;
-use Packaged\QueryBuilder\Expression\FieldExpression;
-use Packaged\QueryBuilder\Expression\TableExpression;
-use Packaged\QueryBuilder\Expression\ValueExpression;
+use Packaged\QueryBuilder\Exceptions\Assembler\CqlAssemblerException;
 use Packaged\QueryBuilder\Predicate\BetweenPredicate;
+use Packaged\QueryBuilder\Predicate\EqualPredicate;
 use Packaged\QueryBuilder\Predicate\GreaterThanOrEqualPredicate;
 use Packaged\QueryBuilder\Predicate\LessThanOrEqualPredicate;
+use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 use Packaged\QueryBuilder\Predicate\PredicateSet;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
@@ -18,6 +18,13 @@ class CqlAssembler extends QueryAssembler
 {
   public function assembleSegment($segment)
   {
+    if(($segment instanceof EqualPredicate || $segment instanceof NotEqualPredicate)
+      && $segment->isNullValue()
+    )
+    {
+      throw new CqlAssemblerException("Null is not available in CQL Queries");
+    }
+
     if($segment instanceof FieldSelectExpression)
     {
       $segment->setAlias(null);

diff --git a/src/Exceptions/Assembler/CqlAssemblerException.php b/src/Exceptions/Assembler/CqlAssemblerException.php
@@ -0,0 +1,6 @@
+<?php
+namespace Packaged\QueryBuilder\Exceptions\Assembler;
+
+class CqlAssemblerException extends QueryBuilderAssemblerException
+{
+}
diff --git a/src/Exceptions/Assembler/QueryBuilderAssemblerException.php b/src/Exceptions/Assembler/QueryBuilderAssemblerException.php
@@ -0,0 +1,8 @@
+<?php
+namespace Packaged\QueryBuilder\Exceptions\Assembler;
+
+use Packaged\QueryBuilder\Exceptions\QueryBuilderException;
+
+class QueryBuilderAssemblerException extends QueryBuilderException
+{
+}
diff --git a/src/Exceptions/QueryBuilderException.php b/src/Exceptions/QueryBuilderException.php
@@ -0,0 +1,6 @@
+<?php
+namespace Packaged\QueryBuilder\Exceptions;
+
+class QueryBuilderException extends \Exception
+{
+}
diff --git a/tests/Assembler/CQL/CqlAssemblerTest.php b/tests/Assembler/CQL/CqlAssemblerTest.php
@@ -2,7 +2,9 @@
 namespace Packaged\Tests\QueryBuilder\Assembler\CQL;
 
 use Packaged\QueryBuilder\Assembler\CQL\CqlAssembler;
+use Packaged\QueryBuilder\Builder\QueryBuilder;
 use Packaged\QueryBuilder\Clause\WhereClause;
+use Packaged\QueryBuilder\Exceptions\Assembler\CqlAssemblerException;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\Expression\StringExpression;
@@ -66,6 +68,17 @@ public function testAllSelect()
     $this->assertEquals('*', CqlAssembler::stringify($selector));
   }
 
+  /**
+   * @expectedException \Packaged\QueryBuilder\Exceptions\Assembler\CqlAssemblerException
+   * @expectedExceptionMessage Null is not available in CQL Queries
+   */
+  public function testEmptySelect()
+  {
+    CqlAssembler::stringify(
+      QueryBuilder::select()->from('table')->where(['id' => null])
+    );
+  }
+
   public function testTableName()
   {
     $this->assertEquals(