pradosoft / prado

framework/Data/Common/Mysql/TMysqlTableInfo.php

Spacing +1 added lines, -1 removed lines

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

framework/Data/Common/Mysql/TMysqlTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
  */
 class TMysqlTableColumn extends TDbTableColumn
 {
-	private static $types = array(
+	private static $types=array(
 		'integer' => array('bit', 'tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint'),
 		'boolean' => array('boolean', 'bool'),
 		'float' => array('float', 'double', 'double precision', 'decimal', 'dec', 'numeric', 'fixed')
@@ -35,7 +35,7 @@ 
 	 */
 	public function getPHPType()
 	{
-		$dbtype = trim(str_replace(array('unsigned', 'zerofill'),array('','',),strtolower($this->getDbType())));
+		$dbtype=trim(str_replace(array('unsigned', 'zerofill'), array('', '',), strtolower($this->getDbType())));
 		if($dbtype==='tinyint' && $this->getColumnSize()===1)
 			return 'boolean';
 		foreach(self::$types as $type => $dbtypes)

framework/Data/Common/Mysql/TMysqlMetaData.php

Spacing +74 added lines, -74 removed lines

@@ -74,24 +74,24 @@ 
 	 */
 	protected function createTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
-		$find = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
-		$colCase = $this->getDbConnection()->getColumnCase();
-		if($colCase != TDbColumnCaseMode::Preserved)
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
+		$find=$schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		$colCase=$this->getDbConnection()->getColumnCase();
+		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);
+		$sql="SHOW FULL FIELDS FROM {$find}";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$tableInfo=$this->createNewTableInfo($table);
 		$index=0;
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
-			$this->processColumn($tableInfo,$col);
+			$col['index']=$index++;
+			$this->processColumn($tableInfo, $col);
 		}
 		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;
 	}
@@ -103,7 +103,7 @@ 
 	{
 		if(!$this->_serverVersion)
 		{
-			$version = $this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
+			$version=$this->getDbConnection()->getAttribute(PDO::ATTR_SERVER_VERSION);
 			$digits=array();
 			preg_match('/(\d+)\.(\d+)\.(\d+)/', $version, $digits);
 			$this->_serverVersion=floatval($digits[1].'.'.$digits[2].$digits[3]);
@@ -117,50 +117,50 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = $col['Field'];
+		$columnId=$col['Field'];
 
-		$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['Null']==='YES')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 		if(is_int(strpos(strtolower($col['Extra']), 'auto_increment')))
 			$info['AutoIncrement']=true;
 		if($col['Default']!=="")
-			$info['DefaultValue'] = $col['Default'];
+			$info['DefaultValue']=$col['Default'];
 
 		if($col['Key']==='PRI' || in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
-		$info['DbType'] = $col['Type'];
+		$info['DbType']=$col['Type'];
 		$match=array();
 		//find SET/ENUM values, column size, precision, and scale
 		if(preg_match('/\((.*)\)/', $col['Type'], $match))
 		{
-			$info['DbType']= preg_replace('/\(.*\)/', '', $col['Type']);
+			$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);
+				$info['DbTypeValues']=preg_split("/[',]/S", $match[1], -1, PREG_SPLIT_NO_EMPTY);
 
 			//find column size, precision and scale
-			$pscale = array();
+			$pscale=array();
 			if(preg_match('/(\d+)(?:,(\d+))?+/', $match[1], $pscale))
 			{
 				if($this->isPrecisionType($info['DbType']))
 				{
-					$info['NumericPrecision'] = intval($pscale[1]);
+					$info['NumericPrecision']=intval($pscale[1]);
 					if(count($pscale) > 2)
-						$info['NumericScale'] = intval($pscale[2]);
+						$info['NumericScale']=intval($pscale[2]);
 				}
 				else
-					$info['ColumnSize'] = intval($pscale[1]);
+					$info['ColumnSize']=intval($pscale[1]);
 			}
 		}
 
-		$tableInfo->Columns[$columnId] = new TMysqlTableColumn($info);
+		$tableInfo->Columns[$columnId]=new TMysqlTableColumn($info);
 	}
 
 	/**
@@ -168,7 +168,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='decimal' || $type==='dec'
 				|| $type==='float' || $type==='double'
 				|| $type==='double precision' || $type==='real';
@@ -179,7 +179,7 @@ 
 	 */
 	protected function isEnumSetType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='set' || $type==='enum';
 	}
 
@@ -191,12 +191,12 @@ 
 	protected function getSchemaTableName($table)
 	{
 		//remove the back ticks and separate out the "database.table"
-		$result = explode('.', str_replace('`', '', $table));
+		$result=explode('.', str_replace('`', '', $table));
 		foreach($result as $name)
 		{
 			if(!$this->isValidIdentifier($name))
 			{
-				$ref = 'http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
+				$ref='http://dev.mysql.com/doc/refman/5.0/en/identifiers.html';
 				throw new TDbException('dbcommon_invalid_identifier_name', $table, $ref);
 			}
 		}
@@ -220,14 +220,14 @@ 
 	 */
 	protected function createNewTableInfo($table)
 	{
-		list($schemaName,$tableName) = $this->getSchemaTableName($table);
-		$info['SchemaName'] = $schemaName;
-		$info['TableName'] = $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);
+		list($schemaName, $tableName)=$this->getSchemaTableName($table);
+		$info['SchemaName']=$schemaName;
+		$info['TableName']=$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);
 	}
 
 	/**
@@ -240,25 +240,25 @@ 
 	 * @return boolean true if is view, false otherwise.
 	 * @throws TDbException if table or view does not exist.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
-		if($this->getServerVersion()<5.01)
+		if($this->getServerVersion() < 5.01)
 			return false;
 		if($schemaName!==null)
-			$sql = "SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
+			$sql="SHOW FULL TABLES FROM `{$schemaName}` LIKE :table";
 		else
-			$sql = "SHOW FULL TABLES LIKE :table";
+			$sql="SHOW FULL TABLES LIKE :table";
 
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		try
 		{
-			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
+			return count($result=$command->queryRow()) > 0 && $result['Table_type']==='VIEW';
 		}
 		catch(TDbException $e)
 		{
-			$table = $schemaName===null?$tableName:$schemaName.'.'.$tableName;
-			throw new TDbException('dbcommon_invalid_table_name',$table,$e->getMessage());
+			$table=$schemaName===null ? $tableName : $schemaName.'.'.$tableName;
+			throw new TDbException('dbcommon_invalid_table_name', $table, $e->getMessage());
 		}
 	}
 
@@ -270,22 +270,22 @@ 
 	 */
 	protected function getConstraintKeys($schemaName, $tableName)
 	{
-		$table = $schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
-		$sql = "SHOW INDEX FROM {$table}";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$primary = array();
+		$table=$schemaName===null ? "`{$tableName}`" : "`{$schemaName}`.`{$tableName}`";
+		$sql="SHOW INDEX FROM {$table}";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$primary=array();
 		foreach($command->query() as $row)
 		{
 			if($row['Key_name']==='PRIMARY')
-				$primary[] = $row['Column_name'];
+				$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);
+			$foreign=$this->getForeignConstraints($schemaName, $tableName);
 		else
-			$foreign = $this->findForeignConstraints($schemaName,$tableName);
-		return array($primary,$foreign);
+			$foreign=$this->findForeignConstraints($schemaName, $tableName);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -296,8 +296,8 @@ 
 	 */
 	protected function getForeignConstraints($schemaName, $tableName)
 	{
-		$andSchema = $schemaName !== null ? 'AND TABLE_SCHEMA LIKE :schema' : 'AND TABLE_SCHEMA LIKE DATABASE()';
-		$sql = <<<EOD
+		$andSchema=$schemaName!==null ? 'AND TABLE_SCHEMA LIKE :schema' : 'AND TABLE_SCHEMA LIKE DATABASE()';
+		$sql=<<<EOD
 			SELECT
 				CONSTRAINT_NAME as con,
 				COLUMN_NAME as col,
@@ -311,15 +311,15 @@ 
 				AND TABLE_NAME LIKE :table
 				$andSchema
 EOD;
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
 		if($schemaName!==null)
 			$command->bindValue(':schema', $schemaName);
 		$fkeys=array();
 		foreach($command->query() as $col)
 		{
-			$fkeys[$col['con']]['keys'][$col['col']] = $col['fkcol'];
-			$fkeys[$col['con']]['table'] = $col['fktable'];
+			$fkeys[$col['con']]['keys'][$col['col']]=$col['fkcol'];
+			$fkeys[$col['con']]['table']=$col['fktable'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}
@@ -332,17 +332,17 @@ 
 	 */
 	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)
-			$sql = "SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
+			$sql="SHOW CREATE TABLE `{$schemaName}`.`{$tableName}`";
 		else
-			$sql = "SHOW CREATE TABLE `{$tableName}`";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$result = $command->queryRow();
+			$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'] : '');
 	}
 
@@ -354,19 +354,19 @@ 
 	 */
 	protected function findForeignConstraints($schemaName, $tableName)
 	{
-		$sql = $this->getShowCreateTable($schemaName, $tableName);
-		$matches =array();
-		$regexp = '/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
-		preg_match_all($regexp,$sql,$matches,PREG_SET_ORDER);
-		$foreign = array();
+		$sql=$this->getShowCreateTable($schemaName, $tableName);
+		$matches=array();
+		$regexp='/FOREIGN KEY\s+\(([^\)]+)\)\s+REFERENCES\s+`?([^`]+)`?\s\(([^\)]+)\)/mi';
+		preg_match_all($regexp, $sql, $matches, PREG_SET_ORDER);
+		$foreign=array();
 		foreach($matches as $match)
 		{
-			$fields = array_map('trim',explode(',',str_replace('`','',$match[1])));
-			$fk_fields = array_map('trim',explode(',',str_replace('`','',$match[3])));
+			$fields=array_map('trim', explode(',', str_replace('`', '', $match[1])));
+			$fk_fields=array_map('trim', explode(',', str_replace('`', '', $match[3])));
 			$keys=array();
 			foreach($fields as $k=>$v)
-				$keys[$v] = $fk_fields[$k];
-			$foreign[] = array('keys' => $keys, 'table' => trim($match[2]));
+				$keys[$v]=$fk_fields[$k];
+			$foreign[]=array('keys' => $keys, 'table' => trim($match[2]));
 		}
 		return $foreign;
 	}

framework/Data/Common/TDbTableInfo.php

Spacing +9 added lines, -9 removed lines

@@ -31,13 +31,13 @@ 
 	 * @var null|array
 	 * @since 3.1.7
 	 */
-	private $_names = null;
+	private $_names=null;
 
 	/**
 	 * 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;
@@ -52,7 +52,7 @@ 
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.TDbCommandBuilder');
-		return new TDbCommandBuilder($connection,$this);
+		return new TDbCommandBuilder($connection, $this);
 	}
 
 	/**
@@ -60,7 +60,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;
 	}
@@ -69,7 +69,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;
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	public function getIsView()
 	{
-		return $this->getInfo('IsView',false);
+		return $this->getInfo('IsView', false);
 	}
 
 	/**
@@ -112,7 +112,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());
 	}
@@ -127,7 +127,7 @@ 
 		{
 			$this->_names=array();
 			foreach($this->getColumns() as $column)
-				$this->_names[] = $column->getColumnName();
+				$this->_names[]=$column->getColumnName();
 		}
 		return $this->_names;
 	}
@@ -157,7 +157,7 @@ 
 		{
 			$this->_lowercase=array();
 			foreach($this->getColumns()->getKeys() as $key)
-				$this->_lowercase[strtolower($key)] = $key;
+				$this->_lowercase[strtolower($key)]=$key;
 		}
 		return $this->_lowercase;
 	}

framework/Data/Common/Sqlite/TSqliteMetaData.php

Spacing +36 added lines, -36 removed lines

@@ -69,30 +69,30 @@ 
 	 */
 	protected function createTableInfo($tableName)
 	{
-		$tableName = str_replace("'",'',$tableName);
+		$tableName=str_replace("'", '', $tableName);
 		$this->getDbConnection()->setActive(true);
-		$table = $this->getDbConnection()->quoteString($tableName);
-		$sql = "PRAGMA table_info({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$foreign = $this->getForeignKeys($table);
+		$table=$this->getDbConnection()->quoteString($tableName);
+		$sql="PRAGMA table_info({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$foreign=$this->getForeignKeys($table);
 		$index=0;
 		$columns=array();
 		$primary=array();
 		foreach($command->query() as $col)
 		{
-			$col['index'] = $index++;
-			$column = $this->processColumn($col, $foreign);
-			$columns[$col['name']] = $column;
+			$col['index']=$index++;
+			$column=$this->processColumn($col, $foreign);
+			$columns[$col['name']]=$column;
 			if($column->getIsPrimaryKey())
-				$primary[] = $col['name'];
+				$primary[]=$col['name'];
 		}
-		$info['TableName'] = $tableName;
+		$info['TableName']=$tableName;
 		if($this->getIsView($tableName))
-			$info['IsView'] = true;
+			$info['IsView']=true;
 		if(count($columns)===0)
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
-		$class = $this->getTableInfoClass();
-		$tableInfo = new $class($info,$primary,$foreign);
+		$class=$this->getTableInfoClass();
+		$tableInfo=new $class($info, $primary, $foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
 		return $tableInfo;
 	}
@@ -103,11 +103,11 @@ 
 	 */
 	protected function getIsView($tableName)
 	{
-		$sql = 'SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
+		$sql='SELECT count(*) FROM sqlite_master WHERE type="view" AND name= :table';
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar()) === 1;
+		return intval($command->queryScalar())===1;
 	}
 
 	/**
@@ -117,39 +117,39 @@ 
 	 */
 	protected function processColumn($col, $foreign)
 	{
-		$columnId = $col['name']; //use column name as column Id
+		$columnId=$col['name']; //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['notnull']!=='99')
-			$info['AllowNull'] = true;
+			$info['AllowNull']=true;
 
 		if($col['pk']==='1')
-			$info['IsPrimaryKey'] = true;
+			$info['IsPrimaryKey']=true;
 		if($this->isForeignKeyColumn($columnId, $foreign))
-			$info['IsForeignKey'] = true;
+			$info['IsForeignKey']=true;
 
 		if($col['dflt_value']!==null)
-			$info['DefaultValue'] = $col['dflt_value'];
+			$info['DefaultValue']=$col['dflt_value'];
 
-		$type = strtolower($col['type']);
-		$info['AutoIncrement'] = $type==='integer' && $col['pk']==='1';
+		$type=strtolower($col['type']);
+		$info['AutoIncrement']=$type==='integer' && $col['pk']==='1';
 
-		$info['DbType'] = $type;
+		$info['DbType']=$type;
 		$match=array();
 		if(is_int($pos=strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
 		{
-			$ps = explode(',', $match[1]);
+			$ps=explode(',', $match[1]);
 			if(count($ps)===2)
 			{
-				$info['NumericPrecision'] = intval($ps[0]);
-				$info['NumericScale'] = intval($ps[1]);
+				$info['NumericPrecision']=intval($ps[0]);
+				$info['NumericScale']=intval($ps[1]);
 			}
 			else
 				$info['ColumnSize']=intval($match[1]);
-			$info['DbType'] = substr($type,0,$pos);
+			$info['DbType']=substr($type, 0, $pos);
 		}
 
 		return new TSqliteTableColumn($info);
@@ -163,13 +163,13 @@ 
 	 */
 	protected function getForeignKeys($table)
 	{
-		$sql = "PRAGMA foreign_key_list({$table})";
-		$command = $this->getDbConnection()->createCommand($sql);
-		$fkeys = array();
+		$sql="PRAGMA foreign_key_list({$table})";
+		$command=$this->getDbConnection()->createCommand($sql);
+		$fkeys=array();
 		foreach($command->query() as $col)
 		{
-			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
-			$fkeys[$col['table']]['table'] = $col['table'];
+			$fkeys[$col['table']]['keys'][$col['from']]=$col['to'];
+			$fkeys[$col['table']]['table']=$col['table'];
 		}
 		return count($fkeys) > 0 ? array_values($fkeys) : $fkeys;
 	}

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -30,12 +30,12 @@
 	 */
 	public function applyLimitOffset($sql, $limit=-1, $offset=-1)
 	{
-		$limit = $limit!==null ? intval($limit) : -1;
-		$offset = $offset!==null ? intval($offset) : -1;
+		$limit=$limit!==null ? intval($limit) : -1;
+		$offset=$offset!==null ? intval($offset) : -1;
 		if($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT '.$limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			$limitStr=' LIMIT '.$limit;
+			$offsetStr=$offset >= 0 ? ' OFFSET '.$offset : '';
 			return $sql.$limitStr.$offsetStr;
 		}
 		else

framework/Data/Common/Sqlite/TSqliteTableInfo.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	public function createCommandBuilder($connection)
 	{
 		Prado::using('System.Data.Common.Sqlite.TSqliteCommandBuilder');
-		return new TSqliteCommandBuilder($connection,$this);
+		return new TSqliteCommandBuilder($connection, $this);
 	}
 
 	/**

framework/Data/Common/Sqlite/TSqliteTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 	/**
 	 * @TODO add sqlite types.
 	 */
-	private static $types = array();
+	private static $types=array();
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
@@ -34,7 +34,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/TDataSourceConfig.php

Spacing +6 added lines, -6 removed lines

@@ -62,7 +62,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($xml['database'] as $name=>$value)
-					$db->setSubProperty($name,$value);
+					$db->setSubProperty($name, $value);
 			}
 		}
 		else
@@ -71,7 +71,7 @@ 
 			{
 				$db=$this->getDbConnection();
 				foreach($prop->getAttributes() as $name=>$value)
-					$db->setSubproperty($name,$value);
+					$db->setSubproperty($name, $value);
 			}
 		}
 	}
@@ -106,9 +106,9 @@ 
 		if($this->_conn===null)
 		{
 			if($this->_connID!=='')
-				$this->_conn = $this->findConnectionByID($this->getConnectionID());
+				$this->_conn=$this->findConnectionByID($this->getConnectionID());
 			else
-				$this->_conn = Prado::createComponent($this->getConnectionClass());
+				$this->_conn=Prado::createComponent($this->getConnectionClass());
 		}
 		return $this->_conn;
 	}
@@ -154,12 +154,12 @@ 
 	 */
 	protected function findConnectionByID($id)
 	{
-		$conn = $this->getApplication()->getModule($id);
+		$conn=$this->getApplication()->getModule($id);
 		if($conn instanceof TDbConnection)
 			return $conn;
 		else if($conn instanceof TDataSourceConfig)
 			return $conn->getDbConnection();
 		else
-			throw new TConfigurationException('datasource_dbconnection_invalid',$id);
+			throw new TConfigurationException('datasource_dbconnection_invalid', $id);
 	}
 }