Compatibility with mongo #29

imsamurai · May 22, 2015 · 40a4c10 · 40a4c10
1 parent a10fdc0
commit 40a4c10
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/Model/Behavior/ActiveRecordBehavior.php b/Model/Behavior/ActiveRecordBehavior.php
@@ -25,12 +25,15 @@ public function setup(Model $Model, $settings = array()) {
 				static $defaultFields = null;
 				if (is_null($defaultFields)) {
 					$schema = $Model->schema();
+					$defaultFields = array();
 					if ($schema) {
-						$defaultFields = array_combine(array_keys($schema), Hash::extract($schema, '{s}.default'));
-					} else {
-						$defaultFields = array();
+						foreach ($schema as $field => $options) {
+							$defaultFields[$field] = isset($options['default']) ? $options['default'] : null;
+						}
+						$defaultFields += array(
+							$Model->primaryKey => null
+						);
 					}
-
 				}
 				return $defaultFields;
 			}