pradosoft / prado

framework/Data/Common/Oracle/TOracleCommandBuilder.php

Spacing +52 added lines, -52 removed lines

@@ -30,10 +30,10 @@ 
 	 * @return string SQL search condition matching on a set of columns.
 	 */
 	public function getSearchExpression($fields, $keywords) {
-		$columns = array ();
-		foreach ($fields as $field) {
-			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+		$columns=array();
+		foreach($fields as $field) {
+			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
+				$columns[]=$field;
 		}
 		return parent :: getSearchExpression($columns, $keywords);
 	}
@@ -42,8 +42,8 @@ 
 	 * @return boolean true if column can be used for LIKE searching.
 	 */
 	protected function isSearchableColumn($column) {
-		$type = strtolower($column->getDbType());
-		return $type === 'character varying' || $type === 'varchar2' || $type === 'character' || $type === 'char' || $type === 'text';
+		$type=strtolower($column->getDbType());
+		return $type==='character varying' || $type==='varchar2' || $type==='character' || $type==='char' || $type==='text';
 	}
 
 	/**
@@ -72,59 +72,59 @@ 
 	 * @param integer row offset, -1 to ignore offset.
 	 * @return string SQL with limit and offset in Oracle way.
 	 */
-	public function applyLimitOffset($sql, $limit = -1, $offset = -1) {
-		if ((int) $limit <= 0 && (int) $offset <= 0)
+	public function applyLimitOffset($sql, $limit=-1, $offset=-1) {
+		if((int) $limit <= 0 && (int) $offset <= 0)
 			return $sql;
 
-		$pradoNUMLIN = 'pradoNUMLIN';
-		$fieldsALIAS = 'xyz';
+		$pradoNUMLIN='pradoNUMLIN';
+		$fieldsALIAS='xyz';
 
-		$nfimDaSQL = strlen($sql);
-		$nfimDoWhere = (strpos($sql, 'ORDER') !== false ? strpos($sql, 'ORDER') : $nfimDaSQL);
-		$niniDoSelect = strpos($sql, 'SELECT') + 6;
-		$nfimDoSelect = (strpos($sql, 'FROM') !== false ? strpos($sql, 'FROM') : $nfimDaSQL);
+		$nfimDaSQL=strlen($sql);
+		$nfimDoWhere=(strpos($sql, 'ORDER')!==false ? strpos($sql, 'ORDER') : $nfimDaSQL);
+		$niniDoSelect=strpos($sql, 'SELECT') + 6;
+		$nfimDoSelect=(strpos($sql, 'FROM')!==false ? strpos($sql, 'FROM') : $nfimDaSQL);
 
 		$WhereInSubSelect="";
 		if(strpos($sql, 'WHERE')!==false)
-			$WhereInSubSelect = "WHERE " .substr($sql, strpos($sql, 'WHERE')+5, $nfimDoWhere - $niniDoWhere);
+			$WhereInSubSelect="WHERE ".substr($sql, strpos($sql, 'WHERE') + 5, $nfimDoWhere - $niniDoWhere);
 
-		$sORDERBY = '';
-		if (stripos($sql, 'ORDER') !== false) {
-			$p = stripos($sql, 'ORDER');
-			$sORDERBY = substr($sql, $p +8);
+		$sORDERBY='';
+		if(stripos($sql, 'ORDER')!==false) {
+			$p=stripos($sql, 'ORDER');
+			$sORDERBY=substr($sql, $p + 8);
 		}
 
-		$fields = substr($sql, 0, $nfimDoSelect);
-		$fields = trim(substr($fields, $niniDoSelect));
-		$aliasedFields = ', ';
+		$fields=substr($sql, 0, $nfimDoSelect);
+		$fields=trim(substr($fields, $niniDoSelect));
+		$aliasedFields=', ';
 
-		if (trim($fields) == '*') {
-			$aliasedFields = ", {$fieldsALIAS}.{$fields}";
-			$fields = '';
-			$arr = $this->getTableInfo()->getColumns();
-			foreach ($arr as $field) {
-				$fields .= strtolower($field->getColumnName()) . ', ';
+		if(trim($fields)=='*') {
+			$aliasedFields=", {$fieldsALIAS}.{$fields}";
+			$fields='';
+			$arr=$this->getTableInfo()->getColumns();
+			foreach($arr as $field) {
+				$fields.=strtolower($field->getColumnName()).', ';
 			}
-			$fields = str_replace('"', '', $fields);
-			$fields = trim($fields);
-			$fields = substr($fields, 0, strlen($fields) - 1);
+			$fields=str_replace('"', '', $fields);
+			$fields=trim($fields);
+			$fields=substr($fields, 0, strlen($fields) - 1);
 		} else {
-			if (strpos($fields, ',') !== false) {
-				$arr = $this->getTableInfo()->getColumns();
-				foreach ($arr as $field) {
-					$field = strtolower($field);
-					$existAS = str_ireplace(' as ', '-as-', $field);
-					if (strpos($existAS, '-as-') === false)
-						$aliasedFields .= "{$fieldsALIAS}." . trim($field) . ", ";
+			if(strpos($fields, ',')!==false) {
+				$arr=$this->getTableInfo()->getColumns();
+				foreach($arr as $field) {
+					$field=strtolower($field);
+					$existAS=str_ireplace(' as ', '-as-', $field);
+					if(strpos($existAS, '-as-')===false)
+						$aliasedFields.="{$fieldsALIAS}.".trim($field).", ";
 					else
-						$aliasedFields .= "{$field}, ";
+						$aliasedFields.="{$field}, ";
 				}
-				$aliasedFields = trim($aliasedFields);
-				$aliasedFields = substr($aliasedFields, 0, strlen($aliasedFields) - 1);
+				$aliasedFields=trim($aliasedFields);
+				$aliasedFields=substr($aliasedFields, 0, strlen($aliasedFields) - 1);
 			}
 		}
-		if ($aliasedFields == ', ')
-			$aliasedFields = " , $fieldsALIAS.* ";
+		if($aliasedFields==', ')
+			$aliasedFields=" , $fieldsALIAS.* ";
 
 		/* ************************
 		$newSql = " SELECT $fields FROM ".
@@ -134,17 +134,17 @@ 
 				  ") WHERE {$pradoNUMLIN} >= {$offset} ";
 
 		************************* */
-		$offset=(int)$offset;
-		$toReg = $offset + $limit ;
-		$fullTableName = $this->getTableInfo()->getTableFullName();
-		if (empty ($sORDERBY))
+		$offset=(int) $offset;
+		$toReg=$offset + $limit;
+		$fullTableName=$this->getTableInfo()->getTableFullName();
+		if(empty ($sORDERBY))
 			$sORDERBY="ROWNUM";
 
-		$newSql = 	" SELECT $fields FROM " .
-					"(					" .
-					"		SELECT ROW_NUMBER() OVER ( ORDER BY {$sORDERBY} ) -1 as {$pradoNUMLIN} {$aliasedFields} " .
-					"		FROM {$fullTableName} {$fieldsALIAS} $WhereInSubSelect" .
-					") nn					" .
+		$newSql=" SELECT $fields FROM ".
+					"(					".
+					"		SELECT ROW_NUMBER() OVER ( ORDER BY {$sORDERBY} ) -1 as {$pradoNUMLIN} {$aliasedFields} ".
+					"		FROM {$fullTableName} {$fieldsALIAS} $WhereInSubSelect".
+					") nn					".
 					" WHERE nn.{$pradoNUMLIN} >= {$offset} AND nn.{$pradoNUMLIN} < {$toReg} ";
 		//echo $newSql."\n<br>\n";
 		return $newSql;

framework/Data/Common/Oracle/TOracleTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 class TOracleTableColumn extends TDbTableColumn
 {
 	private static $types=array(
-		'numeric' => array( 'numeric' )
+		'numeric' => array('numeric')
 //		'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'),
 //		'boolean' => array('boolean'),
 //		'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric')
@@ -36,7 +36,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Oracle/TOracleTableInfo.php

Spacing +8 added lines, -8 removed lines

@@ -32,7 +32,7 @@ 
 	 * Sets the database table meta data information.
 	 * @param array table column information.
 	 */
-	public function __construct($tableInfo=array(),$primary=array(),$foreign=array())
+	public function __construct($tableInfo=array(), $primary=array(), $foreign=array())
 	{
 		$this->_info=$tableInfo;
 		$this->_primaryKeys=$primary;
@@ -47,7 +47,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Oracle.TOracleCommandBuilder');
-		return new TOracleCommandBuilder($connection,$this);
+		return new TOracleCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	public function getInfo($name,$default=null)
+	public function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -64,7 +64,7 @@ 
 	 * @param string information array key name
 	 * @param mixed new information array value.
 	 */
-	protected function setInfo($name,$value)
+	protected function setInfo($name, $value)
 	{
 		$this->_info[$name]=$value;
 	}
@@ -90,7 +90,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -107,7 +107,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());
 	}
@@ -119,7 +119,7 @@ 
 	public function getColumnNames()
 	{
 		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+			$names[]=$column->getColumnName();
 		return $names;
 	}
 
@@ -148,7 +148,7 @@ 
 		{
 			$this->_lowercase=array();
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

Doc Comments +3 added lines, -1 removed lines

@@ -47,7 +47,7 @@ 
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TOracleCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{
@@ -57,6 +57,8 @@ 
 	/**
 	 * @param string information array key name
 	 * @param mixed default value if information array value is null
+	 * @param string $name
+	 * @param boolean $default
 	 * @return mixed information array value.
 	 */
 	public function getInfo($name,$default=null)

framework/Data/Common/Pgsql/TPgsqlTableInfo.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Pgsql.TPgsqlCommandBuilder');
-		return new TPgsqlCommandBuilder($connection,$this);
+		return new TPgsqlCommandBuilder($connection, $this);
 	}
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TPgsqlCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 */
 	public function getPHPType()
 	{
-		$dbtype = strtolower($this->getDbType());
+		$dbtype=strtolower($this->getDbType());
 		foreach(self::$types as $type => $dbtypes)
 		{
 			if(in_array($dbtype, $dbtypes))

framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -30,11 +30,11 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		$columns = array();
+		$columns=array();
 		foreach($fields as $field)
 		{
 			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+				$columns[]=$field;
 		}
 		return parent::getSearchExpression($columns, $keywords);
 	}
@@ -44,9 +44,9 @@ 
 	 */
 	protected function isSearchableColumn($column)
 	{
-		$type = strtolower($column->getDbType());
-		return $type === 'character varying' || $type === 'varchar' ||
-				$type === 'character' || $type === 'char' || $type === 'text';
+		$type=strtolower($column->getDbType());
+		return $type==='character varying' || $type==='varchar' ||
+				$type==='character' || $type==='char' || $type==='text';
 	}
 
 	/**
@@ -59,7 +59,7 @@ 
 	{
 		$conditions=array();
 		foreach($words as $word)
-			$conditions[] = $column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+			$conditions[]=$column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
 		return '('.implode(' AND ', $conditions).')';
 	}
 

framework/Data/Common/TDbCommandBuilder.php

Spacing +80 added lines, -80 removed lines

@@ -88,10 +88,10 @@ 
 	 */
 	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 : '';
+		$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;
 	}
 
@@ -105,18 +105,18 @@ 
 		$orders=array();
 		foreach($ordering as $name => $direction)
 		{
-			$direction = strtolower($direction) == 'desc' ? 'DESC' : 'ASC';
-			if(false !== strpos($name, '(') && false !== strpos($name, ')')) {
+			$direction=strtolower($direction)=='desc' ? 'DESC' : 'ASC';
+			if(false!==strpos($name, '(') && false!==strpos($name, ')')) {
 				// key is a function (bad practice, but we need to handle it)
-				$key = $name;
+				$key=$name;
 			} else {
 				// key is a column
-				$key = $this->getTableInfo()->getColumn($name)->getColumnName();
+				$key=$this->getTableInfo()->getColumn($name)->getColumnName();
 			}
-			$orders[] = $key.' '.$direction;
+			$orders[]=$key.' '.$direction;
 		}
 		if(count($orders) > 0)
-			$sql .= ' ORDER BY '.implode(', ', $orders);
+			$sql.=' ORDER BY '.implode(', ', $orders);
 		return $sql;
 	}
 
@@ -130,13 +130,13 @@ 
 	 */
 	public function getSearchExpression($fields, $keywords)
 	{
-		if(strlen(trim($keywords)) == 0) return '';
-		$words = preg_split('/\s/u', $keywords);
-		$conditions = array();
+		if(strlen(trim($keywords))==0) return '';
+		$words=preg_split('/\s/u', $keywords);
+		$conditions=array();
 		foreach($fields as $field)
 		{
-			$column = $this->getTableInfo()->getColumn($field)->getColumnName();
-			$conditions[] = $this->getSearchCondition($column, $words);
+			$column=$this->getTableInfo()->getColumn($field)->getColumnName();
+			$conditions[]=$this->getSearchCondition($column, $words);
 		}
 		return '('.implode(' OR ', $conditions).')';
 	}
@@ -150,7 +150,7 @@ 
 	{
 		$conditions=array();
 		foreach($words as $word)
-			$conditions[] = $column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+			$conditions[]=$column.' LIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
 		return '('.implode(' AND ', $conditions).')';
 	}
 
@@ -195,102 +195,102 @@ 
 	 */
 	public function getSelectFieldList($data='*') {
 		if(is_scalar($data)) {
-			$tmp = explode(',', $data);
-			$result = array();
+			$tmp=explode(',', $data);
+			$result=array();
 			foreach($tmp as $v)
-				$result[] = trim($v);
+				$result[]=trim($v);
 			return $result;
 		}
 
-		$bHasWildcard = false;
-		$result = array();
+		$bHasWildcard=false;
+		$result=array();
 		if(is_array($data) || $data instanceof Traversable) {
-			$columns = $this->getTableInfo()->getColumns();
+			$columns=$this->getTableInfo()->getColumns();
 			foreach($data as $key=>$value) {
 				if($key==='*' || $value==='*') {
-					$bHasWildcard = true;
+					$bHasWildcard=true;
 					continue;
 				}
 
 				if(strToUpper($key)==='NULL') {
-					$result[] = 'NULL';
+					$result[]='NULL';
 					continue;
 				}
 
 				if(strpos($key, '(')!==false && strpos($key, ')')!==false) {
-					$result[] = $key;
+					$result[]=$key;
 					continue;
 				}
 
 				if(stripos($key, 'AS')!==false) {
-					$result[] = $key;
+					$result[]=$key;
 					continue;
 				}
 
 				if(stripos($value, 'AS')!==false) {
-					$result[] = $value;
+					$result[]=$value;
 					continue;
 				}
 
-				$v = isset($columns[$value]);
-				$k = isset($columns[$key]);
+				$v=isset($columns[$value]);
+				$k=isset($columns[$key]);
 				if(is_integer($key) && $v) {
-					$key = $value;
-					$k = $v;
+					$key=$value;
+					$k=$v;
 				}
 
 				if(strToUpper($value)==='NULL') {
 					if($k)
-						$result[] = 'NULL AS ' . $columns[$key]->getColumnName();
+						$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();
+						$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) {
-					$result[] = $columns[$value]->getColumnName();
+					$result[]=$columns[$value]->getColumnName();
 					continue;
 				}
 
 				if($k && $value==null) {
-					$result[] = $columns[$key]->getColumnName();
+					$result[]=$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($key) && $v) {
-					$result[] = $columns[$value]->getColumnName() . ' AS ' . $key;
+					$result[]=$columns[$value]->getColumnName().' AS '.$key;
 					continue;
 				}
 
 				if(is_numeric($value) && $k) {
-					$result[] = $value . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$value.' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(is_string($value) && $k) {
-					$result[] = $this->getDbConnection()->quoteString($value) . ' AS ' . $columns[$key]->getColumnName();
+					$result[]=$this->getDbConnection()->quoteString($value).' AS '.$columns[$key]->getColumnName();
 					continue;
 				}
 
 				if(!$v && !$k && is_integer($key)) {
-					$result[] = is_numeric($value) ? $value : $this->getDbConnection()->quoteString((string)$value);
+					$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)
-			$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;
 	}
@@ -304,21 +304,21 @@ 
 	 */
 	public function createFindCommand($where='1=1', $parameters=array(), $ordering=array(), $limit=-1, $offset=-1, $select='*')
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		$fields = implode(', ', $this -> getSelectFieldList($select));
-		$sql = "SELECT {$fields} FROM {$table}";
+		$table=$this->getTableInfo()->getTableFullName();
+		$fields=implode(', ', $this -> getSelectFieldList($select));
+		$sql="SELECT {$fields} FROM {$table}";
 		if(!empty($where))
-			$sql .= " WHERE {$where}";
+			$sql.=" WHERE {$where}";
 		return $this->applyCriterias($sql, $parameters, $ordering, $limit, $offset);
 	}
 
-	public function applyCriterias($sql, $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function applyCriterias($sql, $parameters=array(), $ordering=array(), $limit=-1, $offset=-1)
 	{
 		if(count($ordering) > 0)
-			$sql = $this->applyOrdering($sql, $ordering);
-		if($limit>=0 || $offset>=0)
-			$sql = $this->applyLimitOffset($sql, $limit, $offset);
-		$command = $this->createCommand($sql);
+			$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;
 	}
@@ -329,7 +329,7 @@ 
 	 * @param array binding parameters.
 	 * @return TDbCommand count command.
 	 */
-	public function createCountCommand($where='1=1', $parameters=array(),$ordering=array(), $limit=-1, $offset=-1)
+	public function createCountCommand($where='1=1', $parameters=array(), $ordering=array(), $limit=-1, $offset=-1)
 	{
 		return $this->createFindCommand($where, $parameters, $ordering, $limit, $offset, 'COUNT(*)');
 	}
@@ -342,12 +342,12 @@ 
 	 * @param array delete parameters.
 	 * @return TDbCommand delete command.
 	 */
-	public function createDeleteCommand($where,$parameters=array())
+	public function createDeleteCommand($where, $parameters=array())
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("DELETE FROM {$table}".$where);
+		$table=$this->getTableInfo()->getTableFullName();
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("DELETE FROM {$table}".$where);
 		$this->bindArrayValues($command, $parameters);
 		return $command;
 	}
@@ -362,9 +362,9 @@ 
 	 */
 	public function createInsertCommand($data)
 	{
-		$table = $this->getTableInfo()->getTableFullName();
-		list($fields, $bindings) = $this->getInsertFieldBindings($data);
-		$command = $this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
+		$table=$this->getTableInfo()->getTableFullName();
+		list($fields, $bindings)=$this->getInsertFieldBindings($data);
+		$command=$this->createCommand("INSERT INTO {$table}({$fields}) VALUES ($bindings)");
 		$this->bindColumnValues($command, $data);
 		return $command;
 	}
@@ -379,15 +379,15 @@ 
 	 */
 	public function createUpdateCommand($data, $where, $parameters=array())
 	{
-		$table = $this->getTableInfo()->getTableFullName();
+		$table=$this->getTableInfo()->getTableFullName();
 		if($this->hasIntegerKey($parameters))
-			$fields = implode(', ', $this->getColumnBindings($data, true));
+			$fields=implode(', ', $this->getColumnBindings($data, true));
 		else
-			$fields = implode(', ', $this->getColumnBindings($data));
+			$fields=implode(', ', $this->getColumnBindings($data));
 
-		if (!empty($where))
-			$where = ' WHERE '.$where;
-		$command = $this->createCommand("UPDATE {$table} SET {$fields}".$where);
+		if(!empty($where))
+			$where=' WHERE '.$where;
+		$command=$this->createCommand("UPDATE {$table} SET {$fields}".$where);
 		$this->bindArrayValues($command, array_merge($data, $parameters));
 		return $command;
 	}
@@ -399,13 +399,13 @@ 
 	 */
 	protected function getInsertFieldBindings($values)
 	{
-		$fields = array(); $bindings=array();
+		$fields=array(); $bindings=array();
 		foreach(array_keys($values) as $name)
 		{
-			$fields[] = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = ':'.$name;
+			$fields[]=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=':'.$name;
 		}
-		return array(implode(', ',$fields), implode(', ', $bindings));
+		return array(implode(', ', $fields), implode(', ', $bindings));
 	}
 
 	/**
@@ -419,8 +419,8 @@ 
 		$bindings=array();
 		foreach(array_keys($values) as $name)
 		{
-			$column = $this->getTableInfo()->getColumn($name)->getColumnName();
-			$bindings[] = $position ? $column.' = ?' : $column.' = :'.$name;
+			$column=$this->getTableInfo()->getColumn($name)->getColumnName();
+			$bindings[]=$position ? $column.' = ?' : $column.' = :'.$name;
 		}
 		return $bindings;
 	}
@@ -444,8 +444,8 @@ 
 	{
 		foreach($values as $name=>$value)
 		{
-			$column = $this->getTableInfo()->getColumn($name);
-			if($value === null && $column->getAllowNull())
+			$column=$this->getTableInfo()->getColumn($name);
+			if($value===null && $column->getAllowNull())
 				$command->bindValue(':'.$name, null, PDO::PARAM_NULL);
 			else
 				$command->bindValue(':'.$name, $value, $column->getPdoType());
@@ -460,15 +460,15 @@ 
 	{
 		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]));
+			$values=array_values($values);
+			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)
 			{
-				$prop = $name[0]===':' ? $name : ':'.$name;
+				$prop=$name[0]===':' ? $name : ':'.$name;
 				$command->bindValue($prop, $value, $this->getPdoType($value));
 			}
 		}

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
 		if ($this->sourcepath === NULL)
 		{
 			$this->sourcepath = $sourcepath;
-		}
-		else
+		} else
 		{
 			$this->sourcepath->append($sourcepath);
 		}

Doc Comments +1 added lines, -2 removed lines

@@ -191,7 +191,6 @@ 
 	 * array('col1' => 'NULL', '*')
 	 * // SELECT `col1`, `col2`, `col3`, NULL AS `col1` FROM...
 	 * </code>
-	 * @param mixed $value
 	 * @return array of generated fields - use implode(', ', $selectfieldlist) to collapse field list for usage
 	 * @since 3.1.7
 	 * @todo add support for table aliasing
@@ -399,7 +398,7 @@ 
 	/**
 	 * Returns a list of insert field name and a list of binding names.
 	 * @param object array or object to be inserted.
-	 * @return array tuple ($fields, $bindings)
+	 * @return string[] tuple ($fields, $bindings)
 	 */
 	protected function getInsertFieldBindings($values)
 	{

framework/Data/Common/Mssql/TMssqlCommandBuilder.php

Spacing +19 added lines, -19 removed lines

@@ -31,7 +31,7 @@ 
 		{
 			if($column->hasSequence())
 			{
-				$command = $this->getDbConnection()->createCommand('SELECT @@Identity');
+				$command=$this->getDbConnection()->createCommand('SELECT @@Identity');
 				return intval($command->queryScalar());
 			}
 		}
@@ -79,12 +79,12 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$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);
+		$limit=$limit!==null ? intval($limit) : -1;
+		$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);
 		else if($limit > 0 && $offset > 0)
-			$sql = $this->rewriteLimitOffsetSql($sql, $limit,$offset);
+			$sql=$this->rewriteLimitOffsetSql($sql, $limit, $offset);
 		return $sql;
 	}
 
@@ -98,13 +98,13 @@ 
 	 */
 	protected function rewriteLimitOffsetSql($sql, $limit, $offset)
 	{
-		$fetch = $limit+$offset;
-		$sql = preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i',"\\1SELECT\\2 TOP $fetch", $sql);
-		$ordering = $this->findOrdering($sql);
+		$fetch=$limit + $offset;
+		$sql=preg_replace('/^([\s(])*SELECT( DISTINCT)?(?!\s*TOP\s*\()/i', "\\1SELECT\\2 TOP $fetch", $sql);
+		$ordering=$this->findOrdering($sql);
 
-		$orginalOrdering = $this->joinOrdering($ordering);
-		$reverseOrdering = $this->joinOrdering($this->reverseDirection($ordering));
-		$sql = "SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
+		$orginalOrdering=$this->joinOrdering($ordering);
+		$reverseOrdering=$this->joinOrdering($this->reverseDirection($ordering));
+		$sql="SELECT * FROM (SELECT TOP {$limit} * FROM ($sql) as [__inner top table__] {$reverseOrdering}) as [__outer top table__] {$orginalOrdering}";
 		return $sql;
 	}
 
@@ -121,9 +121,9 @@ 
 		$matches=array();
 		$ordering=array();
 		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]);
+			$parts=explode(',', $matches[2][0]);
 			foreach($parts as $part)
 			{
 				$subs=array();
@@ -131,12 +131,12 @@ 
 				{
 					if(count($subs) > 1 && count($subs[2]) > 0)
 					{
-						$ordering[$subs[1][0]] = $subs[2][0];
+						$ordering[$subs[1][0]]=$subs[2][0];
 					}
 					//else what?
 				}
 				else
-					$ordering[trim($part)] = 'ASC';
+					$ordering[trim($part)]='ASC';
 			}
 		}
 		return $ordering;
@@ -148,11 +148,11 @@ 
 	 */
 	protected function joinOrdering($orders)
 	{
-		if(count($orders)>0)
+		if(count($orders) > 0)
 		{
 			$str=array();
 			foreach($orders as $column => $direction)
-				$str[] = $column.' '.$direction;
+				$str[]=$column.' '.$direction;
 			return 'ORDER BY '.implode(', ', $str);
 		}
 	}
@@ -164,7 +164,7 @@ 
 	protected function reverseDirection($orders)
 	{
 		foreach($orders as $column => $direction)
-			$orders[$column] = strtolower(trim($direction))==='desc' ? 'ASC' : 'DESC';
+			$orders[$column]=strtolower(trim($direction))==='desc' ? 'ASC' : 'DESC';
 		return $orders;
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -70,8 +70,7 @@
 				{
 					$domain=substr($value,$pos+1);
 					return $domain===''?false:checkdnsrr($domain,'MX');
-				}
-				else
+				} else
 					return false;
 			}
 		}

framework/Data/Common/Mssql/TMssqlTableInfo.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Mssql.TMssqlCommandBuilder');
-		return new TMssqlCommandBuilder($connection,$this);
+		return new TMssqlCommandBuilder($connection, $this);
 	}
 }
 

Doc Comments +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 
 	/**
 	 * @param TDbConnection database connection.
-	 * @return TDbCommandBuilder new command builder
+	 * @return TMssqlCommandBuilder new command builder
 	 */
 	public function createCommandBuilder($connection)
 	{