Added $skipIfSet to ActiveRecord::loadDefaultValues

framework/db/ActiveRecord.php

@@ -96,12 +96,13 @@ class ActiveRecord extends BaseActiveRecord
     /**
      * Loads default values from database table schema
      *
+     * @param boolean $skipIfSet if existing value should be preserved
      * @return static model instance
      */
-    public function loadDefaultValues()
+    public function loadDefaultValues($skipIfSet = true)
     {
         foreach ($this->getTableSchema()->columns as $column) {
-            if ($column->defaultValue) {
+            if ($column->defaultValue && !($skipIfSet && $this->{$column->name} !== null)) {
                 $this->{$column->name} = $column->defaultValue;
             }
         }

tests/unit/framework/db/ActiveRecordTest.php

@@ -505,5 +505,17 @@ class ActiveRecordTest extends DatabaseTestCase
         } else {
             $this->assertEquals('2002-01-01 00:00:00', $model->time);
         }
+
+        $model = new Type();
+        $model->char_col2 = 'not something';
+
+        $model->loadDefaultValues();
+        $this->assertEquals('not something', $model->char_col2);
+
+        $model = new Type();
+        $model->char_col2 = 'not something';
+
+        $model->loadDefaultValues(false);
+        $this->assertEquals('something', $model->char_col2);
     }
 }