Edited test associated with that fix

cakephp · Jan 29, 2014 · 7f7d725 · 7f7d725
1 parent b178b28
commit 7f7d725
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/ORM/Table.php b/src/ORM/Table.php
@@ -887,10 +887,9 @@ protected function _setFieldMatchers($options, $keys) {
  */
 	public function get($primaryKey, $options = []) {
 		$key = (array)$this->primaryKey();
-		if (!empty($this->_alias)) {
-			foreach($key as $index => $keyname){
-				$key[$index] = $this->_alias . '.' . $keyname;
-			}
+		$alias = $this->alias();
+		foreach ($key as $index => $keyname) {
+			$key[$index] = $alias . '.' . $keyname;
 		}
 		$conditions = array_combine($key, (array)$primaryKey);
 		$entity = $this->find('all', $options)->where($conditions)->first();

diff --git a/tests/TestCase/ORM/TableTest.php b/tests/TestCase/ORM/TableTest.php
@@ -3045,7 +3045,7 @@ public function testGet() {
 			->will($this->returnValue($query));
 
 		$query->expects($this->once())->method('where')
-			->with(['bar' => 10])
+			->with([$table->alias() . '.bar' => 10])
 			->will($this->returnSelf());
 		$query->expects($this->once())->method('first')
 			->will($this->returnValue($entity));
@@ -3088,7 +3088,7 @@ public function testGetException() {
 			->will($this->returnValue($query));
 
 		$query->expects($this->once())->method('where')
-			->with(['bar' => 10])
+			->with([$table->alias() . '.bar' => 10])
 			->will($this->returnSelf());
 		$query->expects($this->once())->method('first')
 			->will($this->returnValue(false));