added check column

a97f6387 · Vladimir Zbrailov · 6de3e144 · a97f6387
Commit a97f6387 authored Feb 02, 2014 by Vladimir Zbrailov
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

ActiveRecord.php framework/db/ActiveRecord.php +4 -0

No files found.
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -284,8 +284,12 @@ class ActiveRecord extends BaseActiveRecord
 		$schema = static::getTableSchema();
 		foreach ($row as $name => $value) {
 			if (isset($columns[$name])) {
+				if ($schema->getColumn($name) !== null) {
 					$record->setAttribute($name, $schema->getColumn($name)->typecast($value));
 				} else {
+					$record->setAttribute($name, $value);
+				}
+			} else {
 				$record->$name = $value;
 			}
 		}