pradosoft / prado

framework/Data/ActiveRecord/TActiveRecord.php

Spacing +55 added lines, -55 removed lines

@@ -228,11 +228,11 @@ 
 	 */
 	public function __construct($data = [], $connection = null)
 	{
-		if($connection !== null)
+		if ($connection !== null)
 			$this->setDbConnection($connection);
 		$this->setupColumnMapping();
 		$this->setupRelations();
-		if(!empty($data)) //$data may be an object
+		if (!empty($data)) //$data may be an object
 			$this->copyFrom($data);
 	}
 
@@ -246,7 +246,7 @@ 
 	 */
 	public function __get($name)
 	{
-		if($this->hasRecordRelation($name) && !$this->canGetProperty($name))
+		if ($this->hasRecordRelation($name) && !$this->canGetProperty($name))
 		{
 			$this->fetchResultsFor($name);
 			return $this->$name;
@@ -264,7 +264,7 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
+		if ($this->hasRecordRelation($name) && !$this->canSetProperty($name))
 			$this->$name = $value;
 		else
 			parent::__set($name, $value);
@@ -276,7 +276,7 @@ 
 	private function setupColumnMapping()
 	{
 		$className = get_class($this);
-		if(!isset(self::$_columnMapping[$className]))
+		if (!isset(self::$_columnMapping[$className]))
 		{
 			$class = new ReflectionClass($className);
 			self::$_columnMapping[$className] = $class->getStaticPropertyValue('COLUMN_MAPPING');
@@ -289,12 +289,12 @@ 
 	private function setupRelations()
 	{
 		$className = get_class($this);
-		if(!isset(self::$_relations[$className]))
+		if (!isset(self::$_relations[$className]))
 		{
 			$class = new ReflectionClass($className);
 			$relations = [];
-			foreach($class->getStaticPropertyValue('RELATIONS') as $key => $value)
-				$relations[strtolower($key)] = [$key,$value];
+			foreach ($class->getStaticPropertyValue('RELATIONS') as $key => $value)
+				$relations[strtolower($key)] = [$key, $value];
 			self::$_relations[$className] = $relations;
 		}
 	}
@@ -305,18 +305,18 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_object($data))
+		if (is_object($data))
 			$data = get_object_vars($data);
-		if(!is_array($data))
+		if (!is_array($data))
 			throw new TActiveRecordException('ar_data_invalid', get_class($this));
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 			$this->setColumnValue($name, $value);
 	}
 
 
 	public static function getActiveDbConnection()
 	{
-		if(($db = self::getRecordManager()->getDbConnection()) !== null)
+		if (($db = self::getRecordManager()->getDbConnection()) !== null)
 			$db->setActive(true);
 		return $db;
 	}
@@ -328,7 +328,7 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
+		if ($this->_connection === null)
 			$this->_connection = self::getActiveDbConnection();
 		return $this->_connection;
 	}
@@ -359,19 +359,19 @@ 
 	 */
 	public function equals(TActiveRecord $record, $strict = false)
 	{
-		if($record === null || get_class($this) !== get_class($record))
+		if ($record === null || get_class($this) !== get_class($record))
 			return false;
 		$tableInfo = $this->getRecordTableInfo();
 		$pks = $tableInfo->getPrimaryKeys();
 		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
 		$equals = true;
-		foreach($properties as $prop)
+		foreach ($properties as $prop)
 		{
-			if($strict)
+			if ($strict)
 				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
 			else
 				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
-			if(!$equals)
+			if (!$equals)
 				return false;
 		}
 		return $equals;
@@ -389,7 +389,7 @@ 
 	public static function finder($className = __CLASS__)
 	{
 		static $finders = [];
-		if(!isset($finders[$className]))
+		if (!isset($finders[$className]))
 		{
 			$f = Prado::createComponent($className);
 			$finders[$className] = $f;
@@ -423,19 +423,19 @@ 
 	{
 		$gateway = $this->getRecordGateway();
 		$param = new TActiveRecordChangeEventParameter();
-		if($this->_recordState === self::STATE_NEW)
+		if ($this->_recordState === self::STATE_NEW)
 		{
 			$this->onInsert($param);
-			if($param->getIsValid() && $gateway->insert($this))
+			if ($param->getIsValid() && $gateway->insert($this))
 			{
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
 		}
-		elseif($this->_recordState === self::STATE_LOADED)
+		elseif ($this->_recordState === self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
-			if($param->getIsValid() && $gateway->update($this))
+			if ($param->getIsValid() && $gateway->update($this))
 				return true;
 		}
 		else
@@ -451,12 +451,12 @@ 
 	 */
 	public function delete()
 	{
-		if($this->_recordState === self::STATE_LOADED)
+		if ($this->_recordState === self::STATE_LOADED)
 		{
 			$gateway = $this->getRecordGateway();
 			$param = new TActiveRecordChangeEventParameter();
 			$this->onDelete($param);
-			if($param->getIsValid() && $gateway->delete($this))
+			if ($param->getIsValid() && $gateway->delete($this))
 			{
 				$this->_recordState = self::STATE_DELETED;
 				return true;
@@ -493,9 +493,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
-		return $this->getRecordGateway()->deleteRecordsByPk($this, (array)$keys);
+		return $this->getRecordGateway()->deleteRecordsByPk($this, (array) $keys);
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		return $this->deleteByPk($keys);
 	}
@@ -539,7 +539,7 @@ 
 	protected function populateObjects($reader)
 	{
 		$result = [];
-		foreach($reader as $data)
+		foreach ($reader as $data)
 			$result[] = $this->populateObject($data);
 		return $result;
 	}
@@ -555,7 +555,7 @@ 
 	 */
 	public static function createRecord($type, $data)
 	{
-		if(empty($data))
+		if (empty($data))
 			return null;
 		$record = new $type($data);
 		$record->_recordState = self::STATE_LOADED;
@@ -598,7 +598,7 @@ 
 	public function findAll($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
+		if ($criteria !== null)
 			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
 		$result = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
@@ -618,9 +618,9 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
+		if ($keys === null)
 			return null;
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
 		$data = $this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
@@ -645,9 +645,9 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
+		if (func_num_args() > 1)
 			$keys = func_get_args();
-		$result = $this->getRecordGateway()->findRecordsByPks($this, (array)$keys);
+		$result = $this->getRecordGateway()->findRecordsByPks($this, (array) $keys);
 		return $this->populateObjects($result);
 	}
 
@@ -711,7 +711,7 @@ 
 	public function count($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
+		if ($criteria !== null)
 			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
 		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
@@ -725,7 +725,7 @@ 
 	 */
 	protected function getRelationHandler($name, $args = [])
 	{
-		if(($context = $this->createRelationContext($name)) !== null)
+		if (($context = $this->createRelationContext($name)) !== null)
 		{
 			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
@@ -745,7 +745,7 @@ 
 	 */
 	protected function createRelationContext($name)
 	{
-		if(($definition = $this->getRecordRelation($name)) !== null)
+		if (($definition = $this->getRecordRelation($name)) !== null)
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this, $property, $relation);
@@ -791,7 +791,7 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if(($context = $this->createRelationContext($property)) !== null)
+		if (($context = $this->createRelationContext($property)) !== null)
 			return $context->getRelationHandler()->fetchResultsInto($this);
 		else
 			return false;
@@ -829,29 +829,29 @@ 
 	public function __call($method, $args)
 	{
 		$delete = false;
-		if(strncasecmp($method, 'with', 4) === 0)
+		if (strncasecmp($method, 'with', 4) === 0)
 		{
 			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
 		}
-		elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
+		elseif ($findOne = strncasecmp($method, 'findby', 6) === 0)
 			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
-		elseif(strncasecmp($method, 'findallby', 9) === 0)
+		elseif (strncasecmp($method, 'findallby', 9) === 0)
 			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		elseif($delete = strncasecmp($method, 'deleteby', 8) === 0)
+		elseif ($delete = strncasecmp($method, 'deleteby', 8) === 0)
 			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
-		elseif($delete = strncasecmp($method, 'deleteallby', 11) === 0)
+		elseif ($delete = strncasecmp($method, 'deleteallby', 11) === 0)
 			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
 		else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
+			if ($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
 				throw new TActiveRecordException('ar_invalid_finder_method', $method);
 			else
 				return null;
 		}
 
 		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
-		if($delete)
+		if ($delete)
 			return $this->deleteAll($criteria);
 		else
 			return $findOne ? $this->find($criteria) : $this->findAll($criteria);
@@ -864,7 +864,7 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
+		if ($this->_invalidFinderResult !== null)
 			return $this->_invalidFinderResult;
 
 		return self::getRecordManager()->getInvalidFinderResult();
@@ -879,7 +879,7 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
+		if ($value === null)
 			$this->_invalidFinderResult = null;
 		else
 			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
@@ -896,12 +896,12 @@ 
 	 */
 	protected function getRecordCriteria($criteria, $parameters, $args = [])
 	{
-		if(is_string($criteria))
+		if (is_string($criteria))
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
 		}
-		elseif($criteria instanceof TSqlCriteria)
+		elseif ($criteria instanceof TSqlCriteria)
 			return $criteria;
 		else
 			return new TActiveRecordCriteria();
@@ -981,7 +981,7 @@ 
 	public function getColumnValue($columnName)
 	{
 		$className = get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
+		if (isset(self::$_columnMapping[$className][$columnName]))
 			$columnName = self::$_columnMapping[$className][$columnName];
 		return $this->$columnName;
 	}
@@ -996,7 +996,7 @@ 
 	public function setColumnValue($columnName, $value)
 	{
 		$className = get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
+		if (isset(self::$_columnMapping[$className][$columnName]))
 			$columnName = self::$_columnMapping[$className][$columnName];
 		$this->$columnName = $value;
 	}
@@ -1010,7 +1010,7 @@ 
 	{
 		$className = get_class($this);
 		$property = strtolower($property);
-		return isset(self::$_relations[$className][$property])?self::$_relations[$className][$property]:null;
+		return isset(self::$_relations[$className][$property]) ?self::$_relations[$className][$property] : null;
 	}
 
 	/**
@@ -1037,9 +1037,9 @@ 
 		 * @return array of column name and column values
 		 * @since 3.2.4
 		 */
-		public function toArray(){
+		public function toArray() {
 			$result = [];
-			foreach($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName){
+			foreach ($this->getRecordTableInfo()->getLowerCaseColumnNames() as $columnName) {
 					$result[$columnName] = $this->getColumnValue($columnName);
 			   }
 		
@@ -1051,7 +1051,7 @@ 
 		 * @return JSON
 		 * @since 3.2.4
 		 */
-		public function toJSON(){
+		public function toJSON() {
 			return json_encode($this->toArray());
 		}
 }
\ No newline at end of file

Braces +121 added lines, -93 removed lines

@@ -228,12 +228,15 @@ 
 	 */
 	public function __construct($data = [], $connection = null)
 	{
-		if($connection !== null)
-			$this->setDbConnection($connection);
+		if($connection !== null) {
+					$this->setDbConnection($connection);
+		}
 		$this->setupColumnMapping();
 		$this->setupRelations();
-		if(!empty($data)) //$data may be an object
+		if(!empty($data)) {
+			//$data may be an object
 			$this->copyFrom($data);
+		}
 	}
 
 	/**
@@ -264,10 +267,11 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if($this->hasRecordRelation($name) && !$this->canSetProperty($name))
-			$this->$name = $value;
-		else
-			parent::__set($name, $value);
+		if($this->hasRecordRelation($name) && !$this->canSetProperty($name)) {
+					$this->$name = $value;
+		} else {
+					parent::__set($name, $value);
+		}
 	}
 
 	/**
@@ -293,8 +297,9 @@ 
 		{
 			$class = new ReflectionClass($className);
 			$relations = [];
-			foreach($class->getStaticPropertyValue('RELATIONS') as $key => $value)
-				$relations[strtolower($key)] = [$key,$value];
+			foreach($class->getStaticPropertyValue('RELATIONS') as $key => $value) {
+							$relations[strtolower($key)] = [$key,$value];
+			}
 			self::$_relations[$className] = $relations;
 		}
 	}
@@ -305,19 +310,23 @@ 
 	 */
 	public function copyFrom($data)
 	{
-		if(is_object($data))
-			$data = get_object_vars($data);
-		if(!is_array($data))
-			throw new TActiveRecordException('ar_data_invalid', get_class($this));
-		foreach($data as $name => $value)
-			$this->setColumnValue($name, $value);
+		if(is_object($data)) {
+					$data = get_object_vars($data);
+		}
+		if(!is_array($data)) {
+					throw new TActiveRecordException('ar_data_invalid', get_class($this));
+		}
+		foreach($data as $name => $value) {
+					$this->setColumnValue($name, $value);
+		}
 	}
 
 
 	public static function getActiveDbConnection()
 	{
-		if(($db = self::getRecordManager()->getDbConnection()) !== null)
-			$db->setActive(true);
+		if(($db = self::getRecordManager()->getDbConnection()) !== null) {
+					$db->setActive(true);
+		}
 		return $db;
 	}
 
@@ -328,8 +337,9 @@ 
 	 */
 	public function getDbConnection()
 	{
-		if($this->_connection === null)
-			$this->_connection = self::getActiveDbConnection();
+		if($this->_connection === null) {
+					$this->_connection = self::getActiveDbConnection();
+		}
 		return $this->_connection;
 	}
 
@@ -359,20 +369,23 @@ 
 	 */
 	public function equals(TActiveRecord $record, $strict = false)
 	{
-		if($record === null || get_class($this) !== get_class($record))
-			return false;
+		if($record === null || get_class($this) !== get_class($record)) {
+					return false;
+		}
 		$tableInfo = $this->getRecordTableInfo();
 		$pks = $tableInfo->getPrimaryKeys();
 		$properties = count($pks) > 0 ? $pks : $tableInfo->getColumns()->getKeys();
 		$equals = true;
 		foreach($properties as $prop)
 		{
-			if($strict)
-				$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
-			else
-				$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
-			if(!$equals)
-				return false;
+			if($strict) {
+							$equals = $equals && $this->getColumnValue($prop) === $record->getColumnValue($prop);
+			} else {
+							$equals = $equals && $this->getColumnValue($prop) == $record->getColumnValue($prop);
+			}
+			if(!$equals) {
+							return false;
+			}
 		}
 		return $equals;
 	}
@@ -431,15 +444,15 @@ 
 				$this->_recordState = self::STATE_LOADED;
 				return true;
 			}
-		}
-		elseif($this->_recordState === self::STATE_LOADED)
+		} elseif($this->_recordState === self::STATE_LOADED)
 		{
 			$this->onUpdate($param);
-			if($param->getIsValid() && $gateway->update($this))
-				return true;
+			if($param->getIsValid() && $gateway->update($this)) {
+							return true;
+			}
+		} else {
+					throw new TActiveRecordException('ar_save_invalid', get_class($this));
 		}
-		else
-			throw new TActiveRecordException('ar_save_invalid', get_class($this));
 
 		return false;
 	}
@@ -461,9 +474,9 @@ 
 				$this->_recordState = self::STATE_DELETED;
 				return true;
 			}
+		} else {
+					throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 		}
-		else
-			throw new TActiveRecordException('ar_delete_invalid', get_class($this));
 
 		return false;
 	}
@@ -493,8 +506,9 @@ 
 	 */
 	public function deleteByPk($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->getRecordGateway()->deleteRecordsByPk($this, (array)$keys);
 	}
 
@@ -503,8 +517,9 @@ 
 	 */
 	public function deleteAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		return $this->deleteByPk($keys);
 	}
 	/**
@@ -539,8 +554,9 @@ 
 	protected function populateObjects($reader)
 	{
 		$result = [];
-		foreach($reader as $data)
-			$result[] = $this->populateObject($data);
+		foreach($reader as $data) {
+					$result[] = $this->populateObject($data);
+		}
 		return $result;
 	}
 
@@ -555,8 +571,9 @@ 
 	 */
 	public static function createRecord($type, $data)
 	{
-		if(empty($data))
-			return null;
+		if(empty($data)) {
+					return null;
+		}
 		$record = new $type($data);
 		$record->_recordState = self::STATE_LOADED;
 		return $record;
@@ -598,8 +615,9 @@ 
 	public function findAll($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		if($criteria !== null) {
+					$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		}
 		$result = $this->getRecordGateway()->findRecordsByCriteria($this, $criteria, true);
 		return $this->populateObjects($result);
 	}
@@ -618,10 +636,12 @@ 
 	 */
 	public function findByPk($keys)
 	{
-		if($keys === null)
-			return null;
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if($keys === null) {
+					return null;
+		}
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		$data = $this->getRecordGateway()->findRecordByPK($this, $keys);
 		return $this->populateObject($data);
 	}
@@ -645,8 +665,9 @@ 
 	 */
 	public function findAllByPks($keys)
 	{
-		if(func_num_args() > 1)
-			$keys = func_get_args();
+		if(func_num_args() > 1) {
+					$keys = func_get_args();
+		}
 		$result = $this->getRecordGateway()->findRecordsByPks($this, (array)$keys);
 		return $this->populateObjects($result);
 	}
@@ -711,8 +732,9 @@ 
 	public function count($criteria = null, $parameters = [])
 	{
 		$args = func_num_args() > 1 ? array_slice(func_get_args(), 1) : null;
-		if($criteria !== null)
-			$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		if($criteria !== null) {
+					$criteria = $this->getRecordCriteria($criteria, $parameters, $args);
+		}
 		return $this->getRecordGateway()->countRecords($this, $criteria);
 	}
 
@@ -729,9 +751,9 @@ 
 		{
 			$criteria = $this->getRecordCriteria(count($args) > 0 ? $args[0] : null, array_slice($args, 1));
 			return $context->getRelationHandler($criteria);
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -749,9 +771,9 @@ 
 		{
 			list($property, $relation) = $definition;
 			return new TActiveRecordRelationContext($this, $property, $relation);
+		} else {
+					return null;
 		}
-		else
-			return null;
 	}
 
 	/**
@@ -791,10 +813,11 @@ 
 	 */
 	protected function fetchResultsFor($property)
 	{
-		if(($context = $this->createRelationContext($property)) !== null)
-			return $context->getRelationHandler()->fetchResultsInto($this);
-		else
-			return false;
+		if(($context = $this->createRelationContext($property)) !== null) {
+					return $context->getRelationHandler()->fetchResultsInto($this);
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -833,28 +856,29 @@ 
 		{
 			$property = $method[4] === '_' ? substr($method, 5) : substr($method, 4);
 			return $this->getRelationHandler($property, $args);
-		}
-		elseif($findOne = strncasecmp($method, 'findby', 6) === 0)
-			$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
-		elseif(strncasecmp($method, 'findallby', 9) === 0)
-			$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
-		elseif($delete = strncasecmp($method, 'deleteby', 8) === 0)
-			$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
-		elseif($delete = strncasecmp($method, 'deleteallby', 11) === 0)
-			$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
-		else
+		} elseif($findOne = strncasecmp($method, 'findby', 6) === 0) {
+					$condition = $method[6] === '_' ? substr($method, 7) : substr($method, 6);
+		} elseif(strncasecmp($method, 'findallby', 9) === 0) {
+					$condition = $method[9] === '_' ? substr($method, 10) : substr($method, 9);
+		} elseif($delete = strncasecmp($method, 'deleteby', 8) === 0) {
+					$condition = $method[8] === '_' ? substr($method, 9) : substr($method, 8);
+		} elseif($delete = strncasecmp($method, 'deleteallby', 11) === 0) {
+					$condition = $method[11] === '_' ? substr($method, 12) : substr($method, 11);
+		} else
 		{
-			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception)
-				throw new TActiveRecordException('ar_invalid_finder_method', $method);
-			else
-				return null;
+			if($this->getInvalidFinderResult() == TActiveRecordInvalidFinderResult::Exception) {
+							throw new TActiveRecordException('ar_invalid_finder_method', $method);
+			} else {
+							return null;
+			}
 		}
 
 		$criteria = $this->getRecordGateway()->getCommand($this)->createCriteriaFromString($method, $condition, $args);
-		if($delete)
-			return $this->deleteAll($criteria);
-		else
-			return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		if($delete) {
+					return $this->deleteAll($criteria);
+		} else {
+					return $findOne ? $this->find($criteria) : $this->findAll($criteria);
+		}
 	}
 
 	/**
@@ -864,8 +888,9 @@ 
 	 */
 	public function getInvalidFinderResult()
 	{
-		if($this->_invalidFinderResult !== null)
-			return $this->_invalidFinderResult;
+		if($this->_invalidFinderResult !== null) {
+					return $this->_invalidFinderResult;
+		}
 
 		return self::getRecordManager()->getInvalidFinderResult();
 	}
@@ -879,10 +904,11 @@ 
 	 */
 	public function setInvalidFinderResult($value)
 	{
-		if($value === null)
-			$this->_invalidFinderResult = null;
-		else
-			$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
+		if($value === null) {
+					$this->_invalidFinderResult = null;
+		} else {
+					$this->_invalidFinderResult = TPropertyValue::ensureEnum($value, 'Prado\\Data\\ActiveRecord\\TActiveRecordInvalidFinderResult');
+		}
 	}
 
 	/**
@@ -900,11 +926,11 @@ 
 		{
 			$useArgs = !is_array($parameters) && is_array($args);
 			return new TActiveRecordCriteria($criteria, $useArgs ? $args : $parameters);
+		} elseif($criteria instanceof TSqlCriteria) {
+					return $criteria;
+		} else {
+					return new TActiveRecordCriteria();
 		}
-		elseif($criteria instanceof TSqlCriteria)
-			return $criteria;
-		else
-			return new TActiveRecordCriteria();
 			//throw new TActiveRecordException('ar_invalid_criteria');
 	}
 
@@ -981,8 +1007,9 @@ 
 	public function getColumnValue($columnName)
 	{
 		$className = get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName = self::$_columnMapping[$className][$columnName];
+		if(isset(self::$_columnMapping[$className][$columnName])) {
+					$columnName = self::$_columnMapping[$className][$columnName];
+		}
 		return $this->$columnName;
 	}
 
@@ -996,8 +1023,9 @@ 
 	public function setColumnValue($columnName, $value)
 	{
 		$className = get_class($this);
-		if(isset(self::$_columnMapping[$className][$columnName]))
-			$columnName = self::$_columnMapping[$className][$columnName];
+		if(isset(self::$_columnMapping[$className][$columnName])) {
+					$columnName = self::$_columnMapping[$className][$columnName];
+		}
 		$this->$columnName = $value;
 	}
 

framework/Data/ActiveRecord/TActiveRecordGateway.php

Spacing +27 added lines, -27 removed lines

@@ -72,10 +72,10 @@ 
 	protected function getRecordTableName(TActiveRecord $record)
 	{
 		$class = new ReflectionClass($record);
-		if($class->hasConstant(self::TABLE_CONST))
+		if ($class->hasConstant(self::TABLE_CONST))
 		{
 			$value = $class->getConstant(self::TABLE_CONST);
-			if(empty($value))
+			if (empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record), self::TABLE_CONST);
 			return $value;
@@ -83,7 +83,7 @@ 
 		elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
-			if(empty($value))
+			if (empty($value))
 				throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record), self::TABLE_METHOD);
 			return $value;
@@ -112,23 +112,23 @@ 
 	public function getTableInfo(TDbConnection $connection, $tableName)
 	{
 		$connStr = $connection->getConnectionString();
-		$key = $connStr . $tableName;
-		if(!isset($this->_tables[$key]))
+		$key = $connStr.$tableName;
+		if (!isset($this->_tables[$key]))
 		{
 			//call this first to ensure that unserializing the cache
 			//will find the correct driver dependent classes.
-			if(!isset($this->_meta[$connStr]))
+			if (!isset($this->_meta[$connStr]))
 			{
 				$this->_meta[$connStr] = TDbMetaData::getInstance($connection);
 			}
 
 			$tableInfo = null;
-			if(($cache = $this->getManager()->getCache()) !== null)
+			if (($cache = $this->getManager()->getCache()) !== null)
 				$tableInfo = $cache->get($key);
-			if(empty($tableInfo))
+			if (empty($tableInfo))
 			{
 				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if($cache !== null)
+				if ($cache !== null)
 					$cache->set($key, $tableInfo);
 			}
 			$this->_tables[$key] = $tableInfo;
@@ -145,7 +145,7 @@ 
 		$conn = $record->getDbConnection();
 		$connStr = $conn->getConnectionString();
 		$tableInfo = $this->getRecordTableInfo($record);
-		if(!isset($this->_commandBuilders[$connStr]))
+		if (!isset($this->_commandBuilders[$connStr]))
 		{
 			$builder = $tableInfo->createCommandBuilder($record->getDbConnection());
 			$command = new TDataGatewayCommand($builder);
@@ -172,7 +172,7 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if($this->_currentRecord !== null)
+		if ($this->_currentRecord !== null)
 			$this->_currentRecord->onCreateCommand($param);
 	}
 
@@ -190,7 +190,7 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if($this->_currentRecord !== null)
+		if ($this->_currentRecord !== null)
 			$this->_currentRecord->onExecuteCommand($param);
 	}
 
@@ -280,7 +280,7 @@ 
 	{
 		//$this->updateAssociatedRecords($record,true);
 		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
-		if($result)
+		if ($result)
 			$this->updatePostInsert($record);
 		//$this->updateAssociatedRecords($record);
 		return $result;
@@ -294,9 +294,9 @@ 
 	{
 		$command = $this->getCommand($record);
 		$tableInfo = $command->getTableInfo();
-		foreach($tableInfo->getColumns() as $name => $column)
+		foreach ($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->hasSequence())
+			if ($column->hasSequence())
 				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
 		}
 	}
@@ -309,18 +309,18 @@ 
 	{
 		$values = [];
 		$tableInfo = $this->getCommand($record)->getTableInfo();
-		foreach($tableInfo->getColumns() as $name => $column)
+		foreach ($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsExcluded())
+			if ($column->getIsExcluded())
 				continue;
 			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			if (!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($value !== null)
+			if ($value !== null)
 				$values[$name] = $value;
 		}
 		return $values;
@@ -345,23 +345,23 @@ 
 		$values = [];
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		$primary = [];
-		foreach($tableInfo->getColumns() as $name => $column)
+		foreach ($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsExcluded())
+			if ($column->getIsExcluded())
 				continue;
 			$value = $record->getColumnValue($name);
-			if(!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
+			if (!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
 				throw new TActiveRecordException(
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[$name] = $value;
 			else
 				$values[$name] = $value;
 		}
-		return [$values,$primary];
+		return [$values, $primary];
 	}
 
 	protected function updateAssociatedRecords(TActiveRecord $record, $updateBelongsTo = false)
@@ -384,9 +384,9 @@ 
 	{
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		$primary = [];
-		foreach($tableInfo->getColumns() as $name => $column)
+		foreach ($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[$name] = $record->getColumnValue($name);
 		}
 		return $primary;
@@ -422,7 +422,7 @@ 
 	 */
 	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
-		if(!($criteria instanceof TSqlCriteria))
+		if (!($criteria instanceof TSqlCriteria))
 			$criteria = new TActiveRecordCriteria(null, $criteria);
 		$param = new TActiveRecordEventParameter($command, $record, $criteria);
 		$manager = $record->getRecordManager();

Braces +47 added lines, -34 removed lines

@@ -75,21 +75,22 @@ 
 		if($class->hasConstant(self::TABLE_CONST))
 		{
 			$value = $class->getConstant(self::TABLE_CONST);
-			if(empty($value))
-				throw new TActiveRecordException('ar_invalid_tablename_property',
+			if(empty($value)) {
+							throw new TActiveRecordException('ar_invalid_tablename_property',
 					get_class($record), self::TABLE_CONST);
+			}
 			return $value;
-		}
-		elseif ($class->hasMethod(self::TABLE_METHOD))
+		} elseif ($class->hasMethod(self::TABLE_METHOD))
 		{
 			$value = $record->{self::TABLE_METHOD}();
-			if(empty($value))
-				throw new TActiveRecordException('ar_invalid_tablename_method',
+			if(empty($value)) {
+							throw new TActiveRecordException('ar_invalid_tablename_method',
 					get_class($record), self::TABLE_METHOD);
+			}
 			return $value;
+		} else {
+					return strtolower(get_class($record));
 		}
-		else
-			return strtolower(get_class($record));
 	}
 
 	/**
@@ -123,13 +124,15 @@ 
 			}
 
 			$tableInfo = null;
-			if(($cache = $this->getManager()->getCache()) !== null)
-				$tableInfo = $cache->get($key);
+			if(($cache = $this->getManager()->getCache()) !== null) {
+							$tableInfo = $cache->get($key);
+			}
 			if(empty($tableInfo))
 			{
 				$tableInfo = $this->_meta[$connStr]->getTableInfo($tableName);
-				if($cache !== null)
-					$cache->set($key, $tableInfo);
+				if($cache !== null) {
+									$cache->set($key, $tableInfo);
+				}
 			}
 			$this->_tables[$key] = $tableInfo;
 		}
@@ -172,8 +175,9 @@ 
 	public function onCreateCommand($sender, $param)
 	{
 		$this->raiseEvent('OnCreateCommand', $this, $param);
-		if($this->_currentRecord !== null)
-			$this->_currentRecord->onCreateCommand($param);
+		if($this->_currentRecord !== null) {
+					$this->_currentRecord->onCreateCommand($param);
+		}
 	}
 
 	/**
@@ -190,8 +194,9 @@ 
 	public function onExecuteCommand($sender, $param)
 	{
 		$this->raiseEvent('OnExecuteCommand', $this, $param);
-		if($this->_currentRecord !== null)
-			$this->_currentRecord->onExecuteCommand($param);
+		if($this->_currentRecord !== null) {
+					$this->_currentRecord->onExecuteCommand($param);
+		}
 	}
 
 	/**
@@ -280,8 +285,9 @@ 
 	{
 		//$this->updateAssociatedRecords($record,true);
 		$result = $this->getCommand($record)->insert($this->getInsertValues($record));
-		if($result)
-			$this->updatePostInsert($record);
+		if($result) {
+					$this->updatePostInsert($record);
+		}
 		//$this->updateAssociatedRecords($record);
 		return $result;
 	}
@@ -296,8 +302,9 @@ 
 		$tableInfo = $command->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->hasSequence())
-				$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
+			if($column->hasSequence()) {
+							$record->setColumnValue($name, $command->getLastInsertID($column->getSequenceName()));
+			}
 		}
 	}
 
@@ -311,8 +318,9 @@ 
 		$tableInfo = $this->getCommand($record)->getTableInfo();
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsExcluded())
-				continue;
+			if($column->getIsExcluded()) {
+							continue;
+			}
 			$value = $record->getColumnValue($name);
 			if(!$column->getAllowNull() && $value === null && !$column->hasSequence() && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
@@ -320,8 +328,9 @@ 
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($value !== null)
-				$values[$name] = $value;
+			if($value !== null) {
+							$values[$name] = $value;
+			}
 		}
 		return $values;
 	}
@@ -347,8 +356,9 @@ 
 		$primary = [];
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsExcluded())
-				continue;
+			if($column->getIsExcluded()) {
+							continue;
+			}
 			$value = $record->getColumnValue($name);
 			if(!$column->getAllowNull() && $value === null && ($column->getDefaultValue() === TDbTableColumn::UNDEFINED_VALUE))
 			{
@@ -356,10 +366,11 @@ 
 					'ar_value_must_not_be_null', get_class($record),
 					$tableInfo->getTableFullName(), $name);
 			}
-			if($column->getIsPrimaryKey())
-				$primary[$name] = $value;
-			else
-				$values[$name] = $value;
+			if($column->getIsPrimaryKey()) {
+							$primary[$name] = $value;
+			} else {
+							$values[$name] = $value;
+			}
 		}
 		return [$values,$primary];
 	}
@@ -386,8 +397,9 @@ 
 		$primary = [];
 		foreach($tableInfo->getColumns() as $name => $column)
 		{
-			if($column->getIsPrimaryKey())
-				$primary[$name] = $record->getColumnValue($name);
+			if($column->getIsPrimaryKey()) {
+							$primary[$name] = $record->getColumnValue($name);
+			}
 		}
 		return $primary;
 	}
@@ -422,8 +434,9 @@ 
 	 */
 	protected function raiseCommandEvent($event, $command, $record, $criteria)
 	{
-		if(!($criteria instanceof TSqlCriteria))
-			$criteria = new TActiveRecordCriteria(null, $criteria);
+		if(!($criteria instanceof TSqlCriteria)) {
+					$criteria = new TActiveRecordCriteria(null, $criteria);
+		}
 		$param = new TActiveRecordEventParameter($command, $record, $criteria);
 		$manager = $record->getRecordManager();
 		$manager->{$event}($param);

framework/Data/Common/TDbCommandBuilder.php

Spacing +71 added lines, -71 removed lines

@@ -76,9 +76,9 @@ 
 	 */
 	public function getLastInsertID()
 	{
-		foreach($this->getTableInfo()->getColumns() as $column)
+		foreach ($this->getTableInfo()->getColumns() as $column)
 		{
-			if($column->hasSequence())
+			if ($column->hasSequence())
 				return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
 		}
 	}
@@ -93,11 +93,11 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
 	{
-		$limit = $limit !== null ? (int)$limit : -1;
-		$offset = $offset !== null ? (int)$offset : -1;
-		$limitStr = $limit >= 0 ? ' LIMIT ' . $limit : '';
-		$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
-		return $sql . $limitStr . $offsetStr;
+		$limit = $limit !== null ? (int) $limit : -1;
+		$offset = $offset !== null ? (int) $offset : -1;
+		$limitStr = $limit >= 0 ? ' LIMIT '.$limit : '';
+		$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+		return $sql.$limitStr.$offsetStr;
 	}
 
 	/**
@@ -108,20 +108,20 @@ 
 	public function applyOrdering($sql, $ordering)
 	{
 		$orders = [];
-		foreach($ordering as $name => $direction)
+		foreach ($ordering as $name => $direction)
 		{
 			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			if (false !== strpos($name, '(') && false !== strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
 				$key = $name;
 			} else {
 				// key is a column
 				$key = $this->getTableInfo()->getColumn($name)->getColumnName();
 			}
-			$orders[] = $key . ' ' . $direction;
+			$orders[] = $key.' '.$direction;
 		}
-		if(count($orders) > 0)
-			$sql .= ' ORDER BY ' . implode(', ', $orders);
+		if (count($orders) > 0)
+			$sql .= ' ORDER BY '.implode(', ', $orders);
 		return $sql;
 	}
 
@@ -135,15 +135,15 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
+		if (strlen(trim($keywords)) == 0) return '';
 		$words = preg_split('/\s/u', $keywords);
 		$conditions = [];
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
 			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
 			$conditions[] = $this->getSearchCondition($column, $words);
 		}
-		return '(' . implode(' OR ', $conditions) . ')';
+		return '('.implode(' OR ', $conditions).')';
 	}
 
 	/**
@@ -154,9 +154,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach($words as $word)
-			$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
-		return '(' . implode(' AND ', $conditions) . ')';
+		foreach ($words as $word)
+			$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+		return '('.implode(' AND ', $conditions).')';
 	}
 
 	/**
@@ -199,102 +199,102 @@ 
 	 * @todo add support for quoting of column aliasing
 	 */
 	public function getSelectFieldList($data = '*') {
-		if(is_scalar($data)) {
+		if (is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = [];
-			foreach($tmp as $v)
+			foreach ($tmp as $v)
 				$result[] = trim($v);
 			return $result;
 		}
 
 		$bHasWildcard = false;
 		$result = [];
-		if(is_array($data) || $data instanceof Traversable) {
+		if (is_array($data) || $data instanceof Traversable) {
 			$columns = $this->getTableInfo()->getColumns();
-			foreach($data as $key => $value) {
-				if($key === '*' || $value === '*') {
+			foreach ($data as $key => $value) {
+				if ($key === '*' || $value === '*') {
 					$bHasWildcard = true;
 					continue;
 				}
 
-				if(strToUpper($key) === 'NULL') {
+				if (strToUpper($key) === 'NULL') {
 					$result[] = 'NULL';
 					continue;
 				}
 
-				if(strpos($key, '(') !== false && strpos($key, ')') !== false) {
+				if (strpos($key, '(') !== false && strpos($key, ')') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if(stripos($key, 'AS') !== false) {
+				if (stripos($key, 'AS') !== false) {
 					$result[] = $key;
 					continue;
 				}
 
-				if(stripos($value, 'AS') !== false) {
+				if (stripos($value, 'AS') !== false) {
 					$result[] = $value;
 					continue;
 				}
 
 				$v = isset($columns[$value]);
 				$k = isset($columns[$key]);
-				if(is_int($key) && $v) {
+				if (is_int($key) && $v) {
 					$key = $value;
 					$k = $v;
 				}
 
-				if(strToUpper($value) === 'NULL') {
-					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+				if (strToUpper($value) === 'NULL') {
+					if ($k)
+						$result[] = 'NULL AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[] = 'NULL'.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
-				if(strpos($value, '(') !== false && strpos($value, ')') !== false) {
-					if($k)
-						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+				if (strpos($value, '(') !== false && strpos($value, ')') !== false) {
+					if ($k)
+						$result[] = $value.' AS '.$columns[$key]->getColumnName();
 					else
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+						$result[] = $value.(is_string($key) ? (' AS '.(string) $key) : '');
 					continue;
 				}
 
-				if($v && $key == $value) {
+				if ($v && $key == $value) {
 					$result[] = $columns[$value]->getColumnName();
 					continue;
 				}
 
-				if($k && $value == null) {
+				if ($k && $value == null) {
 					$result[] = $columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(is_string($key) && $v) {
-					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
+				if (is_string($key) && $v) {
+					$result[] = $columns[$value]->getColumnName().' AS '.$key;
 					continue;
 				}
 
-				if(is_numeric($value) && $k) {
-					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+				if (is_numeric($value) && $k) {
+					$result[] = $value.' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(is_string($value) && $k) {
-					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
+				if (is_string($value) && $k) {
+					$result[] = $this->getDbConnection()->quoteString($value).' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
-				if(!$v && !$k && is_int($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+				if (!$v && !$k && is_int($key)) {
+					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value);
 					continue;
 				}
 
-				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value)) . ' AS ' . $key;
+				$result[] = (is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string) $value)).' AS '.$key;
 			}
 		}
 
-		if($data === null || count($result) == 0 || $bHasWildcard)
+		if ($data === null || count($result) == 0 || $bHasWildcard)
 			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
 
 		return $result;
@@ -312,16 +312,16 @@ 
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
 		$sql = "SELECT {$fields} FROM {$table}";
-		if(!empty($where))
+		if (!empty($where))
 			$sql .= " WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
 	public function applyCriterias($sql, $parameters = [], $ordering = [], $limit = -1, $offset = -1)
 	{
-		if(count($ordering) > 0)
+		if (count($ordering) > 0)
 			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit >= 0 || $offset >= 0)
+		if ($limit >= 0 || $offset >= 0)
 			$sql = $this->applyLimitOffset($sql, $limit, $offset);
 		$command = $this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
@@ -351,8 +351,8 @@ 
 	{
 		$table = $this->getTableInfo()->getTableFullName();
 		if (!empty($where))
-			$where = ' WHERE ' . $where;
-		$command = $this->createCommand("DELETE FROM {$table}" . $where);
+			$where = ' WHERE '.$where;
+		$command = $this->createCommand("DELETE FROM {$table}".$where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -385,14 +385,14 @@ 
 	public function createUpdateCommand($data, $where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if($this->hasIntegerKey($parameters))
+		if ($this->hasIntegerKey($parameters))
 			$fields = implode(', ', $this->getColumnBindings($data, true));
 		else
 			$fields = implode(', ', $this->getColumnBindings($data));
 
 		if (!empty($where))
-			$where = ' WHERE ' . $where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
+			$where = ' WHERE '.$where;
+		$command = $this->createCommand("UPDATE {$table} SET {$fields}".$where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}
@@ -405,10 +405,10 @@ 
 	protected function getInsertFieldBindings($values)
 	{
 		$fields = []; $bindings = [];
-		foreach(array_keys($values) as $name)
+		foreach (array_keys($values) as $name)
 		{
 			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = ':' . $name;
+			$bindings[] = ':'.$name;
 		}
 		return [implode(', ', $fields), implode(', ', $bindings)];
 	}
@@ -422,10 +422,10 @@ 
 	protected function getColumnBindings($values, $position = false)
 	{
 		$bindings = [];
-		foreach(array_keys($values) as $name)
+		foreach (array_keys($values) as $name)
 		{
 			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = $position ? $column . ' = ?' : $column . ' = :' . $name;
+			$bindings[] = $position ? $column.' = ?' : $column.' = :'.$name;
 		}
 		return $bindings;
 	}
@@ -447,13 +447,13 @@ 
 	 */
 	public function bindColumnValues($command, $values)
 	{
-		foreach($values as $name => $value)
+		foreach ($values as $name => $value)
 		{
 			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
-				$command->bindValue(':' . $name, null, PDO::PARAM_NULL);
+			if ($value === null && $column->getAllowNull())
+				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
 			else
-				$command->bindValue(':' . $name, $value, $column->getPdoType());
+				$command->bindValue(':'.$name, $value, $column->getPdoType());
 		}
 	}
 
@@ -463,17 +463,17 @@ 
 	 */
 	public function bindArrayValues($command, $values)
 	{
-		if($this->hasIntegerKey($values))
+		if ($this->hasIntegerKey($values))
 		{
 			$values = array_values($values);
-			for($i = 0, $max = count($values); $i < $max; $i++)
+			for ($i = 0, $max = count($values); $i < $max; $i++)
 				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
 		}
 		else
 		{
-			foreach($values as $name => $value)
+			foreach ($values as $name => $value)
 			{
-				$prop = $name[0] === ':' ? $name : ':' . $name;
+				$prop = $name[0] === ':' ? $name : ':'.$name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
 		}
@@ -485,7 +485,7 @@ 
 	 */
 	public static function getPdoType($value)
 	{
-		switch(gettype($value))
+		switch (gettype($value))
 		{
 			case 'boolean': return PDO::PARAM_BOOL;
 			case 'integer': return PDO::PARAM_INT;
@@ -500,9 +500,9 @@ 
 	 */
 	protected function hasIntegerKey($array)
 	{
-		foreach($array as $k => $v)
+		foreach ($array as $k => $v)
 		{
-			if(gettype($k) === 'integer')
+			if (gettype($k) === 'integer')
 				return true;
 		}
 		return false;

Braces +60 added lines, -43 removed lines

@@ -78,8 +78,9 @@ 
 	{
 		foreach($this->getTableInfo()->getColumns() as $column)
 		{
-			if($column->hasSequence())
-				return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
+			if($column->hasSequence()) {
+							return $this->getDbConnection()->getLastInsertID($column->getSequenceName());
+			}
 		}
 	}
 
@@ -120,8 +121,9 @@ 
 			}
 			$orders[] = $key . ' ' . $direction;
 		}
-		if(count($orders) > 0)
-			$sql .= ' ORDER BY ' . implode(', ', $orders);
+		if(count($orders) > 0) {
+					$sql .= ' ORDER BY ' . implode(', ', $orders);
+		}
 		return $sql;
 	}
 
@@ -135,7 +137,9 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
+		if(strlen(trim($keywords)) == 0) {
+			return '';
+		}
 		$words = preg_split('/\s/u', $keywords);
 		$conditions = [];
 		foreach($fields as $field)
@@ -154,8 +158,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach($words as $word)
-			$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		foreach($words as $word) {
+					$conditions[] = $column . ' LIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		}
 		return '(' . implode(' AND ', $conditions) . ')';
 	}
 
@@ -202,8 +207,9 @@ 
 		if(is_scalar($data)) {
 			$tmp = explode(',', $data);
 			$result = [];
-			foreach($tmp as $v)
-				$result[] = trim($v);
+			foreach($tmp as $v) {
+							$result[] = trim($v);
+			}
 			return $result;
 		}
 
@@ -245,18 +251,20 @@ 
 				}
 
 				if(strToUpper($value) === 'NULL') {
-					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
-					else
-						$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+					if($k) {
+											$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+					} else {
+											$result[] = 'NULL' . (is_string($key) ? (' AS ' . (string)$key) : '');
+					}
 					continue;
 				}
 
 				if(strpos($value, '(') !== false && strpos($value, ')') !== false) {
-					if($k)
-						$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
-					else
-						$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+					if($k) {
+											$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+					} else {
+											$result[] = $value . (is_string($key) ? (' AS ' . (string)$key) : '');
+					}
 					continue;
 				}
 
@@ -294,8 +302,9 @@ 
 			}
 		}
 
-		if($data === null || count($result) == 0 || $bHasWildcard)
-			$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
+		if($data === null || count($result) == 0 || $bHasWildcard) {
+					$result = $result = array_merge($this->getTableInfo()->getColumnNames(), $result);
+		}
 
 		return $result;
 	}
@@ -312,17 +321,20 @@ 
 		$table = $this->getTableInfo()->getTableFullName();
 		$fields = implode(', ', $this -> getSelectFieldList($select));
 		$sql = "SELECT {$fields} FROM {$table}";
-		if(!empty($where))
-			$sql .= " WHERE {$where}";
+		if(!empty($where)) {
+					$sql .= " WHERE {$where}";
+		}
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
 	public function applyCriterias($sql, $parameters = [], $ordering = [], $limit = -1, $offset = -1)
 	{
-		if(count($ordering) > 0)
-			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit >= 0 || $offset >= 0)
-			$sql = $this->applyLimitOffset($sql, $limit, $offset);
+		if(count($ordering) > 0) {
+					$sql = $this->applyOrdering($sql, $ordering);
+		}
+		if($limit >= 0 || $offset >= 0) {
+					$sql = $this->applyLimitOffset($sql, $limit, $offset);
+		}
 		$command = $this->createCommand($sql);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
@@ -350,8 +362,9 @@ 
 	public function createDeleteCommand($where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
-			$where = ' WHERE ' . $where;
+		if (!empty($where)) {
+					$where = ' WHERE ' . $where;
+		}
 		$command = $this->createCommand("DELETE FROM {$table}" . $where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
@@ -385,13 +398,15 @@ 
 	public function createUpdateCommand($data, $where, $parameters = [])
 	{
 		$table = $this->getTableInfo()->getTableFullName();
-		if($this->hasIntegerKey($parameters))
-			$fields = implode(', ', $this->getColumnBindings($data, true));
-		else
-			$fields = implode(', ', $this->getColumnBindings($data));
+		if($this->hasIntegerKey($parameters)) {
+					$fields = implode(', ', $this->getColumnBindings($data, true));
+		} else {
+					$fields = implode(', ', $this->getColumnBindings($data));
+		}
 
-		if (!empty($where))
-			$where = ' WHERE ' . $where;
+		if (!empty($where)) {
+					$where = ' WHERE ' . $where;
+		}
 		$command = $this->createCommand("UPDATE {$table} SET {$fields}" . $where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
@@ -450,10 +465,11 @@ 
 		foreach($values as $name => $value)
 		{
 			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
-				$command->bindValue(':' . $name, null, PDO::PARAM_NULL);
-			else
-				$command->bindValue(':' . $name, $value, $column->getPdoType());
+			if($value === null && $column->getAllowNull()) {
+							$command->bindValue(':' . $name, null, PDO::PARAM_NULL);
+			} else {
+							$command->bindValue(':' . $name, $value, $column->getPdoType());
+			}
 		}
 	}
 
@@ -466,10 +482,10 @@ 
 		if($this->hasIntegerKey($values))
 		{
 			$values = array_values($values);
-			for($i = 0, $max = count($values); $i < $max; $i++)
-				$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
-		}
-		else
+			for($i = 0, $max = count($values); $i < $max; $i++) {
+							$command->bindValue($i + 1, $values[$i], $this->getPdoType($values[$i]));
+			}
+		} else
 		{
 			foreach($values as $name => $value)
 			{
@@ -502,8 +518,9 @@ 
 	{
 		foreach($array as $k => $v)
 		{
-			if(gettype($k) === 'integer')
-				return true;
+			if(gettype($k) === 'integer') {
+							return true;
+			}
 		}
 		return false;
 	}

framework/Data/Common/Mysql/TMysqlMetaData.php

Spacing +39 added lines, -39 removed lines

@@ -83,21 +83,21 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$find = $schemaName === null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
+		if ($colCase != TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase('Preserved');
 		$this->getDbConnection()->setActive(true);
 		$sql = "SHOW FULL FIELDS FROM {$find}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$tableInfo = $this->createNewTableInfo($table);
 		$index = 0;
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index === 0)
+		if ($index === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
-		if($colCase != TDbColumnCaseMode::Preserved)
+		if ($colCase != TDbColumnCaseMode::Preserved)
 			$this->getDbConnection()->setColumnCase($colCase);
 		return $tableInfo;
 	}
@@ -107,12 +107,12 @@ 
 	 */
 	protected function getServerVersion()
 	{
-		if(!$this->_serverVersion)
+		if (!$this->_serverVersion)
 		{
 			$version = $this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
 			$digits = [];
 			preg_match('/(\d+)\.(\d+)\.(\d+)/', $version, $digits);
-			$this->_serverVersion = floatval($digits[1] . '.' . $digits[2] . $digits[3]);
+			$this->_serverVersion = floatval($digits[1].'.'.$digits[2].$digits[3]);
 		}
 		return $this->_serverVersion;
 	}
@@ -128,37 +128,37 @@ 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if($col['Null'] === 'YES')
+		if ($col['Null'] === 'YES')
 			$info['AllowNull'] = true;
-		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
+		if (is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
 			$info['AutoIncrement'] = true;
-		if($col['Default'] !== "")
+		if ($col['Default'] !== "")
 			$info['DefaultValue'] = $col['Default'];
 
-		if($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
+		if ($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
+		if ($this->isForeignKeyColumn($columnId, $tableInfo))
 			$info['IsForeignKey'] = true;
 
 		$info['DbType'] = $col['Type'];
 		$match = [];
 		//find SET/ENUM values, column size, precision, and scale
-		if(preg_match('/\((.*)\)/', $col['Type'], $match))
+		if (preg_match('/\((.*)\)/', $col['Type'], $match))
 		{
 			$info['DbType'] = preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
-			if($this->isEnumSetType($info['DbType']))
+			if ($this->isEnumSetType($info['DbType']))
 				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
 
 			//find column size, precision and scale
 			$pscale = [];
-			if(preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
+			if (preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
 			{
-				if($this->isPrecisionType($info['DbType']))
+				if ($this->isPrecisionType($info['DbType']))
 				{
 					$info['NumericPrecision'] = intval($pscale[1]);
-					if(count($pscale) > 2)
+					if (count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
 				}
 				else
@@ -198,9 +198,9 @@ 
 	{
 		//remove the back ticks and separate out the "database.table"
 		$result = explode('.', str_replace('`', '', $table));
-		foreach($result as $name)
+		foreach ($result as $name)
 		{
-			if(!$this->isValidIdentifier($name))
+			if (!$this->isValidIdentifier($name))
 			{
 				$ref = 'http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
 				throw new TDbException('dbcommon_invalid_identifier_name', $table, $ref);
@@ -229,7 +229,7 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		if($this->getIsView($schemaName, $tableName))
+		if ($this->getIsView($schemaName, $tableName))
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
@@ -248,9 +248,9 @@ 
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
-		if($this->getServerVersion() < 5.01)
+		if ($this->getServerVersion() < 5.01)
 			return false;
-		if($schemaName !== null)
+		if ($schemaName !== null)
 			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
 		else
 			$sql = "SHOW FULL TABLES LIKE :table";
@@ -261,9 +261,9 @@ 
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type'] === 'VIEW';
 		}
-		catch(TDbException $e)
+		catch (TDbException $e)
 		{
-			$table = $schemaName === null?$tableName:$schemaName . '.' . $tableName;
+			$table = $schemaName === null ? $tableName : $schemaName.'.'.$tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
 		}
 	}
@@ -280,18 +280,18 @@ 
 		$sql = "SHOW INDEX FROM {$table}";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$primary = [];
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
-			if($row['Key_name'] === 'PRIMARY')
+			if ($row['Key_name'] === 'PRIMARY')
 				$primary[] = $row['Column_name'];
 		}
 				// MySQL version was increased to >=5.1.21 instead of 5.x
 				// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
-		if($this->getServerVersion() >= 5.121)
+		if ($this->getServerVersion() >= 5.121)
 			$foreign = $this->getForeignConstraints($schemaName, $tableName);
 		else
 			$foreign = $this->findForeignConstraints($schemaName, $tableName);
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -319,10 +319,10 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName !== null)
+		if ($schemaName !== null)
 			$command->bindValue(':schema', $schemaName);
 		$fkeys = [];
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
 			$fkeys[$col['con']]['keys'][$col['col']] = $col['fkcol'];
 			$fkeys[$col['con']]['table'] = $col['fktable'];
@@ -338,12 +338,12 @@ 
 	 */
 	protected function getShowCreateTable($schemaName, $tableName)
 	{
-		if(version_compare(PHP_VERSION, '5.1.3', '<'))
+		if (version_compare(PHP_VERSION, '5.1.3', '<'))
 			throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-		if($schemaName !== null)
+		if ($schemaName !== null)
 			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		else
 			$sql = "SHOW CREATE TABLE `{$tableName}`";
@@ -365,12 +365,12 @@ 
 		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
 		preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER);
 		$foreign = [];
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$fields = array_map('trim', explode(',', str_replace('`', '', $match[1])));
 			$fk_fields = array_map('trim', explode(',', str_replace('`', '', $match[3])));
 			$keys = [];
-			foreach($fields as $k => $v)
+			foreach ($fields as $k => $v)
 				$keys[$v] = $fk_fields[$k];
 			$foreign[] = ['keys' => $keys, 'table' => trim($match[2])];
 		}
@@ -384,9 +384,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -400,11 +400,11 @@ 
 		 */
 	public function findTableNames($schema = '')
 	{
-		if($schema === '')
+		if ($schema === '')
 			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
-		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
-		foreach($names as &$name)
-			$name = $schema . '.' . $name;
+		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM '.$this->quoteTableName($schema))->queryColumn();
+		foreach ($names as &$name)
+			$name = $schema.'.'.$name;
 		return $names;
 	}
 }

Braces +76 added lines, -55 removed lines

@@ -83,8 +83,9 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$find = $schemaName === null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
 		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
-			$this->getDbConnection()->setColumnCase('Preserved');
+		if($colCase != TDbColumnCaseMode::Preserved) {
+					$this->getDbConnection()->setColumnCase('Preserved');
+		}
 		$this->getDbConnection()->setActive(true);
 		$sql = "SHOW FULL FIELDS FROM {$find}";
 		$command = $this->getDbConnection()->createCommand($sql);
@@ -95,10 +96,12 @@ 
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index === 0)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
-		if($colCase != TDbColumnCaseMode::Preserved)
-			$this->getDbConnection()->setColumnCase($colCase);
+		if($index === 0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
+		if($colCase != TDbColumnCaseMode::Preserved) {
+					$this->getDbConnection()->setColumnCase($colCase);
+		}
 		return $tableInfo;
 	}
 
@@ -128,17 +131,22 @@ 
 		$info['ColumnName'] = "`$columnId`"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if($col['Null'] === 'YES')
-			$info['AllowNull'] = true;
-		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
-			$info['AutoIncrement'] = true;
-		if($col['Default'] !== "")
-			$info['DefaultValue'] = $col['Default'];
-
-		if($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if($col['Null'] === 'YES') {
+					$info['AllowNull'] = true;
+		}
+		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment'))) {
+					$info['AutoIncrement'] = true;
+		}
+		if($col['Default'] !== "") {
+					$info['DefaultValue'] = $col['Default'];
+		}
+
+		if($col['Key'] === 'PRI' || in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
 		$info['DbType'] = $col['Type'];
 		$match = [];
@@ -148,8 +156,9 @@ 
 			$info['DbType'] = preg_replace('/\(.*\)/', '', $col['Type']);
 
 			//find SET/ENUM values
-			if($this->isEnumSetType($info['DbType']))
-				$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
+			if($this->isEnumSetType($info['DbType'])) {
+							$info['DbTypeValues'] = preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
+			}
 
 			//find column size, precision and scale
 			$pscale = [];
@@ -158,11 +167,12 @@ 
 				if($this->isPrecisionType($info['DbType']))
 				{
 					$info['NumericPrecision'] = intval($pscale[1]);
-					if(count($pscale) > 2)
-						$info['NumericScale'] = intval($pscale[2]);
+					if(count($pscale) > 2) {
+											$info['NumericScale'] = intval($pscale[2]);
+					}
+				} else {
+									$info['ColumnSize'] = intval($pscale[1]);
 				}
-				else
-					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
 
@@ -229,8 +239,9 @@ 
 		list($schemaName, $tableName) = $this->getSchemaTableName($table);
 		$info['SchemaName'] = $schemaName;
 		$info['TableName'] = $tableName;
-		if($this->getIsView($schemaName, $tableName))
-			$info['IsView'] = true;
+		if($this->getIsView($schemaName, $tableName)) {
+					$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
@@ -248,20 +259,21 @@ 
 	 */
 	protected function getIsView($schemaName, $tableName)
 	{
-		if($this->getServerVersion() < 5.01)
-			return false;
-		if($schemaName !== null)
-			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
-		else
-			$sql = "SHOW FULL TABLES LIKE :table";
+		if($this->getServerVersion() < 5.01) {
+					return false;
+		}
+		if($schemaName !== null) {
+					$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
+		} else {
+					$sql = "SHOW FULL TABLES LIKE :table";
+		}
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type'] === 'VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName === null?$tableName:$schemaName . '.' . $tableName;
 			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
@@ -282,15 +294,17 @@ 
 		$primary = [];
 		foreach($command->query() as $row)
 		{
-			if($row['Key_name'] === 'PRIMARY')
-				$primary[] = $row['Column_name'];
+			if($row['Key_name'] === 'PRIMARY') {
+							$primary[] = $row['Column_name'];
+			}
 		}
 				// MySQL version was increased to >=5.1.21 instead of 5.x
 				// due to a MySQL bug (http://bugs.mysql.com/bug.php?id=19588)
-		if($this->getServerVersion() >= 5.121)
-			$foreign = $this->getForeignConstraints($schemaName, $tableName);
-		else
-			$foreign = $this->findForeignConstraints($schemaName, $tableName);
+		if($this->getServerVersion() >= 5.121) {
+					$foreign = $this->getForeignConstraints($schemaName, $tableName);
+		} else {
+					$foreign = $this->findForeignConstraints($schemaName, $tableName);
+		}
 		return [$primary,$foreign];
 	}
 
@@ -319,8 +333,9 @@ 
 EOD;
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName !== null)
-			$command->bindValue(':schema', $schemaName);
+		if($schemaName !== null) {
+					$command->bindValue(':schema', $schemaName);
+		}
 		$fkeys = [];
 		foreach($command->query() as $col)
 		{
@@ -338,15 +353,17 @@ 
 	 */
 	protected function getShowCreateTable($schemaName, $tableName)
 	{
-		if(version_compare(PHP_VERSION, '5.1.3', '<'))
-			throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
+		if(version_compare(PHP_VERSION, '5.1.3', '<')) {
+					throw new TDbException('dbmetadata_requires_php_version', 'Mysql 4.1.x', '5.1.3');
+		}
 
 		//See http://netevil.org/node.php?nid=795&SC=1
 		$this->getDbConnection()->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
-		if($schemaName !== null)
-			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
-		else
-			$sql = "SHOW CREATE TABLE `{$tableName}`";
+		if($schemaName !== null) {
+					$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
+		} else {
+					$sql = "SHOW CREATE TABLE `{$tableName}`";
+		}
 		$command = $this->getDbConnection()->createCommand($sql);
 		$result = $command->queryRow();
 		return isset($result['Create Table']) ? $result['Create Table'] : (isset($result['Create View']) ? $result['Create View'] : '');
@@ -370,8 +387,9 @@ 
 			$fields = array_map('trim', explode(',', str_replace('`', '', $match[1])));
 			$fk_fields = array_map('trim', explode(',', str_replace('`', '', $match[3])));
 			$keys = [];
-			foreach($fields as $k => $v)
-				$keys[$v] = $fk_fields[$k];
+			foreach($fields as $k => $v) {
+							$keys[$v] = $fk_fields[$k];
+			}
 			$foreign[] = ['keys' => $keys, 'table' => trim($match[2])];
 		}
 		return $foreign;
@@ -386,8 +404,9 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -400,11 +419,13 @@ 
 		 */
 	public function findTableNames($schema = '')
 	{
-		if($schema === '')
-			return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
+		if($schema === '') {
+					return $this->getDbConnection()->createCommand('SHOW TABLES')->queryColumn();
+		}
 		$names = $this->getDbConnection()->createCommand('SHOW TABLES FROM ' . $this->quoteTableName($schema))->queryColumn();
-		foreach($names as &$name)
-			$name = $schema . '.' . $name;
+		foreach($names as &$name) {
+					$name = $schema . '.' . $name;
+		}
 		return $names;
 	}
 }

framework/Data/Common/Mysql/TMysqlTableInfo.php

Spacing +3 added lines, -3 removed lines

@@ -40,10 +40,10 @@
 	 */
 	public function getTableFullName()
 	{
-		if(($schema = $this->getSchemaName()) !== null)
-			return '`' . $schema . '`.`' . $this->getTableName() . '`';
+		if (($schema = $this->getSchemaName()) !== null)
+			return '`'.$schema.'`.`'.$this->getTableName().'`';
 		else
-			return '`' . $this->getTableName() . '`';
+			return '`'.$this->getTableName().'`';
 	}
 
 	/**

Braces +5 added lines, -4 removed lines

@@ -40,10 +40,11 @@
 	 */
 	public function getTableFullName()
 	{
-		if(($schema = $this->getSchemaName()) !== null)
-			return '`' . $schema . '`.`' . $this->getTableName() . '`';
-		else
-			return '`' . $this->getTableName() . '`';
+		if(($schema = $this->getSchemaName()) !== null) {
+					return '`' . $schema . '`.`' . $this->getTableName() . '`';
+		} else {
+					return '`' . $this->getTableName() . '`';
+		}
 	}
 
 	/**

framework/Data/Common/Mysql/TMysqlTableColumn.php

Spacing +4 added lines, -4 removed lines

@@ -39,12 +39,12 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($this->getDbType())));
-		if($dbtype === 'tinyint' && $this->getColumnSize() === 1)
+		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['', '', ], strtolower($this->getDbType())));
+		if ($dbtype === 'tinyint' && $this->getColumnSize() === 1)
 			return 'boolean';
-		foreach(self::$types as $type => $dbtypes)
+		foreach (self::$types as $type => $dbtypes)
 		{
-			if(in_array($dbtype, $dbtypes))
+			if (in_array($dbtype, $dbtypes))
 				return $type;
 		}
 		return 'string';

Braces +6 added lines, -4 removed lines

@@ -40,12 +40,14 @@
 	public function getPHPType()
 	{
 		$dbtype = trim(str_replace(['unsigned', 'zerofill'], ['','',], strtolower($this->getDbType())));
-		if($dbtype === 'tinyint' && $this->getColumnSize() === 1)
-			return 'boolean';
+		if($dbtype === 'tinyint' && $this->getColumnSize() === 1) {
+					return 'boolean';
+		}
 		foreach(self::$types as $type => $dbtypes)
 		{
-			if(in_array($dbtype, $dbtypes))
-				return $type;
+			if(in_array($dbtype, $dbtypes)) {
+							return $type;
+			}
 		}
 		return 'string';
 	}

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Spacing +13 added lines, -13 removed lines

@@ -31,9 +31,9 @@ 
 	 */
 	public function getLastInsertID()
 	{
-		foreach($this->getTableInfo()->getColumns() as $column)
+		foreach ($this->getTableInfo()->getColumns() as $column)
 		{
-			if($column->hasSequence())
+			if ($column->hasSequence())
 			{
 				$command = $this->getDbConnection()->createCommand('SELECT @@Identity');
 				return intval($command->queryScalar());
@@ -87,7 +87,7 @@ 
 		$offset = $offset !== null ? intval($offset) : -1;
 		if ($limit > 0 && $offset <= 0) //just limit
 			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
-		elseif($limit > 0 && $offset > 0)
+		elseif ($limit > 0 && $offset > 0)
 			$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);
 		return $sql;
 	}
@@ -120,20 +120,20 @@ 
 	 */
 	protected function findOrdering($sql)
 	{
-		if(!preg_match('/ORDER BY/i', $sql))
+		if (!preg_match('/ORDER BY/i', $sql))
 			return [];
 		$matches = [];
 		$ordering = [];
 		preg_match_all('/(ORDER BY)[\s"\[](.*)(ASC|DESC)?(?:[\s"\[]|$|COMPUTE|FOR)/i', $sql, $matches);
-		if(count($matches) > 1 && count($matches[2]) > 0)
+		if (count($matches) > 1 && count($matches[2]) > 0)
 		{
 			$parts = explode(',', $matches[2][0]);
-			foreach($parts as $part)
+			foreach ($parts as $part)
 			{
 				$subs = [];
-				if(preg_match_all('/(.*)[\s"\]](ASC|DESC)$/i', trim($part), $subs))
+				if (preg_match_all('/(.*)[\s"\]](ASC|DESC)$/i', trim($part), $subs))
 				{
-					if(count($subs) > 1 && count($subs[2]) > 0)
+					if (count($subs) > 1 && count($subs[2]) > 0)
 					{
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
@@ -152,12 +152,12 @@ 
 	 */
 	protected function joinOrdering($orders)
 	{
-		if(count($orders) > 0)
+		if (count($orders) > 0)
 		{
 			$str = [];
-			foreach($orders as $column => $direction)
-				$str[] = $column . ' ' . $direction;
-			return 'ORDER BY ' . implode(', ', $str);
+			foreach ($orders as $column => $direction)
+				$str[] = $column.' '.$direction;
+			return 'ORDER BY '.implode(', ', $str);
 		}
 	}
 
@@ -167,7 +167,7 @@ 
 	 */
 	protected function reverseDirection($orders)
 	{
-		foreach($orders as $column => $direction)
+		foreach ($orders as $column => $direction)
 			$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
 		return $orders;
 	}

Braces +16 added lines, -11 removed lines

@@ -85,10 +85,12 @@ 
 	{
 		$limit = $limit !== null ? intval($limit) : -1;
 		$offset = $offset !== null ? intval($offset) : -1;
-		if ($limit > 0 && $offset <= 0) //just limit
+		if ($limit > 0 && $offset <= 0) {
+			//just limit
 			$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $limit", $sql);
-		elseif($limit > 0 && $offset > 0)
-			$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);
+		} elseif($limit > 0 && $offset > 0) {
+					$sql = $this->rewriteLimitOffsetSql($sql, $limit, $offset);
+		}
 		return $sql;
 	}
 
@@ -120,8 +122,9 @@ 
 	 */
 	protected function findOrdering($sql)
 	{
-		if(!preg_match('/ORDER BY/i', $sql))
-			return [];
+		if(!preg_match('/ORDER BY/i', $sql)) {
+					return [];
+		}
 		$matches = [];
 		$ordering = [];
 		preg_match_all('/(ORDER BY)[\s"\[](.*)(ASC|DESC)?(?:[\s"\[]|$|COMPUTE|FOR)/i', $sql, $matches);
@@ -138,9 +141,9 @@ 
 						$ordering[$subs[1][0]] = $subs[2][0];
 					}
 					//else what?
+				} else {
+									$ordering[trim($part)] = 'ASC';
 				}
-				else
-					$ordering[trim($part)] = 'ASC';
 			}
 		}
 		return $ordering;
@@ -155,8 +158,9 @@ 
 		if(count($orders) > 0)
 		{
 			$str = [];
-			foreach($orders as $column => $direction)
-				$str[] = $column . ' ' . $direction;
+			foreach($orders as $column => $direction) {
+							$str[] = $column . ' ' . $direction;
+			}
 			return 'ORDER BY ' . implode(', ', $str);
 		}
 	}
@@ -167,8 +171,9 @@ 
 	 */
 	protected function reverseDirection($orders)
 	{
-		foreach($orders as $column => $direction)
-			$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
+		foreach($orders as $column => $direction) {
+					$orders[$column] = strtolower(trim($direction)) === 'desc' ? 'ASC' : 'DESC';
+		}
 		return $orders;
 	}
 }

framework/Data/Common/Mssql/TMssqlMetaData.php

Spacing +28 added lines, -28 removed lines

@@ -84,26 +84,26 @@ 
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
 EOD;
-		if($schemaName !== null)
+		if ($schemaName !== null)
 			$sql .= ' AND t.table_schema = :schema';
-		if($catalogName !== null)
+		if ($catalogName !== null)
 			$sql .= ' AND t.table_catalog = :catalog';
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName !== null)
+		if ($schemaName !== null)
 			$command->bindValue(':schema', $schemaName);
-		if($catalogName !== null)
+		if ($catalogName !== null)
 			$command->bindValue(':catalog', $catalogName);
 
 		$tableInfo = null;
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
-			if($tableInfo === null)
+			if ($tableInfo === null)
 				$tableInfo = $this->createNewTableInfo($col);
 			$this->processColumn($tableInfo, $col);
 		}
-		if($tableInfo === null)
+		if ($tableInfo === null)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
 		return $tableInfo;
 	}
@@ -116,12 +116,12 @@ 
 	{
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
-		if(count($result) === 1)
-			return [null,null,$result[0]];
-		if(count($result) === 2)
-			return [null,$result[0],$result[1]];
-		if(count($result) > 2)
-			return [$result[0],$result[1],$result[2]];
+		if (count($result) === 1)
+			return [null, null, $result[0]];
+		if (count($result) === 2)
+			return [null, $result[0], $result[1]];
+		if (count($result) > 2)
+			return [$result[0], $result[1], $result[2]];
 	}
 
 	/**
@@ -135,24 +135,24 @@ 
 		$info['ColumnName'] = "[$columnId]"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION']) - 1; //zero-based index
-		if($col['IS_NULLABLE'] !== 'NO')
+		if ($col['IS_NULLABLE'] !== 'NO')
 			$info['AllowNull'] = true;
-		if($col['COLUMN_DEFAULT'] !== null)
+		if ($col['COLUMN_DEFAULT'] !== null)
 			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
 
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
+		if (in_array($columnId, $tableInfo->getPrimaryKeys()))
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
+		if ($this->isForeignKeyColumn($columnId, $tableInfo))
 			$info['IsForeignKey'] = true;
 
-		if($col['IsIdentity'] === '1')
+		if ($col['IsIdentity'] === '1')
 			$info['AutoIncrement'] = true;
 		$info['DbType'] = $col['DATA_TYPE'];
-		if($col['CHARACTER_MAXIMUM_LENGTH'] !== null)
+		if ($col['CHARACTER_MAXIMUM_LENGTH'] !== null)
 			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
-		if($col['NUMERIC_PRECISION'] !== null)
+		if ($col['NUMERIC_PRECISION'] !== null)
 			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
-		if($col['NUMERIC_SCALE'] !== null)
+		if ($col['NUMERIC_SCALE'] !== null)
 			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
 		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
 	}
@@ -167,7 +167,7 @@ 
 		$info['CatalogName'] = $col['TABLE_CATALOG'];
 		$info['SchemaName'] = $col['TABLE_SCHEMA'];
 		$info['TableName'] = $col['TABLE_NAME'];
-		if($col['TABLE_TYPE'] === 'VIEW')
+		if ($col['TABLE_TYPE'] === 'VIEW')
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($col);
 		$class = $this->getTableInfoClass();
@@ -196,10 +196,10 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
-		foreach($command->query()->readAll() as $field)
+		foreach ($command->query()->readAll() as $field)
 			$primary[] = $field['field_name'];
 		$foreign = $this->getForeignConstraints($col);
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys = [];
 		$catalogSchema = "[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
-		foreach($command->query() as $info)
+		foreach ($command->query() as $info)
 		{
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']] = $info['UQ_COLUMN_NAME'];
 			$fkeys[$info['FK_CONSTRAINT_NAME']]['table'] = $info['UQ_TABLE_NAME'];
@@ -255,9 +255,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach($tableInfo->getForeignKeys() as $fk)
+		foreach ($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;
@@ -285,7 +285,7 @@ 
 			if ($schema == self::DEFAULT_SCHEMA)
 				$names[] = $row['TABLE_NAME'];
 			else
-				$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+				$names[] = $schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];
 		}
 
 		return $names;

Braces +65 added lines, -44 removed lines

@@ -84,27 +84,33 @@ 
 									WHERE t.table_name = c.table_name
 										AND t.table_name = :table
 EOD;
-		if($schemaName !== null)
-			$sql .= ' AND t.table_schema = :schema';
-		if($catalogName !== null)
-			$sql .= ' AND t.table_catalog = :catalog';
+		if($schemaName !== null) {
+					$sql .= ' AND t.table_schema = :schema';
+		}
+		if($catalogName !== null) {
+					$sql .= ' AND t.table_catalog = :catalog';
+		}
 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		if($schemaName !== null)
-			$command->bindValue(':schema', $schemaName);
-		if($catalogName !== null)
-			$command->bindValue(':catalog', $catalogName);
+		if($schemaName !== null) {
+					$command->bindValue(':schema', $schemaName);
+		}
+		if($catalogName !== null) {
+					$command->bindValue(':catalog', $catalogName);
+		}
 
 		$tableInfo = null;
 		foreach($command->query() as $col)
 		{
-			if($tableInfo === null)
-				$tableInfo = $this->createNewTableInfo($col);
+			if($tableInfo === null) {
+							$tableInfo = $this->createNewTableInfo($col);
+			}
 			$this->processColumn($tableInfo, $col);
 		}
-		if($tableInfo === null)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
+		if($tableInfo === null) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
 		return $tableInfo;
 	}
 
@@ -116,12 +122,15 @@ 
 	{
 		//remove possible delimiters
 		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
-		if(count($result) === 1)
-			return [null,null,$result[0]];
-		if(count($result) === 2)
-			return [null,$result[0],$result[1]];
-		if(count($result) > 2)
-			return [$result[0],$result[1],$result[2]];
+		if(count($result) === 1) {
+					return [null,null,$result[0]];
+		}
+		if(count($result) === 2) {
+					return [null,$result[0],$result[1]];
+		}
+		if(count($result) > 2) {
+					return [$result[0],$result[1],$result[2]];
+		}
 	}
 
 	/**
@@ -135,25 +144,33 @@ 
 		$info['ColumnName'] = "[$columnId]"; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION']) - 1; //zero-based index
-		if($col['IS_NULLABLE'] !== 'NO')
-			$info['AllowNull'] = true;
-		if($col['COLUMN_DEFAULT'] !== null)
-			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+		if($col['IS_NULLABLE'] !== 'NO') {
+					$info['AllowNull'] = true;
+		}
+		if($col['COLUMN_DEFAULT'] !== null) {
+					$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+		}
 
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['IsIdentity'] === '1')
-			$info['AutoIncrement'] = true;
+		if($col['IsIdentity'] === '1') {
+					$info['AutoIncrement'] = true;
+		}
 		$info['DbType'] = $col['DATA_TYPE'];
-		if($col['CHARACTER_MAXIMUM_LENGTH'] !== null)
-			$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
-		if($col['NUMERIC_PRECISION'] !== null)
-			$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
-		if($col['NUMERIC_SCALE'] !== null)
-			$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
+		if($col['CHARACTER_MAXIMUM_LENGTH'] !== null) {
+					$info['ColumnSize'] = intval($col['CHARACTER_MAXIMUM_LENGTH']);
+		}
+		if($col['NUMERIC_PRECISION'] !== null) {
+					$info['NumericPrecision'] = intval($col['NUMERIC_PRECISION']);
+		}
+		if($col['NUMERIC_SCALE'] !== null) {
+					$info['NumericScale'] = intval($col['NUMERIC_SCALE']);
+		}
 		$tableInfo->Columns[$columnId] = new TMssqlTableColumn($info);
 	}
 
@@ -167,8 +184,9 @@ 
 		$info['CatalogName'] = $col['TABLE_CATALOG'];
 		$info['SchemaName'] = $col['TABLE_SCHEMA'];
 		$info['TableName'] = $col['TABLE_NAME'];
-		if($col['TABLE_TYPE'] === 'VIEW')
-			$info['IsView'] = true;
+		if($col['TABLE_TYPE'] === 'VIEW') {
+					$info['IsView'] = true;
+		}
 		list($primary, $foreign) = $this->getConstraintKeys($col);
 		$class = $this->getTableInfoClass();
 		return new $class($info, $primary, $foreign);
@@ -196,8 +214,9 @@ 
 		$command = $this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$primary = [];
-		foreach($command->query()->readAll() as $field)
-			$primary[] = $field['field_name'];
+		foreach($command->query()->readAll() as $field) {
+					$primary[] = $field['field_name'];
+		}
 		$foreign = $this->getForeignConstraints($col);
 		return [$primary,$foreign];
 	}
@@ -257,8 +276,9 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}
@@ -282,10 +302,11 @@ 
 		$names = [];
 		foreach ($rows as $row)
 		{
-			if ($schema == self::DEFAULT_SCHEMA)
-				$names[] = $row['TABLE_NAME'];
-			else
-				$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+			if ($schema == self::DEFAULT_SCHEMA) {
+							$names[] = $row['TABLE_NAME'];
+			} else {
+							$names[] = $schema . '.' . $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];
+			}
 		}
 
 		return $names;

framework/Data/Common/TDbTableInfo.php

Spacing +5 added lines, -5 removed lines

@@ -117,7 +117,7 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name)) !== null)
+		if (($column = $this->_columns->itemAt($name)) !== null)
 			return $column;
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
@@ -128,10 +128,10 @@ 
 	 */
 	public function getColumnNames()
 	{
-		if($this->_names === null)
+		if ($this->_names === null)
 		{
 			$this->_names = [];
-			foreach($this->getColumns() as $column)
+			foreach ($this->getColumns() as $column)
 				$this->_names[] = $column->getColumnName();
 		}
 		return $this->_names;
@@ -158,10 +158,10 @@ 
 	 */
 	public function getLowerCaseColumnNames()
 	{
-		if($this->_lowercase === null)
+		if ($this->_lowercase === null)
 		{
 			$this->_lowercase = [];
-			foreach($this->getColumns()->getKeys() as $key)
+			foreach ($this->getColumns()->getKeys() as $key)
 				$this->_lowercase[strtolower($key)] = $key;
 		}
 		return $this->_lowercase;

Braces +9 added lines, -6 removed lines

@@ -117,8 +117,9 @@ 
 	 */
 	public function getColumn($name)
 	{
-		if(($column = $this->_columns->itemAt($name)) !== null)
-			return $column;
+		if(($column = $this->_columns->itemAt($name)) !== null) {
+					return $column;
+		}
 		throw new TDbException('dbtableinfo_invalid_column_name', $name, $this->getTableFullName());
 	}
 
@@ -131,8 +132,9 @@ 
 		if($this->_names === null)
 		{
 			$this->_names = [];
-			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+			foreach($this->getColumns() as $column) {
+							$this->_names[] = $column->getColumnName();
+			}
 		}
 		return $this->_names;
 	}
@@ -161,8 +163,9 @@ 
 		if($this->_lowercase === null)
 		{
 			$this->_lowercase = [];
-			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+			foreach($this->getColumns()->getKeys() as $key) {
+							$this->_lowercase[strtolower($key)] = $key;
+			}
 		}
 		return $this->_lowercase;
 	}