refactorred Model to use RelationalMappingUtil

Author: Raaghu

src/Persist/Model.php

@@ -523,7 +523,7 @@ private static function generateClauses($connection, &$classList,$filters,$sort,
     			$_prefix = $prefix;
     			$_columnName = $field['columnName'];
 
-    			if(isset($field['foreignField'])){
+    			if(RelationalMappingUtil::_isForeignField($field)){
 
     				$foreignClassAndField = preg_split("/\-\>/",$field['foreignField']);
     				$foreignClassName = $foreignClassAndField[0];
@@ -762,7 +762,7 @@ protected function setAttributes($args){
                 $reflectionClass = new \ReflectionClass($className);
                 $fields = $class['fields'];
                 foreach($fields as $fieldName=>$field){
-                    if(isset($field['set']) && (strtoupper($field['set']) == "TRUE" || $field['set'] === true )){
+                    if(RelationalMappingUtil::_isSet($field)){
                         if(isset($args[$fieldName])){
 
                             $value = $args[$fieldName];
@@ -784,7 +784,7 @@ protected function setAttributes($args){
                                 }
                             }
 
-                            if($field['foreignField']){
+                            if(RelationalMappingUtil::_isForeignField($field)){
                                 $foreignClassAndField = preg_split("/\-\>/",$field['foreignField']);
                                 $foreignClassName = $foreignClassAndField[0];
                                 $foreignFieldName = $foreignClassAndField[1];
@@ -793,7 +793,7 @@ protected function setAttributes($args){
 
                                 $foreignPrimaryField = (object)array();
                                 foreach($foreignClassConf['fields'] as $foreignField){
-                                    if(isset($foreignField['primary']) && (strtoupper($foreignField['primary']) == "TRUE" || $foreignField['primary'] === true) ){
+                                    if(RelationalMappingUtil::_isPrimary($foreignField)){
                                         $foreignPrimaryField = $foreignField;
                                         break;
                                     }
@@ -917,7 +917,7 @@ protected function getAttributes($args){
                 $fields = $class['fields'];
                 foreach($fields as $fieldName=>$field){
 
-                    if(isset($field['get']) && (strtoupper($field['get']) == "TRUE" || $field['get'] === true )){
+                    if(RelationalMappingUtil::_isGet($field)){
                         if(in_array($fieldName,$args)){
                             $reflectionProperty = $reflectionClass->getProperty($fieldName);
                             $reflectionProperty->setAccessible(true);
@@ -950,7 +950,7 @@ private function recordIdentifier($className,$class){
     		$recordIdentifier = $fields[$primaryKey]['columnName']." = '$keyValue'";
     	}else{
     		foreach($fields as $fieldName=>$field){
-    			if(isset($field['columnName']) && !isset($field['foreignField'])){
+    			if(isset($field['columnName']) && !RelationalMappingUtil::_isForeignField($field)){
     				$reflectionProperty = $reflectionClass->getProperty($fieldName);
     				$reflectionProperty->setAccessible(true);
     				$fieldValue = $reflectionProperty->getValue($this);

src/Persist/RelationalMappingUtil.php

@@ -49,27 +49,27 @@ public static function getReferenceKey(&$classInfo){
 		return null;
 	}
 
-	public static function _isSet(&$field){
+	public static function _isSet($field){
 		return isset($field['set']) && (strtoupper($field['set']) == "TRUE" || $field['set'] === true);
 	}
 
-	public static function _isGet(&$field){
+	public static function _isGet($field){
 		return isset($field['get']) && (strtoupper($field['get']) == "TRUE" || $field['get'] === true);
 	}
 
-	public static function _isPrimary(&$field){
+	public static function _isPrimary($field){
 		return isset($field['primary']) && (strtoupper($field['primary']) == "TRUE" || $field['primary'] === true);
 	}
 
-	public static function _isReference(&$field){
+	public static function _isReference($field){
 		return isset($field['reference']) && (strtoupper($field['reference']) == "TRUE" || $field['reference'] === true);
 	}
 
-	public static function _isAutoIncrement(&$field){
+	public static function _isAutoIncrement($field){
 		return isset($field['autoIncrement']) && (strtoupper($field['autoIncrement']) == "TRUE" || $field['autoIncrement'] === true);
 	}
 
-	public static function _isForeignField(&$field){
+	public static function _isForeignField($field){
 		return isset($field['foreignField']);
 	}