diff options
| author | christophe.boulain <> | 2011-01-19 14:56:01 +0000 |
|---|---|---|
| committer | christophe.boulain <> | 2011-01-19 14:56:01 +0000 |
| commit | 95b032891d6617525636cc7b680117dbb14afba7 (patch) | |
| tree | 0b9a8adf92176592894cb4f3d981c8a2e0c4f5ec /framework/Data/ActiveRecord/TActiveRecordGateway.php | |
| parent | f01b9699967b8959ce8721c1e0e3d6edeb309c52 (diff) | |
Merge last changes on "Data" from trunk
Diffstat (limited to 'framework/Data/ActiveRecord/TActiveRecordGateway.php')
| -rw-r--r-- | framework/Data/ActiveRecord/TActiveRecordGateway.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/Data/ActiveRecord/TActiveRecordGateway.php b/framework/Data/ActiveRecord/TActiveRecordGateway.php index e588b976..534bd253 100644 --- a/framework/Data/ActiveRecord/TActiveRecordGateway.php +++ b/framework/Data/ActiveRecord/TActiveRecordGateway.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo <weizhuo[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2008 PradoSoft + * @copyright Copyright © 2005-2010 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id$ * @package System.Data.ActiveRecord @@ -42,6 +42,7 @@ class TActiveRecordGateway extends TComponent */ public function __construct(TActiveRecordManager $manager) { + parent::__construct(); $this->_manager=$manager; } @@ -306,7 +307,7 @@ class TActiveRecordGateway extends TComponent if($column->getIsExcluded()) continue; $value = $record->getColumnValue($name); - if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && !$column->getDefaultValue()) + if(!$column->getAllowNull() && $value===null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) { throw new TActiveRecordException( 'ar_value_must_not_be_null', get_class($record), @@ -342,7 +343,7 @@ class TActiveRecordGateway extends TComponent if($column->getIsExcluded()) continue; $value = $record->getColumnValue($name); - if(!$column->getAllowNull() && $value===null) + if(!$column->getAllowNull() && $value===null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE)) { throw new TActiveRecordException( 'ar_value_must_not_be_null', get_class($record), |