Fixing issue where id = null could cause SQL errors when saving more …

…than one record with a null id. Fixes #675
cakephp · May 12, 2010 · 6add43a · 6add43a
1 parent 3539660
commit 6add43a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
@@ -1281,7 +1281,7 @@ function save($data = null, $validate = true, $fieldList = array()) {
 			}
 		}
 
-		if (isset($this->data[$this->alias][$this->primaryKey]) && empty($this->data[$this->alias][$this->primaryKey])) {
+		if (empty($this->data[$this->alias][$this->primaryKey])) {
 			unset($this->data[$this->alias][$this->primaryKey]);
 		}
 		$fields = $values = array();

diff --git a/cake/tests/cases/libs/model/model_write.test.php b/cake/tests/cases/libs/model/model_write.test.php
@@ -905,13 +905,14 @@ function testSaveWithCreate() {
  * @return void
  */
 	function testSaveWithNullId() {
+		$this->loadFixtures('User');
 		$User =& new User();
 		$User->read(null, 1);
 		$User->data['User']['id'] = null;
 		$this->assertTrue($User->save(array('password' => 'test')));
 		$this->assertTrue($User->id > 0);
 
-		$User->read(null, 2);
+		$result = $User->read(null, 2);
 		$User->data['User']['id'] = null;
 		$this->assertTrue($User->save(array('password' => 'test')));
 		$this->assertTrue($User->id > 0);