Fix failing tests and PHPCS errors.

cakephp · Aug 11, 2014 · c68ec84 · c68ec84
1 parent d1ec92f
commit c68ec84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Database/SqlDialectTrait.php b/src/Database/SqlDialectTrait.php
@@ -131,6 +131,7 @@ protected function _transformDistinct($query) {
 		}
 		return $query;
 	}
+
 /**
  *
  * Apply translation steps to delete queries.
@@ -162,7 +163,7 @@ protected function _deleteQueryTranslator($query) {
 		}
 		$conditions = $query->clause('where');
 		if ($conditions) {
-			$conditions->iterateParts(function($condition, $key) {
+			$conditions->traverse(function($condition) {
 				if (!($condition instanceof Comparison)) {
 					return $condition;
 				}

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -1894,10 +1894,10 @@ public function testDeleteWithAliasedFrom() {
 
 		$query->delete()
 			->from(['a ' => 'authors'])
-			->where(['a.id <' => 99]);
+			->where(['a.id !=' => 99]);
 
 		$result = $query->sql();
-		$this->assertQuotedQuery('DELETE <a> FROM <authors> AS <a>', $result, true);
+		$this->assertQuotedQuery('DELETE FROM <authors> WHERE <id> != :c0', $result, true);
 
 		$result = $query->execute();
 		$this->assertInstanceOf('Cake\Database\StatementInterface', $result);