Fix failing test on SqlServer

cakephp · Aug 11, 2014 · b8c00d4 · b8c00d4
1 parent 820f522
commit b8c00d4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/Database/Expression/CaseExpression.php b/src/Database/Expression/CaseExpression.php
@@ -56,7 +56,7 @@ class CaseExpression implements ExpressionInterface {
  * @param string|array|ExpressionInterface $trueValues Value of each condition if that condition is true
  * @param string|array|ExpressionInterface $defaultValue Default value if none of the conditiosn are true
  */
-	public function __construct($conditions = [], $trueValues = [], $defaultValue = '0') {
+	public function __construct($conditions = [], $trueValues = [], $defaultValue = 0) {
 		if (!empty($conditions)) {
 			$this->add($conditions, $trueValues);
 		}
@@ -108,7 +108,7 @@ protected function _addExpressions($conditions, $trueValues) {
 				continue;
 			}
 
-			$trueValue = isset($trueValues[$k]) ? $trueValues[$k] : 1;
+			$trueValue = !empty($trueValues[$k]) ? $trueValues[$k] : 1;
 
 			if ($trueValue === 'literal') {
 				$trueValue = $k;
@@ -117,8 +117,6 @@ protected function _addExpressions($conditions, $trueValues) {
 					'value' => $trueValue,
 					'type' => null
 				];
-			} elseif (empty($trueValue)) {
-				$trueValue = 1;
 			}
 
 			$this->_conditions[] = $c;

diff --git a/src/Database/Expression/QueryExpression.php b/src/Database/Expression/QueryExpression.php
@@ -276,7 +276,7 @@ public function in($field, $values, $type = null) {
  *
  * @return QueryExpression
  */
-	public function addCase($conditions, $trueValues = [], $defaultValue = '0') {
+	public function addCase($conditions, $trueValues = [], $defaultValue = 0) {
 		return $this->add(new CaseExpression($conditions, $trueValues, $defaultValue));
 	}
 

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2722,6 +2722,8 @@ public function testDirectIsNull() {
  * @return void
  */
 	public function testSqlCaseStatement() {
+		$convert = $this->connection->driver() instanceof \Cake\Database\Driver\Sqlserver;
+
 		$query = new Query($this->connection);
 		$publishedCase = $query
 			->newExpr()
@@ -2735,6 +2737,21 @@ public function testSqlCaseStatement() {
 					->newExpr()
 					->add(['published' => 'N'])
 			);
+
+		//SQLServer requires the case statements to be converted to int
+		if ($convert) {
+			$publishedCase = $query->func()
+				->convert([
+					'INT' => 'literal',
+					$publishedCase
+				]);
+			$notPublishedCase = $query->func()
+				->convert([
+					'INT' => 'literal',
+					$notPublishedCase
+				]);
+		}
+
 		$results = $query
 			->select([
 				'published' => $query->func()->sum($publishedCase),