RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixed a bug when saving a record with null valued boolean column

Browse source
This commit is contained in:
zYne 2006-10-02 20:51:36 +00:00
parent ba73772983
commit 6210a60611
2 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/Doctrine/Record.php
View file

@ -862,6 +862,11 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
foreach($array as $k => $v) { foreach($array as $k => $v) {
$type = $this->table->getTypeOf($v); $type = $this->table->getTypeOf($v);
if($this->data[$v] === self::$null) {
$a[$v] = null;
continue;
}
switch($type) { switch($type) {
case 'array': case 'array':
@ -881,11 +886,7 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
if($this->data[$v] instanceof Doctrine_Record) if($this->data[$v] instanceof Doctrine_Record)
$this->data[$v] = $this->data[$v]->getIncremented(); $this->data[$v] = $this->data[$v]->getIncremented();
$a[$v] = $this->data[$v];
if($this->data[$v] === self::$null)
$a[$v] = null;
else
$a[$v] = $this->data[$v];
} }
} }

44
tests/BooleanTestCase.php
View file

@ -5,28 +5,6 @@ class Doctrine_BooleanTestCase extends Doctrine_UnitTestCase {
$this->tables = array("BooleanTest"); $this->tables = array("BooleanTest");
parent::prepareTables(); parent::prepareTables();
} }
public function testSetNull() {
$test = new BooleanTest();
$this->is_working = null;
$this->assertEqual($this->is_working, null);
$this->assertEqual($test->getState(), Doctrine_Record::STATE_TDIRTY);
$test->save();
$test->refresh();
$this->assertEqual($test->is_working, null);
$test = new BooleanTest();
$this->is_working_notnull = null;
$this->assertEqual($this->is_working_notnull, false);
$this->assertEqual($test->getState(), Doctrine_Record::STATE_TDIRTY);
$test->save();
$test->refresh();
$this->assertEqual($test->is_working_notnull, false);
}
public function testSetFalse() { public function testSetFalse() {
$test = new BooleanTest(); $test = new BooleanTest();
@ -84,5 +62,27 @@ class Doctrine_BooleanTestCase extends Doctrine_UnitTestCase {
$this->assertEqual(count($ret), 1); $this->assertEqual(count($ret), 1);
} }
public function testSavingNullValue() {
$test = new BooleanTest();
$this->is_working = null;
$this->assertEqual($this->is_working, null);
$this->assertEqual($test->getState(), Doctrine_Record::STATE_TDIRTY);
$test->save();
$test->refresh();
$this->assertEqual($test->is_working, null);
$test = new BooleanTest();
$this->is_working_notnull = null;
$this->assertEqual($this->is_working_notnull, false);
$this->assertEqual($test->getState(), Doctrine_Record::STATE_TDIRTY);
$test->save();
$test->refresh();
$this->assertEqual($test->is_working_notnull, false);
}
} }
?> ?>