pradosoft / prado

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);
 	}
 }
 

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Spacing +66 added lines, -66 removed lines

@@ -24,7 +24,7 @@ 
  */
 class TPgsqlMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'public';
+	private $_defaultSchema='public';
 
 	/**
 	 * @return string TDbTableInfo class name.
@@ -86,10 +86,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts= explode('.', str_replace('"','',$table))) > 1)
+		if(count($parts=explode('.', str_replace('"', '', $table))) > 1)
 			return array($parts[0], $parts[1]);
 		else
-			return array($this->getDefaultSchema(),$parts[0]);
+			return array($this->getDefaultSchema(), $parts[0]);
 	}
 
 	/**
@@ -99,12 +99,12 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
 
 		// This query is made much more complex by the addition of the 'attisserial' field.
 		// The subquery to get that field checks to see if there is an internally dependent
 		// sequence on the field.
-		$sql =
+		$sql=
 <<<EOD
 		SELECT
 			a.attname,
@@ -135,14 +135,14 @@ 
 		ORDER BY a.attnum
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
-		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
+		$tableInfo=$this->createNewTableInfo($schemaName, $tableName);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
+			$col['index']=$index++;
 			$this->processColumn($tableInfo, $col);
 		}
 		if($index===0)
@@ -155,15 +155,15 @@ 
 	 * @param string table name.
 	 * @return TPgsqlTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName'] = $this->assertIdentifier($tableName);
-		if($this->getIsView($schemaName,$tableName))
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
-		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+		$info['SchemaName']=$this->assertIdentifier($schemaName);
+		$info['TableName']=$this->assertIdentifier($tableName);
+		if($this->getIsView($schemaName, $tableName))
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -175,7 +175,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
+			$ref='http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -186,19 +186,19 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 		SELECT count(c.relname) FROM pg_catalog.pg_class c
 		LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)
 		WHERE (n.nspname=:schema) AND (c.relkind = 'v'::"char") AND c.relname = :table
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
-		$command->bindValue(':schema',$schemaName);
+		$command=$this->getDbConnection()->createCommand($sql);
+		$command->bindValue(':schema', $schemaName);
 		$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -207,56 +207,56 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['attname']; //use column name as column Id
+		$columnId=$col['attname']; //use column name as column Id
 
-		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = $col['index'];
+		$info['ColumnName']='"'.$columnId.'"'; //quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
 		if(!$col['attnotnull'])
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] =  $col['atttypmod'] - 4;
+			$info['ColumnSize']=$col['atttypmod'] - 4;
 		if($col['atthasdef'])
-			$info['DefaultValue'] = $col['adsrc'];
-		if($col['attisserial'] || substr($col['adsrc'],0,8) === 'nextval(')
+			$info['DefaultValue']=$col['adsrc'];
+		if($col['attisserial'] || substr($col['adsrc'], 0, 8)==='nextval(')
 		{
-			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc']))!==null)
+			if(($sequence=$this->getSequenceName($tableInfo, $col['adsrc']))!==null)
 			{
-				$info['SequenceName'] = $sequence;
+				$info['SequenceName']=$sequence;
 				unset($info['DefaultValue']);
 			}
 		}
-		$matches = array();
+		$matches=array();
 		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
-			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/','',$col['type']);
+			$info['DbType']=preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
 			if($this->isPrecisionType($info['DbType']))
 			{
-				$info['NumericPrecision'] = intval($matches[1]);
+				$info['NumericPrecision']=intval($matches[1]);
 				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+					$info['NumericScale']=intval($matches[2]);
 			}
 			else
-				$info['ColumnSize'] = intval($matches[1]);
+				$info['ColumnSize']=intval($matches[1]);
 		}
 		else
-			$info['DbType'] = $col['type'];
+			$info['DbType']=$col['type'];
 
-		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
+		$tableInfo->Columns[$columnId]=new TPgsqlTableColumn($info);
 	}
 
 	/**
 	 * @return string serial name if found, null otherwise.
 	 */
-	protected function getSequenceName($tableInfo,$src)
+	protected function getSequenceName($tableInfo, $src)
 	{
-		$matches = array();
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i',$src,$matches))
+		$matches=array();
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
 			if(is_int(strpos($matches[1], '.')))
 				return $matches[1];
@@ -270,7 +270,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='numeric' || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -282,7 +282,7 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$sql =
+		$sql=
 <<<EOD
 	SELECT conname, consrc, contype, indkey, indisclustered FROM (
 			SELECT
@@ -330,25 +330,25 @@ 
 			1
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
-		$primary = array();
-		$foreign = array();
+		$primary=array();
+		$foreign=array();
 		foreach($command->query() as $row)
 		{
 			switch($row['contype'])
 			{
 				case 'p':
-					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
+					$primary=$this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
-						$foreign[] = $fkey;
+					if(($fkey=$this->getForeignKeys($row['consrc']))!==null)
+						$foreign[]=$fkey;
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -358,8 +358,8 @@ 
 	 */
 	protected function getPrimaryKeys($tableName, $schemaName, $columnIndex)
 	{
-		$index = join(', ', explode(' ', $columnIndex));
-		$sql =
+		$index=join(', ', explode(' ', $columnIndex));
+		$sql=
 <<<EOD
 		SELECT attnum, attname FROM pg_catalog.pg_attribute WHERE
 		attrelid=(
@@ -369,14 +369,14 @@ 
 		)
 				AND attnum IN ({$index})
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
-		$primary = array();
+		$primary=array();
 		foreach($command->query() as $row)
 		{
-						$primary[] = $row['attname'];
+						$primary[]=$row['attname'];
 		}
 
 		return $primary;
@@ -389,16 +389,16 @@ 
 	 */
 	protected function getForeignKeys($src)
 	{
-		$matches = array();
-		$brackets = '\(([^\)]+)\)';
-		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
+		$matches=array();
+		$brackets='\(([^\)]+)\)';
+		$find="/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
 		if(preg_match($find, $src, $matches))
 		{
-			$keys = preg_split('/,\s+/', $matches[1]);
-			$fkeys = array();
+			$keys=preg_split('/,\s+/', $matches[1]);
+			$fkeys=array();
 			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
-			return array('table' => str_replace('"','',$matches[2]), 'keys' => $fkeys);
+				$fkeys[$keys[$i]]=$fkey;
+			return array('table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys);
 		}
 	}
 
@@ -432,7 +432,7 @@ 
 WHERE table_schema=:schema AND table_type='BASE TABLE'
 EOD;
 		$command=$this->getDbConnection()->createCommand($sql);
-		$command->bindParam(':schema',$schema);
+		$command->bindParam(':schema', $schema);
 		$rows=$command->queryAll();
 		$names=array();
 		foreach($rows as $row)

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));
 			}
 		}

framework/Data/Common/TDbTableColumn.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
  */
 class TDbTableColumn extends TComponent
 {
-	const UNDEFINED_VALUE= INF; //use infinity for undefined value
+	const UNDEFINED_VALUE=INF; //use infinity for undefined value
 
 	private $_info=array();
 
@@ -36,7 +36,7 @@ 
 	 * @param mixed default value if information array value is null
 	 * @return mixed information array value.
 	 */
-	protected function getInfo($name,$default=null)
+	protected function getInfo($name, $default=null)
 	{
 		return isset($this->_info[$name]) ? $this->_info[$name] : $default;
 	}
@@ -45,7 +45,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;
 	}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getAllowNull()
 	{
-		return $this->getInfo('AllowNull',false);
+		return $this->getInfo('AllowNull', false);
 	}
 
 	/**
@@ -150,7 +150,7 @@ 
 		if(($precision=$this->getNumericPrecision())!==null)
 		{
 			$scale=$this->getNumericScale();
-			return $scale===null ? pow(10,$precision) : pow(10,$precision-$scale);
+			return $scale===null ? pow(10, $precision) : pow(10, $precision - $scale);
 		}
 	}
 
@@ -159,7 +159,7 @@ 
 	 */
 	public function getIsPrimaryKey()
 	{
-		return $this->getInfo('IsPrimaryKey',false);
+		return $this->getInfo('IsPrimaryKey', false);
 	}
 
 	/**
@@ -167,7 +167,7 @@ 
 	 */
 	public function getIsForeignKey()
 	{
-		return $this->getInfo('IsForeignKey',false);
+		return $this->getInfo('IsForeignKey', false);
 	}
 
 	/**

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;
 	}
 }

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);
 	}
 }
 

framework/Data/Common/Mssql/TMssqlMetaData.php

Spacing +47 added lines, -47 removed lines

@@ -69,9 +69,9 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($catalogName,$schemaName,$tableName) = $this->getCatalogSchemaTableName($table);
+		list($catalogName, $schemaName, $tableName)=$this->getCatalogSchemaTableName($table);
 		$this->getDbConnection()->setActive(true);
-		$sql = <<<EOD
+		$sql=<<<EOD
 				SELECT t.*,
 												c.*,
 					columnproperty(object_id(c.table_schema + '.' + c.table_name), c.column_name,'IsIdentity') as IsIdentity
@@ -81,11 +81,11 @@ 
 										AND t.table_name = :table
 EOD;
 		if($schemaName!==null)
-			$sql .= ' AND t.table_schema = :schema';
+			$sql.=' AND t.table_schema = :schema';
 		if($catalogName!==null)
-			$sql .= ' AND t.table_catalog = :catalog';
+			$sql.=' AND t.table_catalog = :catalog';
 
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		if($schemaName!==null)
 			$command->bindValue(':schema', $schemaName);
@@ -96,8 +96,8 @@ 
 		foreach($command->query() as $col)
 		{
 			if($tableInfo===null)
-				$tableInfo = $this->createNewTableInfo($col);
-			$this->processColumn($tableInfo,$col);
+				$tableInfo=$this->createNewTableInfo($col);
+			$this->processColumn($tableInfo, $col);
 		}
 		if($tableInfo===null)
 			throw new TDbException('dbmetadata_invalid_table_view', $table);
@@ -111,13 +111,13 @@ 
 	protected function getCatalogSchemaTableName($table)
 	{
 		//remove possible delimiters
-		$result = explode('.', preg_replace('/\[|\]|"/', '', $table));
+		$result=explode('.', preg_replace('/\[|\]|"/', '', $table));
 		if(count($result)===1)
-			return array(null,null,$result[0]);
+			return array(null, null, $result[0]);
 		if(count($result)===2)
-			return array(null,$result[0],$result[1]);
-		if(count($result)>2)
-			return array($result[0],$result[1],$result[2]);
+			return array(null, $result[0], $result[1]);
+		if(count($result) > 2)
+			return array($result[0], $result[1], $result[2]);
 	}
 
 	/**
@@ -126,31 +126,31 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['COLUMN_NAME'];
+		$columnId=$col['COLUMN_NAME'];
 
-		$info['ColumnName'] = "[$columnId]"; //quote the column names!
-		$info['ColumnId'] = $columnId;
-		$info['ColumnIndex'] = intval($col['ORDINAL_POSITION'])-1; //zero-based index
+		$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;
+			$info['AllowNull']=true;
 		if($col['COLUMN_DEFAULT']!==null)
-			$info['DefaultValue'] = $col['COLUMN_DEFAULT'];
+			$info['DefaultValue']=$col['COLUMN_DEFAULT'];
 
 		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['IsIdentity']==='1')
-			$info['AutoIncrement'] = true;
-		$info['DbType'] = $col['DATA_TYPE'];
+			$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']);
+			$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);
+			$info['NumericScale']=intval($col['NUMERIC_SCALE']);
+		$tableInfo->Columns[$columnId]=new TMssqlTableColumn($info);
 	}
 
 	/**
@@ -160,14 +160,14 @@ 
 	 */
 	protected function createNewTableInfo($col)
 	{
-		$info['CatalogName'] = $col['TABLE_CATALOG'];
-		$info['SchemaName'] = $col['TABLE_SCHEMA'];
-		$info['TableName'] = $col['TABLE_NAME'];
+		$info['CatalogName']=$col['TABLE_CATALOG'];
+		$info['SchemaName']=$col['TABLE_SCHEMA'];
+		$info['TableName']=$col['TABLE_NAME'];
 		if($col['TABLE_TYPE']==='VIEW')
-			$info['IsView'] = true;
-		list($primary, $foreign) = $this->getConstraintKeys($col);
-		$class = $this->getTableInfoClass();
-		return new $class($info,$primary,$foreign);
+			$info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($col);
+		$class=$this->getTableInfoClass();
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -178,7 +178,7 @@ 
 	 */
 	protected function getConstraintKeys($col)
 	{
-		$sql = <<<EOD
+		$sql=<<<EOD
 		SELECT k.column_name field_name
 				FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE k
 				LEFT JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS c
@@ -189,13 +189,13 @@ 
 			c.constraint_type ='PRIMARY KEY'
 				AND k.table_name = :table
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
-		$primary = array();
+		$primary=array();
 		foreach($command->query()->readAll() as $field)
-			$primary[] = $field['field_name'];
-		$foreign = $this->getForeignConstraints($col);
-		return array($primary,$foreign);
+			$primary[]=$field['field_name'];
+		$foreign=$this->getForeignConstraints($col);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -207,7 +207,7 @@ 
 	protected function getForeignConstraints($col)
 	{
 		//From http://msdn2.microsoft.com/en-us/library/aa175805(SQL.80).aspx
-		$sql = <<<EOD
+		$sql=<<<EOD
 		SELECT
 				KCU1.CONSTRAINT_NAME AS 'FK_CONSTRAINT_NAME'
 			, KCU1.TABLE_NAME AS 'FK_TABLE_NAME'
@@ -232,14 +232,14 @@ 
 			AND KCU2.ORDINAL_POSITION = KCU1.ORDINAL_POSITION
 		WHERE KCU1.TABLE_NAME = :table
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $col['TABLE_NAME']);
 		$fkeys=array();
-		$catalogSchema = "[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
+		$catalogSchema="[{$col['TABLE_CATALOG']}].[{$col['TABLE_SCHEMA']}]";
 		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'];
+			$fkeys[$info['FK_CONSTRAINT_NAME']]['keys'][$info['FK_COLUMN_NAME']]=$info['UQ_COLUMN_NAME'];
+			$fkeys[$info['FK_CONSTRAINT_NAME']]['table']=$info['UQ_TABLE_NAME'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}
@@ -276,9 +276,9 @@ 
 		$command->bindParam(":schema", $schema);
 		$rows=$command->queryAll();
 		$names=array();
-		foreach ($rows as $row)
+		foreach($rows as $row)
 		{
-			if ($schema == self::DEFAULT_SCHEMA)
+			if($schema==self::DEFAULT_SCHEMA)
 				$names[]=$row['TABLE_NAME'];
 			else
 				$names[]=$schema.'.'.$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME'];