Fixes #10532, fixes #1780, fixes #3256, fixes #1652, fixes #760, fixes …

…#10490
phalcon · Jun 25, 2015 · ab6de6e · ab6de6e
1 parent dbfef88
commit ab6de6e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@
 - Values in LIMIT/OFFSET clause are now passed using bound parameters in PHQL
 - Allowing late state binding in both Simple/Complex results to allow override Mvc\Model::cloneResultMap
 - Added method `distinct()` in `Phalcon\Mvc\Model\Criteria` [#10536](https://github.com/phalcon/cphalcon/issues/10536)
+- Added global setting orm.ignore_unknown_columns to ignore unexpected columns when hydrating instances in the ORM
+  This fixes extra auxiliar columns used in Db\\Adapter\\Pdo\\Oracle
 
 # 2.0.3 (2015-06-10)
 - Added support for Behaviors in Phalcon\Mvc\Collection

diff --git a/config.json b/config.json
@@ -88,6 +88,10 @@
         "orm.cast_on_hydrate": {
             "type": "bool",
             "default": false
+        },
+        "orm.ignore_unknown_columns": {
+            "type": "bool",
+            "default": false
         }
     },
     "destructors": {

diff --git a/phalcon/mvc/model.zep b/phalcon/mvc/model.zep
@@ -522,7 +522,11 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
 
 					// Every field must be part of the column map
 					if !fetch attribute, columnMap[key] {
-						throw new Exception("Column '" . key . "' doesn't make part of the column map");
+						if !globals_get("orm.ignore_unknown_columns") {
+							throw new Exception("Column '" . key . "' doesn't make part of the column map");
+						} else {
+							continue;
+						}
 					}
 
 					if typeof attribute != "array" {
@@ -2897,7 +2901,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
 			}
 		}
 
-		if success === false {			
+		if success === false {
 			this->_cancelOperation();
 		} else {
 			this->fireEvent("afterSave");
@@ -4286,7 +4290,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
 	{
 		var disableEvents, columnRenaming, notNullValidations,
 			exceptionOnFailedSave, phqlLiterals, virtualForeignKeys,
-			lateStateBinding, castOnHydrate;
+			lateStateBinding, castOnHydrate, ignoreUnknownColumns;
 
 		/**
 		 * Enables/Disables globally the internal events
@@ -4343,6 +4347,13 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
         if fetch castOnHydrate, options["castOnHydrate"] {
             globals_set("orm.cast_on_hydrate", castOnHydrate);
         }
+
+		/**
+         * Allows to ignore unknown columns when hydrating objects
+         */
+        if fetch ignoreUnknownColumns, options["ignoreUnknownColumns"] {
+            globals_set("orm.ignore_unknown_columns", ignoreUnknownColumns);
+        }
 	}
 
 	/**