pradosoft / prado

framework/Data/Common/Sqlite/TSqliteTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 	public function getPHPType()
 	{
 		$dbtype = strtolower($this->getDbType());
-		foreach (self::$types as $type => $dbtypes) {
-			if (in_array($dbtype, $dbtypes)) {
+		foreach(self::$types as $type => $dbtypes) {
+			if(in_array($dbtype, $dbtypes)) {
 				return $type;
 			}
 		}

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Spacing +30 added lines, -30 removed lines

@@ -89,10 +89,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,11 +144,11 @@ 
 		$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);
@@ -178,7 +178,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);
 		}
@@ -216,34 +216,34 @@ 
 		$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 (($sequence = $this->getSequenceName($tableInfo, $col['adsrc'])) !== null) {
+		if($col['attisserial'] || substr($col['adsrc'], 0, 8) === 'nextval(') {
+			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 {
@@ -262,8 +262,8 @@ 
 	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = [];
-		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
-			if (is_int(strpos($matches[1], '.'))) {
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
+			if(is_int(strpos($matches[1], '.'))) {
 				return $matches[1];
 			} else {
 				return $tableInfo->getSchemaName() . '.' . $matches[1];
@@ -341,19 +341,19 @@ 
 		$command->bindValue(':schema', $schemaName);
 		$primary = [];
 		$foreign = [];
-		foreach ($command->query() as $row) {
-			switch ($row['contype']) {
+		foreach($command->query() as $row) {
+			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];
 	}
 
 	/**
@@ -379,7 +379,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,10 +396,10 @@ 
 		$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,8 +413,8 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach ($tableInfo->getForeignKeys() as $fk) {
-			if (in_array($columnId, array_keys($fk['keys']))) {
+		foreach($tableInfo->getForeignKeys() as $fk) {
+			if(in_array($columnId, array_keys($fk['keys']))) {
 				return true;
 			}
 		}
@@ -429,7 +429,7 @@ 
 	 */
 	public function findTableNames($schema = 'public')
 	{
-		if ($schema === '') {
+		if($schema === '') {
 			$schema = self::DEFAULT_SCHEMA;
 		}
 		$sql = <<<EOD
@@ -440,8 +440,8 @@ 
 		$command->bindParam(':schema', $schema);
 		$rows = $command->queryAll();
 		$names = [];
-		foreach ($rows as $row) {
-			if ($schema === self::DEFAULT_SCHEMA) {
+		foreach($rows as $row) {
+			if($schema === self::DEFAULT_SCHEMA) {
 				$names[] = $row['table_name'];
 			} else {
 				$names[] = $row['table_schema'] . '.' . $row['table_name'];

framework/Data/Common/Pgsql/TPgsqlTableColumn.php

Spacing +2 added lines, -2 removed lines

@@ -39,8 +39,8 @@
 	public function getPHPType()
 	{
 		$dbtype = strtolower($this->getDbType());
-		foreach (self::$types as $type => $dbtypes) {
-			if (in_array($dbtype, $dbtypes)) {
+		foreach(self::$types as $type => $dbtypes) {
+			if(in_array($dbtype, $dbtypes)) {
 				return $type;
 			}
 		}

framework/Data/Common/Pgsql/TPgsqlTableInfo.php

Spacing +1 added lines, -1 removed lines

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

framework/Data/Common/Pgsql/TPgsqlCommandBuilder.php

Spacing +3 added lines, -3 removed lines

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

framework/Data/Common/Oracle/TOracleMetaData.php

Spacing +27 added lines, -27 removed lines

@@ -61,10 +61,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]];
 		}
 	}
 
@@ -105,11 +105,11 @@ 
 		//$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;
@@ -125,7 +125,7 @@ 
 		$info['SchemaName'] = $this->assertIdentifier($schemaName);
 		$info['TableName'] = $this->assertIdentifier($tableName);
 		$info['IsView'] = false;
-		if ($this->getIsView($schemaName, $tableName)) {
+		if($this->getIsView($schemaName, $tableName)) {
 			$info['IsView'] = true;
 		}
 		list($primary, $foreign) = $this->getConstraintKeys($schemaName, $tableName);
@@ -140,7 +140,7 @@ 
 	 */
 	protected function assertIdentifier($name)
 	{
-		if (strpos($name, '"') !== false) {
+		if(strpos($name, '"') !== false) {
 			$ref = 'http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
@@ -181,19 +181,19 @@ 
 		$info['ColumnName'] = $columnId; //NOT quote the column names!
 		$info['ColumnId'] = $columnId;
 		$info['ColumnIndex'] = $col['index'];
-		if (! (bool)$col['attnotnull']) {
+		if(!(bool) $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 ((int)$col['atttypmod'] > 0) {
+		if((int) $col['atttypmod'] > 0) {
 			$info['ColumnSize'] = $col['atttypmod'];
 		} // - 4;
-		if ((bool)$col['atthasdef']) {
+		if((bool) $col['atthasdef']) {
 			$info['DefaultValue'] = $col['adsrc'];
 		}
 		//
@@ -210,11 +210,11 @@ 
 		}
 		*/
 		$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 {
@@ -232,8 +232,8 @@ 
 	protected function getSequenceName($tableInfo, $src)
 	{
 		$matches = [];
-		if (preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
-			if (is_int(strpos($matches[1], '.'))) {
+		if(preg_match('/nextval\([^\']*\'([^\']+)\'[^\)]*\)/i', $src, $matches)) {
+			if(is_int(strpos($matches[1], '.'))) {
 				return $matches[1];
 			} else {
 				return $tableInfo->getSchemaName() . '.' . $matches[1];
@@ -276,8 +276,8 @@ 
 		//$command->bindValue(':schema', $schemaName);
 		$primary = [];
 		$foreign = [];
-		foreach ($command->query() as $row) {
-			switch (strtolower($row['contype'])) {
+		foreach($command->query() as $row) {
+			switch(strtolower($row['contype'])) {
 				case 'p':
 					$primary = array_merge($primary, [strtolower($row['consrc'])]);
 					/*
@@ -295,7 +295,7 @@ 
 					break;
 			}
 		}
-		return [$primary,$foreign];
+		return [$primary, $foreign];
 	}
 
 	/**
@@ -306,7 +306,7 @@ 
 	protected function getPrimaryKeys($src)
 	{
 		$matches = [];
-		if (preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches)) {
+		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches)) {
 			return preg_split('/,\s+/', $matches[1]);
 		}
 		return [];
@@ -322,10 +322,10 @@ 
 		$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];
@@ -339,8 +339,8 @@ 
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)
 	{
-		foreach ($tableInfo->getForeignKeys() as $fk) {
-			if ($fk == $columnId) {
+		foreach($tableInfo->getForeignKeys() as $fk) {
+			if($fk == $columnId) {
 				//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
 			}
@@ -356,7 +356,7 @@ 
 	 */
 	public function findTableNames($schema = '')
 	{
-		if ($schema === '') {
+		if($schema === '') {
 			$sql = <<<EOD
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
@@ -372,8 +372,8 @@ 
 
 		$rows = $command->queryAll();
 		$names = [];
-		foreach ($rows as $row) {
-			if ($schema === $this->getDefaultSchema() || $schema === '') {
+		foreach($rows as $row) {
+			if($schema === $this->getDefaultSchema() || $schema === '') {
 				$names[] = $row['TABLE_NAME'];
 			} else {
 				$names[] = $row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME'];

framework/Data/Common/Oracle/TOracleTableInfo.php

Spacing +4 added lines, -4 removed lines

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

framework/Data/Common/Oracle/TOracleTableColumn.php

Spacing +3 added lines, -3 removed lines

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

framework/Data/Common/Oracle/TOracleCommandBuilder.php

Spacing +14 added lines, -14 removed lines

@@ -36,8 +36,8 @@ 
 	public function getSearchExpression($fields, $keywords)
 	{
 		$columns = [];
-		foreach ($fields as $field) {
-			if ($this->isSearchableColumn($this->getTableInfo()->getColumn($field))) {
+		foreach($fields as $field) {
+			if($this->isSearchableColumn($this->getTableInfo()->getColumn($field))) {
 				$columns[] = $field;
 			}
 		}
@@ -81,7 +81,7 @@ 
 	 */
 	public function applyLimitOffset($sql, $limit = -1, $offset = -1)
 	{
-		if ((int) $limit <= 0 && (int) $offset <= 0) {
+		if((int) $limit <= 0 && (int) $offset <= 0) {
 			return $sql;
 		}
 
@@ -94,12 +94,12 @@ 
 		$nfimDoSelect = (strpos($sql, 'FROM') !== false ? strpos($sql, 'FROM') : $nfimDaSQL);
 
 		$WhereInSubSelect = "";
-		if (strpos($sql, 'WHERE') !== false) {
+		if(strpos($sql, 'WHERE') !== false) {
 			$WhereInSubSelect = "WHERE " . substr($sql, strpos($sql, 'WHERE') + 5, $nfimDoWhere - $niniDoWhere);
 		}
 
 		$sORDERBY = '';
-		if (stripos($sql, 'ORDER') !== false) {
+		if(stripos($sql, 'ORDER') !== false) {
 			$p = stripos($sql, 'ORDER');
 			$sORDERBY = substr($sql, $p + 8);
 		}
@@ -108,23 +108,23 @@ 
 		$fields = trim(substr($fields, $niniDoSelect));
 		$aliasedFields = ', ';
 
-		if (trim($fields) == '*') {
+		if(trim($fields) == '*') {
 			$aliasedFields = ", {$fieldsALIAS}.{$fields}";
 			$fields = '';
 			$arr = $this->getTableInfo()->getColumns();
-			foreach ($arr as $field) {
+			foreach($arr as $field) {
 				$fields .= strtolower($field->getColumnName()) . ', ';
 			}
 			$fields = str_replace('"', '', $fields);
 			$fields = trim($fields);
 			$fields = substr($fields, 0, strlen($fields) - 1);
 		} else {
-			if (strpos($fields, ',') !== false) {
+			if(strpos($fields, ',') !== false) {
 				$arr = $this->getTableInfo()->getColumns();
-				foreach ($arr as $field) {
+				foreach($arr as $field) {
 					$field = strtolower($field);
 					$existAS = str_ireplace(' as ', '-as-', $field);
-					if (strpos($existAS, '-as-') === false) {
+					if(strpos($existAS, '-as-') === false) {
 						$aliasedFields .= "{$fieldsALIAS}." . trim($field) . ", ";
 					} else {
 						$aliasedFields .= "{$field}, ";
@@ -134,7 +134,7 @@ 
 				$aliasedFields = substr($aliasedFields, 0, strlen($aliasedFields) - 1);
 			}
 		}
-		if ($aliasedFields == ', ') {
+		if($aliasedFields == ', ') {
 			$aliasedFields = " , $fieldsALIAS.* ";
 		}
 
@@ -146,10 +146,10 @@ 
 				  ") WHERE {$pradoNUMLIN} >= {$offset} ";
 
 		************************* */
-		$offset = (int)$offset;
-		$toReg = $offset + $limit ;
+		$offset = (int) $offset;
+		$toReg = $offset + $limit;
 		$fullTableName = $this->getTableInfo()->getTableFullName();
-		if (empty($sORDERBY)) {
+		if(empty($sORDERBY)) {
 			$sORDERBY = "ROWNUM";
 		}