pradosoft / prado

framework/Data/Common/Sqlite/TSqliteCommandBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -36,11 +36,11 @@
 	{
 		$limit = $limit !== null ? intval($limit) : -1;
 		$offset = $offset !== null ? intval($offset) : -1;
-		if($limit > 0 || $offset > 0)
+		if ($limit > 0 || $offset > 0)
 		{
-			$limitStr = ' LIMIT ' . $limit;
-			$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
-			return $sql . $limitStr . $offsetStr;
+			$limitStr = ' LIMIT '.$limit;
+			$offsetStr = $offset >= 0 ? ' OFFSET '.$offset : '';
+			return $sql.$limitStr.$offsetStr;
 		}
 		else
 			return $sql;

Braces +2 added lines, -2 removed lines

@@ -41,9 +41,9 @@
 			$limitStr = ' LIMIT ' . $limit;
 			$offsetStr = $offset >= 0 ? ' OFFSET ' . $offset : '';
 			return $sql . $limitStr . $offsetStr;
+		} else {
+					return $sql;
 		}
-		else
-			return $sql;
 	}
 }
 

framework/Data/Common/Sqlite/TSqliteMetaData.php

Spacing +14 added lines, -14 removed lines

@@ -82,18 +82,18 @@ 
 		$index = 0;
 		$columns = [];
 		$primary = [];
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
 			$col['index'] = $index++;
 			$column = $this->processColumn($col, $foreign);
 			$columns[$col['name']] = $column;
-			if($column->getIsPrimaryKey())
+			if ($column->getIsPrimaryKey())
 				$primary[] = $col['name'];
 		}
 		$info['TableName'] = $tableName;
-		if($this->getIsView($tableName))
+		if ($this->getIsView($tableName))
 			$info['IsView'] = true;
-		if(count($columns) === 0)
+		if (count($columns) === 0)
 			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
 		$class = $this->getTableInfoClass();
 		$tableInfo = new $class($info, $primary, $foreign);
@@ -123,19 +123,19 @@ 
 	{
 		$columnId = $col['name']; //use column name as column Id
 
-		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
+		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 
-		if($col['notnull'] !== '99')
+		if ($col['notnull'] !== '99')
 			$info['AllowNull'] = true;
 
-		if($col['pk'] === '1')
+		if ($col['pk'] === '1')
 			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $foreign))
+		if ($this->isForeignKeyColumn($columnId, $foreign))
 			$info['IsForeignKey'] = true;
 
-		if($col['dflt_value'] !== null)
+		if ($col['dflt_value'] !== null)
 			$info['DefaultValue'] = $col['dflt_value'];
 
 		$type = strtolower($col['type']);
@@ -143,10 +143,10 @@ 
 
 		$info['DbType'] = $type;
 		$match = [];
-		if(is_int($pos = strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
+		if (is_int($pos = strpos($type, '(')) && preg_match('/\((.*)\)/', $type, $match))
 		{
 			$ps = explode(',', $match[1]);
-			if(count($ps) === 2)
+			if (count($ps) === 2)
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
@@ -170,7 +170,7 @@ 
 		$sql = "PRAGMA foreign_key_list({$table})";
 		$command = $this->getDbConnection()->createCommand($sql);
 		$fkeys = [];
-		foreach($command->query() as $col)
+		foreach ($command->query() as $col)
 		{
 			$fkeys[$col['table']]['keys'][$col['from']] = $col['to'];
 			$fkeys[$col['table']]['table'] = $col['table'];
@@ -185,9 +185,9 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $foreign)
 	{
-		foreach($foreign as $fk)
+		foreach ($foreign as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
+			if (in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
 		return false;

Braces +26 added lines, -18 removed lines

@@ -87,14 +87,17 @@ 
 			$col['index'] = $index++;
 			$column = $this->processColumn($col, $foreign);
 			$columns[$col['name']] = $column;
-			if($column->getIsPrimaryKey())
-				$primary[] = $col['name'];
+			if($column->getIsPrimaryKey()) {
+							$primary[] = $col['name'];
+			}
 		}
 		$info['TableName'] = $tableName;
-		if($this->getIsView($tableName))
-			$info['IsView'] = true;
-		if(count($columns) === 0)
-			throw new TDbException('dbmetadata_invalid_table_view', $tableName);
+		if($this->getIsView($tableName)) {
+					$info['IsView'] = true;
+		}
+		if(count($columns) === 0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $tableName);
+		}
 		$class = $this->getTableInfoClass();
 		$tableInfo = new $class($info, $primary, $foreign);
 		$tableInfo->getColumns()->copyFrom($columns);
@@ -127,16 +130,20 @@ 
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
 
-		if($col['notnull'] !== '99')
-			$info['AllowNull'] = true;
+		if($col['notnull'] !== '99') {
+					$info['AllowNull'] = true;
+		}
 
-		if($col['pk'] === '1')
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $foreign))
-			$info['IsForeignKey'] = true;
+		if($col['pk'] === '1') {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $foreign)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['dflt_value'] !== null)
-			$info['DefaultValue'] = $col['dflt_value'];
+		if($col['dflt_value'] !== null) {
+					$info['DefaultValue'] = $col['dflt_value'];
+		}
 
 		$type = strtolower($col['type']);
 		$info['AutoIncrement'] = $type === 'integer' && $col['pk'] === '1';
@@ -150,9 +157,9 @@ 
 			{
 				$info['NumericPrecision'] = intval($ps[0]);
 				$info['NumericScale'] = intval($ps[1]);
+			} else {
+							$info['ColumnSize'] = intval($match[1]);
 			}
-			else
-				$info['ColumnSize'] = intval($match[1]);
 			$info['DbType'] = substr($type, 0, $pos);
 		}
 
@@ -187,8 +194,9 @@ 
 	{
 		foreach($foreign as $fk)
 		{
-			if(in_array($columnId, array_keys($fk['keys'])))
-				return true;
+			if(in_array($columnId, array_keys($fk['keys']))) {
+							return true;
+			}
 		}
 		return false;
 	}

framework/Data/Common/TDbTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	 */
 	public function getPdoType()
 	{
-		switch($this->getPHPType())
+		switch ($this->getPHPType())
 		{
 			case 'boolean': return PDO::PARAM_BOOL;
 			case 'integer': return PDO::PARAM_INT;
@@ -151,7 +151,7 @@ 
 
 	public function getMaxiumNumericConstraint()
 	{
-		if(($precision = $this->getNumericPrecision()) !== null)
+		if (($precision = $this->getNumericPrecision()) !== null)
 		{
 			$scale = $this->getNumericScale();
 			return $scale === null ? pow(10, $precision) : pow(10, $precision - $scale);

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Spacing +33 added lines, -33 removed lines

@@ -90,10 +90,10 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts = explode('.', str_replace('"', '', $table))) > 1)
+		if (count($parts = explode('.', str_replace('"', '', $table))) > 1)
 			return [$parts[0], $parts[1]];
 		else
-			return [$this->getDefaultSchema(),$parts[0]];
+			return [$this->getDefaultSchema(), $parts[0]];
 	}
 
 	/**
@@ -144,12 +144,12 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$tableInfo = $this->createNewTableInfo($schemaName, $tableName);
 		$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);
 		return $tableInfo;
 	}
@@ -163,7 +163,7 @@ 
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($tableName);
-		if($this->getIsView($schemaName, $tableName))
+		if ($this->getIsView($schemaName, $tableName))
 			$info['IsView'] = true;
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
 		$class = $this->getTableInfoClass();
@@ -177,7 +177,7 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if(strpos($name, '"') !== false)
+		if (strpos($name, '"') !== false)
 		{
 			$ref = 'http://www.postgresql.org/docs/7.4/static/sql-syntax.html#SQL-SYNTAX-IDENTIFIERS';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
@@ -213,36 +213,36 @@ 
 	{
 		$columnId = $col['attname']; //use column name as column Id
 
-		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
+		$info['ColumnName'] = '"'.$columnId.'"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if(!$col['attnotnull'])
+		if (!$col['attnotnull'])
 			$info['AllowNull'] = true;
-		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['atttypmod'] > 0)
+		if ($col['atttypmod'] > 0)
 			$info['ColumnSize'] = $col['atttypmod'] - 4;
-		if($col['atthasdef'])
+		if ($col['atthasdef'])
 			$info['DefaultValue'] = $col['adsrc'];
-		if($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(')
+		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;
 				unset($info['DefaultValue']);
 			}
 		}
 		$matches = [];
-		if(preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
+		if (preg_match('/\((\d+)(?:,(\d+))?+\)/', $col['type'], $matches))
 		{
 			$info['DbType'] = preg_replace('/\(\d+(?:,\d+)?\)/', '', $col['type']);
-			if($this->isPrecisionType($info['DbType']))
+			if ($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
+				if (count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
 			}
 			else
@@ -260,12 +260,12 @@ 
 	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = [];
-		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
+		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
+			if (is_int(strpos($matches[1], '.')))
 				return $matches[1];
 			else
-				return $tableInfo->getSchemaName() . '.' . $matches[1];
+				return $tableInfo->getSchemaName().'.'.$matches[1];
 		}
 	}
 
@@ -339,20 +339,20 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$primary = [];
 		$foreign = [];
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
-			switch($row['contype'])
+			switch ($row['contype'])
 			{
 				case 'p':
 					$primary = $this->getPrimaryKeys($tableName, $schemaName, $row['indkey']);
 					break;
 				case 'f':
-					if(($fkey = $this->getForeignKeys($row['consrc'])) !== null)
+					if (($fkey = $this->getForeignKeys($row['consrc'])) !== null)
 						$foreign[] = $fkey;
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -378,7 +378,7 @@ 
 		$command->bindValue(':schema', $schemaName);
 //		$command->bindValue(':columnIndex', join(', ', explode(' ', $columnIndex)));
 		$primary = [];
-		foreach($command->query() as $row)
+		foreach ($command->query() as $row)
 		{
 						$primary[] = $row['attname'];
 		}
@@ -396,11 +396,11 @@ 
 		$matches = [];
 		$brackets = '\(([^\)]+)\)';
 		$find = "/FOREIGN\s+KEY\s+{$brackets}\s+REFERENCES\s+([^\(]+){$brackets}/i";
-		if(preg_match($find, $src, $matches))
+		if (preg_match($find, $src, $matches))
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = [];
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
+			foreach (preg_split('/,\s+/', $matches[3]) as $i => $fkey)
 				$fkeys[$keys[$i]] = $fkey;
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
@@ -413,9 +413,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;
@@ -429,7 +429,7 @@ 
 		 */
 	public function findTableNames($schema = 'public')
 	{
-		if($schema === '')
+		if ($schema === '')
 			$schema = self::DEFAULT_SCHEMA;
 		$sql = <<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
@@ -439,12 +439,12 @@ 
 		$command->bindParam(':schema', $schema);
 		$rows = $command->queryAll();
 		$names = [];
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
-			if($schema === self::DEFAULT_SCHEMA)
+			if ($schema === self::DEFAULT_SCHEMA)
 				$names[] = $row['table_name'];
 			else
-				$names[] = $row['table_schema'] . '.' . $row['table_name'];
+				$names[] = $row['table_schema'].'.'.$row['table_name'];
 		}
 		return $names;
 	}

Braces +55 added lines, -40 removed lines

@@ -90,10 +90,11 @@ 
 	 */
 	protected function getSchemaTableName($table)
 	{
-		if(count($parts = explode('.', str_replace('"', '', $table))) > 1)
-			return [$parts[0], $parts[1]];
-		else
-			return [$this->getDefaultSchema(),$parts[0]];
+		if(count($parts = explode('.', str_replace('"', '', $table))) > 1) {
+					return [$parts[0], $parts[1]];
+		} else {
+					return [$this->getDefaultSchema(),$parts[0]];
+		}
 	}
 
 	/**
@@ -149,8 +150,9 @@ 
 			$col['index'] = $index++;
 			$this->processColumn($tableInfo, $col);
 		}
-		if($index === 0)
-			throw new TDbException('dbmetadata_invalid_table_view', $table);
+		if($index === 0) {
+					throw new TDbException('dbmetadata_invalid_table_view', $table);
+		}
 		return $tableInfo;
 	}
 
@@ -163,8 +165,9 @@ 
 	{
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($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);
@@ -216,17 +219,22 @@ 
 		$info['ColumnName'] = '"' . $columnId . '"'; //quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if(!$col['attnotnull'])
-			$info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys()))
-			$info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo))
-			$info['IsForeignKey'] = true;
+		if(!$col['attnotnull']) {
+					$info['AllowNull'] = true;
+		}
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) {
+					$info['IsPrimaryKey'] = true;
+		}
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) {
+					$info['IsForeignKey'] = true;
+		}
 
-		if($col['atttypmod'] > 0)
-			$info['ColumnSize'] = $col['atttypmod'] - 4;
-		if($col['atthasdef'])
-			$info['DefaultValue'] = $col['adsrc'];
+		if($col['atttypmod'] > 0) {
+					$info['ColumnSize'] = $col['atttypmod'] - 4;
+		}
+		if($col['atthasdef']) {
+					$info['DefaultValue'] = $col['adsrc'];
+		}
 		if($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(')
 		{
 			if(($sequence = $this->getSequenceName($tableInfo, $col['adsrc'])) !== null)
@@ -242,14 +250,15 @@ 
 			if($this->isPrecisionType($info['DbType']))
 			{
 				$info['NumericPrecision'] = intval($matches[1]);
-				if(count($matches) > 2)
-					$info['NumericScale'] = intval($matches[2]);
+				if(count($matches) > 2) {
+									$info['NumericScale'] = intval($matches[2]);
+				}
+			} else {
+							$info['ColumnSize'] = intval($matches[1]);
 			}
-			else
-				$info['ColumnSize'] = intval($matches[1]);
+		} else {
+					$info['DbType'] = $col['type'];
 		}
-		else
-			$info['DbType'] = $col['type'];
 
 		$tableInfo->Columns[$columnId] = new TPgsqlTableColumn($info);
 	}
@@ -262,10 +271,11 @@ 
 		$matches = [];
 		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches))
 		{
-			if(is_int(strpos($matches[1], '.')))
-				return $matches[1];
-			else
-				return $tableInfo->getSchemaName() . '.' . $matches[1];
+			if(is_int(strpos($matches[1], '.'))) {
+							return $matches[1];
+			} else {
+							return $tableInfo->getSchemaName() . '.' . $matches[1];
+			}
 		}
 	}
 
@@ -347,8 +357,9 @@ 
 					$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;
 			}
 		}
@@ -400,8 +411,9 @@ 
 		{
 			$keys = preg_split('/,\s+/', $matches[1]);
 			$fkeys = [];
-			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey)
-				$fkeys[$keys[$i]] = $fkey;
+			foreach(preg_split('/,\s+/', $matches[3]) as $i => $fkey) {
+							$fkeys[$keys[$i]] = $fkey;
+			}
 			return ['table' => str_replace('"', '', $matches[2]), 'keys' => $fkeys];
 		}
 	}
@@ -415,8 +427,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;
 	}
@@ -429,8 +442,9 @@ 
 		 */
 	public function findTableNames($schema = 'public')
 	{
-		if($schema === '')
-			$schema = self::DEFAULT_SCHEMA;
+		if($schema === '') {
+					$schema = self::DEFAULT_SCHEMA;
+		}
 		$sql = <<<EOD
 SELECT table_name, table_schema FROM information_schema.tables
 WHERE table_schema=:schema AND table_type='BASE TABLE'
@@ -441,10 +455,11 @@ 
 		$names = [];
 		foreach($rows as $row)
 		{
-			if($schema === self::DEFAULT_SCHEMA)
-				$names[] = $row['table_name'];
-			else
-				$names[] = $row['table_schema'] . '.' . $row['table_name'];
+			if($schema === self::DEFAULT_SCHEMA) {
+							$names[] = $row['table_name'];
+			} else {
+							$names[] = $row['table_schema'] . '.' . $row['table_name'];
+			}
 		}
 		return $names;
 	}

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -35,9 +35,9 @@
 	public function getPHPType()
 	{
 		$dbtype = strtolower($this->getDbType());
-		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 +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
 		$dbtype = strtolower($this->getDbType());
 		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/Pgsql/TPgsqlCommandBuilder.php

Spacing +5 added lines, -5 removed lines

@@ -35,9 +35,9 @@ 
 	public function getSearchExpression($fields, $keywords)
 	{
 		$columns = [];
-		foreach($fields as $field)
+		foreach ($fields as $field)
 		{
-			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
+			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
 				$columns[] = $field;
 		}
 		return parent::getSearchExpression($columns, $keywords);
@@ -62,9 +62,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach($words as $word)
-			$conditions[] = $column . ' ILIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
-		return '(' . implode(' AND ', $conditions) . ')';
+		foreach ($words as $word)
+			$conditions[] = $column.' ILIKE '.$this->getDbConnection()->quoteString('%'.$word.'%');
+		return '('.implode(' AND ', $conditions).')';
 	}
 
 }

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 		$columns = [];
 		foreach($fields as $field)
 		{
-			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field))) {
+							$columns[] = $field;
+			}
 		}
 		return parent::getSearchExpression($columns, $keywords);
 	}
@@ -62,8 +63,9 @@ 
 	protected function getSearchCondition($column, $words)
 	{
 		$conditions = [];
-		foreach($words as $word)
-			$conditions[] = $column . ' ILIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		foreach($words as $word) {
+					$conditions[] = $column . ' ILIKE ' . $this->getDbConnection()->quoteString('%' . $word . '%');
+		}
 		return '(' . implode(' AND ', $conditions) . ')';
 	}
 

framework/Data/Common/Pgsql/TPgsqlTableInfo.php

Spacing +2 added lines, -2 removed lines

@@ -40,8 +40,8 @@
 	 */
 	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();
 	}

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/Oracle/TOracleTableInfo.php

Spacing +5 added lines, -5 removed lines

@@ -87,7 +87,7 @@ 
 	 */
 	public function getTableFullName()
 	{
-		return $this->_info['SchemaName'] . '.' . $this->getTableName();
+		return $this->_info['SchemaName'].'.'.$this->getTableName();
 	}
 
 	/**
@@ -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());
 	}
@@ -123,7 +123,7 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
+		foreach ($this->getColumns() as $column)
 			$names[] = $column->getColumnName();
 		return $names;
 	}
@@ -149,10 +149,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

@@ -112,8 +112,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());
 	}
 
@@ -123,8 +124,9 @@ 
 	 */
 	public function getColumnNames()
 	{
-		foreach($this->getColumns() as $column)
-			$names[] = $column->getColumnName();
+		foreach($this->getColumns() as $column) {
+					$names[] = $column->getColumnName();
+		}
 		return $names;
 	}
 
@@ -152,8 +154,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;
 	}

framework/Data/Common/Oracle/TOracleCommandBuilder.php

Spacing +11 added lines, -11 removed lines

@@ -89,8 +89,8 @@ 
 		$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);
+		if (strpos($sql, 'WHERE') !== false)
+			$WhereInSubSelect = "WHERE ".substr($sql, strpos($sql, 'WHERE') + 5, $nfimDoWhere - $niniDoWhere);
 
 		$sORDERBY = '';
 		if (stripos($sql, 'ORDER') !== false) {
@@ -107,7 +107,7 @@ 
 			$fields = '';
 			$arr = $this->getTableInfo()->getColumns();
 			foreach ($arr as $field) {
-				$fields .= strtolower($field->getColumnName()) . ', ';
+				$fields .= strtolower($field->getColumnName()).', ';
 			}
 			$fields = str_replace('"', '', $fields);
 			$fields = trim($fields);
@@ -119,7 +119,7 @@ 
 					$field = strtolower($field);
 					$existAS = str_ireplace(' as ', '-as-', $field);
 					if (strpos($existAS, '-as-') === false)
-						$aliasedFields .= "{$fieldsALIAS}." . trim($field) . ", ";
+						$aliasedFields .= "{$fieldsALIAS}.".trim($field).", ";
 					else
 						$aliasedFields .= "{$field}, ";
 				}
@@ -138,17 +138,17 @@ 
 				  ") WHERE {$pradoNUMLIN} >= {$offset} ";
 
 		************************* */
-		$offset = (int)$offset;
-		$toReg = $offset + $limit ;
+		$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;

Braces +20 added lines, -14 removed lines

@@ -36,8 +36,9 @@ 
 	public function getSearchExpression($fields, $keywords) {
 		$columns = [];
 		foreach ($fields as $field) {
-			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field)))
-				$columns[] = $field;
+			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field))) {
+							$columns[] = $field;
+			}
 		}
 		return parent :: getSearchExpression($columns, $keywords);
 	}
@@ -77,8 +78,9 @@ 
 	 * @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)
-			return $sql;
+		if ((int) $limit <= 0 && (int) $offset <= 0) {
+					return $sql;
+		}
 
 		$pradoNUMLIN = 'pradoNUMLIN';
 		$fieldsALIAS = 'xyz';
@@ -89,8 +91,9 @@ 
 		$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);
+		if(strpos($sql, 'WHERE') !== false) {
+					$WhereInSubSelect = "WHERE " . substr($sql, strpos($sql, 'WHERE') + 5, $nfimDoWhere - $niniDoWhere);
+		}
 
 		$sORDERBY = '';
 		if (stripos($sql, 'ORDER') !== false) {
@@ -118,17 +121,19 @@ 
 				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}, ";
+					if (strpos($existAS, '-as-') === false) {
+											$aliasedFields .= "{$fieldsALIAS}." . trim($field) . ", ";
+					} else {
+											$aliasedFields .= "{$field}, ";
+					}
 				}
 				$aliasedFields = trim($aliasedFields);
 				$aliasedFields = substr($aliasedFields, 0, strlen($aliasedFields) - 1);
 			}
 		}
-		if ($aliasedFields == ', ')
-			$aliasedFields = " , $fieldsALIAS.* ";
+		if ($aliasedFields == ', ') {
+					$aliasedFields = " , $fieldsALIAS.* ";
+		}
 
 		/* ************************
 		$newSql = " SELECT $fields FROM ".
@@ -141,8 +146,9 @@ 
 		$offset = (int)$offset;
 		$toReg = $offset + $limit ;
 		$fullTableName = $this->getTableInfo()->getTableFullName();
-		if (empty($sORDERBY))
-			$sORDERBY = "ROWNUM";
+		if (empty($sORDERBY)) {
+					$sORDERBY = "ROWNUM";
+		}
 
 		$newSql = " SELECT $fields FROM " .
 					"(					" .