boolean expression should prepare/output a boolean

packaged · Feb 11, 2015 · 006ecac · 006ecac
1 parent 344a9e4
commit 006ecac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/Assembler/Segments/ExpressionAssembler.php b/src/Assembler/Segments/ExpressionAssembler.php
@@ -89,8 +89,8 @@ public function assembleNumericExpression(NumericExpression $expr)
 
   public function assembleBooleanExpression(BooleanExpression $expr)
   {
-    return $this->_assemblePrepared((int)$expr->getValue())
-      ?: (int)$expr->getValue();
+    return $this->_assemblePrepared($expr->getValue())
+      ?: ($expr->getValue() ? 'true' : 'false');
   }
 
   public function assembleArithmeticExpression(

diff --git a/tests/Expression/BooleanExpressionTest.php b/tests/Expression/BooleanExpressionTest.php
@@ -12,31 +12,31 @@ public function testBoolean()
   {
     $expression = new BooleanExpression();
     $expression->setValue(true);
-    $this->assertEquals(1, QueryAssembler::stringify($expression));
+    $this->assertEquals('true', QueryAssembler::stringify($expression));
     $expression->setValue(1);
-    $this->assertEquals(1, QueryAssembler::stringify($expression));
+    $this->assertEquals('true', QueryAssembler::stringify($expression));
     $expression->setValue('abc');
-    $this->assertEquals(1, QueryAssembler::stringify($expression));
+    $this->assertEquals('true', QueryAssembler::stringify($expression));
 
     $expression->setValue(false);
-    $this->assertEquals(0, QueryAssembler::stringify($expression));
+    $this->assertEquals('false', QueryAssembler::stringify($expression));
     $expression->setValue(0);
-    $this->assertEquals(0, QueryAssembler::stringify($expression));
+    $this->assertEquals('false', QueryAssembler::stringify($expression));
     $expression->setValue('');
-    $this->assertEquals(0, QueryAssembler::stringify($expression));
+    $this->assertEquals('false', QueryAssembler::stringify($expression));
 
     $stmt = QueryBuilder::update('tbl', ['field' => $expression]);
     $assembler = new QueryAssembler($stmt);
     $this->assertEquals('UPDATE tbl SET field = ?', $assembler->getQuery());
-    $this->assertEquals([0], $assembler->getParameters());
+    $this->assertEquals([false], $assembler->getParameters());
   }
 
   public function testBooleanValue()
   {
     $expression = new ValueExpression();
     $expression->setValue(true);
-    $this->assertEquals(1, QueryAssembler::stringify($expression));
+    $this->assertEquals('true', QueryAssembler::stringify($expression));
     $expression->setValue(false);
-    $this->assertEquals(0, QueryAssembler::stringify($expression));
+    $this->assertEquals('false', QueryAssembler::stringify($expression));
   }
 }