pradosoft / prado

framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php

Doc Comments +2 added lines, -1 removed lines

@@ -92,6 +92,7 @@ 
 
 	/**
 	 * Fetch results for current relationship.
+	 * @param TActiveRecord $obj
 	 * @return boolean always true.
 	 */
 	public function fetchResultsInto($obj)
@@ -104,7 +105,6 @@ 
 	 * Returns foreign keys in $fromRecord with source column names as key
 	 * and foreign column names in the corresponding $matchesRecord as value.
 	 * The method returns the first matching foreign key between these 2 records.
-	 * @param TActiveRecord $fromRecord
 	 * @param TActiveRecord $matchesRecord
 	 * @return array foreign keys with source column names as key and foreign column names as value.
 	 */
@@ -212,6 +212,7 @@ 
 	 * @param array source property names
 	 * @param array foreign objects
 	 * @param array foreign object field names.
+	 * @param TActiveRecord[] $fkObjects
 	 */
 	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
 	{

Spacing +31 added lines, -31 removed lines

@@ -30,8 +30,8 @@ 
 
 	public function __construct(TActiveRecordRelationContext $context, $criteria)
 	{
-		$this->_context = $context;
-		$this->_criteria = $criteria;
+		$this->_context=$context;
+		$this->_criteria=$criteria;
 	}
 
 	/**
@@ -71,22 +71,22 @@ 
 	 * @param array method arguments
 	 * @return mixed TActiveRecord or array of TActiveRecord results depending on the method called.
 	 */
-	public function __call($method,$args)
+	public function __call($method, $args)
 	{
 		static $stack=array();
 
-		$results = call_user_func_array(array($this->getSourceRecord(),$method),$args);
-		$validArray = is_array($results) && count($results) > 0;
+		$results=call_user_func_array(array($this->getSourceRecord(), $method), $args);
+		$validArray=is_array($results) && count($results) > 0;
 		if($validArray || $results instanceof ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
+			while($obj=array_pop($stack))
 				$obj->collectForeignObjects($results);
 		}
 		else if($results instanceof TActiveRecordRelation)
-			$stack[] = $this; //call it later
-		else if($results === null || !$validArray)
-			$stack = array();
+			$stack[]=$this; //call it later
+		else if($results===null || !$validArray)
+			$stack=array();
 		return $results;
 	}
 
@@ -110,28 +110,28 @@ 
 	 */
 	protected function findForeignKeys($from, $matchesRecord, $loose=false)
 	{
-		$gateway = $matchesRecord->getRecordGateway();
-		$recordTableInfo = $gateway->getRecordTableInfo($matchesRecord);
-		$matchingTableName = strtolower($recordTableInfo->getTableName());
-		$matchingFullTableName = strtolower($recordTableInfo->getTableFullName());
+		$gateway=$matchesRecord->getRecordGateway();
+		$recordTableInfo=$gateway->getRecordTableInfo($matchesRecord);
+		$matchingTableName=strtolower($recordTableInfo->getTableName());
+		$matchingFullTableName=strtolower($recordTableInfo->getTableFullName());
 		$tableInfo=$from;
 		if($from instanceof TActiveRecord)
-			$tableInfo = $gateway->getRecordTableInfo($from);
+			$tableInfo=$gateway->getRecordTableInfo($from);
 		//find first non-empty FK
 		foreach($tableInfo->getForeignKeys() as $fkeys)
 		{
-			$fkTable = strtolower($fkeys['table']);
+			$fkTable=strtolower($fkeys['table']);
 			if($fkTable===$matchingTableName || $fkTable===$matchingFullTableName)
 			{
-				$hasFkField = !$loose && $this->getContext()->hasFkField();
-				$key = $hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
+				$hasFkField=!$loose && $this->getContext()->hasFkField();
+				$key=$hasFkField ? $this->getFkFields($fkeys['keys']) : $fkeys['keys'];
 				if(!empty($key))
 					return $key;
 			}
 		}
 
 		//none found
-		$matching = $gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
+		$matching=$gateway->getRecordTableInfo($matchesRecord)->getTableFullName();
 		throw new TActiveRecordException('ar_relations_missing_fk',
 			$tableInfo->getTableFullName(), $matching);
 	}
@@ -149,13 +149,13 @@ 
 	 */
 	private function getFkFields($fkeys)
 	{
-		$matching = array();
+		$matching=array();
 		preg_match_all('/\s*(\S+\.)?([\w-]+)\s*/', $this->getContext()->getFkField(), $matching);
-		$fields = array();
+		$fields=array();
 		foreach($fkeys as $fkName => $field)
 		{
 			if(in_array($fkName, $matching[2]))
-				$fields[$fkName] = $field;
+				$fields[$fkName]=$field;
 		}
 		return $fields;
 	}
@@ -169,7 +169,7 @@ 
 	{
 		$ids=array();
 		foreach($properties as $property)
-			$ids[] = is_object($obj) ? (string)$obj->getColumnValue($property) : (string)$obj[$property];
+			$ids[]=is_object($obj) ? (string) $obj->getColumnValue($property) : (string) $obj[$property];
 		return serialize($ids);
 	}
 
@@ -181,7 +181,7 @@ 
 	 */
 	protected function findForeignObjects($fields, $indexValues)
 	{
-		$finder = $this->getContext()->getForeignRecordFinder();
+		$finder=$this->getContext()->getForeignRecordFinder();
 		return $finder->findAllByIndex($this->_criteria, $fields, $indexValues);
 	}
 
@@ -194,14 +194,14 @@ 
 	protected function getIndexValues($keys, $results)
 	{
 		if(!is_array($results) && !$results instanceof ArrayAccess)
-			$results = array($results);
+			$results=array($results);
 		$values=array();
 		foreach($results as $result)
 		{
-			$value = array();
+			$value=array();
 			foreach($keys as $name)
-				$value[] = $result->getColumnValue($name);
-			$values[] = $value;
+				$value[]=$result->getColumnValue($name);
+			$values[]=$value;
 		}
 		return $values;
 	}
@@ -213,7 +213,7 @@ 
 	 * @param array foreign objects
 	 * @param array foreign object field names.
 	 */
-	protected function populateResult(&$results,$properties,&$fkObjects,$fields)
+	protected function populateResult(&$results, $properties, &$fkObjects, $fields)
 	{
 		$collections=array();
 		foreach($fkObjects as $fkObject)
@@ -231,7 +231,7 @@ 
 	{
 		if(is_array($results) || $results instanceof ArrayAccess)
 		{
-			for($i=0,$k=count($results);$i<$k;$i++)
+			for($i=0, $k=count($results); $i < $k; $i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
 		}
 		else
@@ -246,8 +246,8 @@ 
 	 */
 	protected function setObjectProperty($source, $properties, &$collections)
 	{
-		$hash = $this->getObjectHash($source, $properties);
-		$prop = $this->getContext()->getProperty();
+		$hash=$this->getObjectHash($source, $properties);
+		$prop=$this->getContext()->getProperty();
 		$source->$prop=isset($collections[$hash]) ? $collections[$hash] : array();
 	}
 }

Braces +5 added lines, -6 removed lines

@@ -80,10 +80,10 @@ 
 		if($validArray || $results instanceof ArrayAccess || $results instanceof TActiveRecord)
 		{
 			$this->collectForeignObjects($results);
-			while($obj = array_pop($stack))
-				$obj->collectForeignObjects($results);
-		}
-		else if($results instanceof TActiveRecordRelation)
+			while($obj = array_pop($stack)) {
+							$obj->collectForeignObjects($results);
+			}
+		} else if($results instanceof TActiveRecordRelation)
 			$stack[] = $this; //call it later
 		else if($results === null || !$validArray)
 			$stack = array();
@@ -233,8 +233,7 @@ 
 		{
 			for($i=0,$k=count($results);$i<$k;$i++)
 				$this->setObjectProperty($results[$i], $properties, $collections);
-		}
-		else
+		} else
 			$this->setObjectProperty($results, $properties, $collections);
 	}
 

framework/Data/ActiveRecord/Scaffold/InputBuilder/TScaffoldInputCommon.php

Doc Comments +3 added lines

@@ -47,6 +47,9 @@
 		return $control;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function getDefaultControlValue($container,$column, $record)
 	{
 		$control = $container->findControl(self::DEFAULT_ID);

Spacing +72 added lines, -72 removed lines

@@ -15,7 +15,7 @@ 
 	{
 		$control->setID(self::DEFAULT_ID);
 		$control->setEnabled($this->getIsEnabled($column, $record));
-		$container->Controls[] = $control;
+		$container->Controls[]=$control;
 	}
 
 	protected function setNotNullProperty($container, $control, $column, $record)
@@ -27,8 +27,8 @@ 
 
 	protected function createBooleanControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TCheckBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TCheckBox();
 		$control->setChecked(TPropertyValue::ensureBoolean($value));
 		$control->setCssClass('boolean-checkbox');
 		$this->setDefaultProperty($container, $control, $column, $record);
@@ -37,8 +37,8 @@ 
 
 	protected function createDefaultControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setCssClass('default-textbox scaffold_input');
 		if(($len=$column->getColumnSize())!==null)
@@ -47,9 +47,9 @@ 
 		return $control;
 	}
 
-	protected function getDefaultControlValue($container,$column, $record)
+	protected function getDefaultControlValue($container, $column, $record)
 	{
-		$control = $container->findControl(self::DEFAULT_ID);
+		$control=$container->findControl(self::DEFAULT_ID);
 		if($control instanceof TCheckBox)
 			return $control->getChecked();
 		else if($control instanceof TControl)
@@ -58,8 +58,8 @@ 
 
 	protected function createMultiLineControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TTextBox();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TTextBox();
 		$control->setText($value);
 		$control->setTextMode(TTextBoxMode::MultiLine);
 		$control->setCssClass('multiline-textbox scaffold_input');
@@ -69,13 +69,13 @@ 
 
 	protected function createYearControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDropDownList();
-		$years = array();
-		$current = intval(@date('Y'));
-		$from = $current-10; $to=$current+10;
-		for($i = $from; $i <= $to; $i++)
-			$years[$i] = $i;
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDropDownList();
+		$years=array();
+		$current=intval(@date('Y'));
+		$from=$current - 10; $to=$current + 10;
+		for($i=$from; $i <= $to; $i++)
+			$years[$i]=$i;
 		$control->setDataSource($years);
 		$control->setSelectedValue(empty($value) ? $current : $value);
 		$control->setCssClass('year-dropdown');
@@ -85,8 +85,8 @@ 
 
 	protected function createIntegerControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Integer);
 		$val->setErrorMessage('Please entery an integer.');
 		return $control;
@@ -94,13 +94,13 @@ 
 
 	protected function createFloatControl($container, $column, $record)
 	{
-		$control = $this->createDefaultControl($container, $column, $record);
-		$val = $this->createTypeValidator($container, $column, $record);
+		$control=$this->createDefaultControl($container, $column, $record);
+		$val=$this->createTypeValidator($container, $column, $record);
 		$val->setDataType(TValidationDataType::Float);
 		$val->setErrorMessage('Please entery a decimal number.');
-		if(($max= $column->getMaxiumNumericConstraint())!==null)
+		if(($max=$column->getMaxiumNumericConstraint())!==null)
 		{
-			$val = $this->createRangeValidator($container,$column,$record);
+			$val=$this->createRangeValidator($container, $column, $record);
 			$val->setDataType(TValidationDataType::Float);
 			$val->setMaxValue($max);
 			$val->setStrictComparison(true);
@@ -111,99 +111,99 @@ 
 
 	protected function createRequiredValidator($container, $column, $record)
 	{
-		$val = new TRequiredFieldValidator();
+		$val=new TRequiredFieldValidator();
 		$val->setErrorMessage('*');
 		$val->setControlCssClass('required-input');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTypeValidator($container, $column, $record)
 	{
-		$val = new TDataTypeValidator();
+		$val=new TDataTypeValidator();
 		$val->setControlCssClass('required-input2');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createRangeValidator($container, $column, $record)
 	{
-		$val = new TRangeValidator();
+		$val=new TRangeValidator();
 		$val->setControlCssClass('required-input3');
 		$val->setCssClass('required');
 		$val->setControlToValidate(self::DEFAULT_ID);
 		$val->setValidationGroup($this->getParent()->getValidationGroup());
 		$val->setDisplay(TValidatorDisplayStyle::Dynamic);
-		$container->Controls[] = $val;
+		$container->Controls[]=$val;
 		return $val;
 	}
 
 	protected function createTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
 		$hours=array();
-		for($i=0;$i<24;$i++) $hours[] = str_pad($i,2,'0',STR_PAD_LEFT);
+		for($i=0; $i < 24; $i++) $hours[]=str_pad($i, 2, '0', STR_PAD_LEFT);
 		$mins=array();
-		for($i=0;$i<60;$i++) $mins[] = str_pad($i,2,'0',STR_PAD_LEFT);
-		$hour = intval(@date('H'));
-		$min = intval(@date('i'));
-		$sec = intval(@date('s'));
+		for($i=0; $i < 60; $i++) $mins[]=str_pad($i, 2, '0', STR_PAD_LEFT);
+		$hour=intval(@date('H'));
+		$min=intval(@date('i'));
+		$sec=intval(@date('s'));
 		if(!empty($value))
 		{
 			$match=array();
 			if(preg_match('/(\d+):(\d+):?(\d+)?/', $value, $match))
 			{
-				$hour = $match[1];
-				$min = $match[2];
+				$hour=$match[1];
+				$min=$match[2];
 				if(isset($match[3]))
 					$sec=$match[3];
 			}
 		}
 
-		$hcontrol = new TDropDownList();
+		$hcontrol=new TDropDownList();
 		$hcontrol->setDataSource($hours);
 		$hcontrol->setID(self::DEFAULT_ID);
 		$hcontrol->dataBind();
 		$hcontrol->setSelectedValue(intval($hour));
-		$container->Controls[] = $hcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$hcontrol;
+		$container->Controls[]=' : ';
 
-		$mcontrol = new TDropDownList();
+		$mcontrol=new TDropDownList();
 		$mcontrol->setDataSource($mins);
 		$mcontrol->dataBind();
 		$mcontrol->setID('scaffold_time_min');
 		$mcontrol->setSelectedValue(intval($min));
-		$container->Controls[] = $mcontrol;
-		$container->Controls[] = ' : ';
+		$container->Controls[]=$mcontrol;
+		$container->Controls[]=' : ';
 
-		$scontrol = new TDropDownList();
+		$scontrol=new TDropDownList();
 		$scontrol->setDataSource($mins);
 		$scontrol->dataBind();
 		$scontrol->setID('scaffold_time_sec');
 		$scontrol->setSelectedValue(intval($sec));
-		$container->Controls[] = $scontrol;
+		$container->Controls[]=$scontrol;
 
-		return array($hcontrol,$mcontrol,$scontrol);
+		return array($hcontrol, $mcontrol, $scontrol);
 	}
 
 
 	protected function createDateControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = new TDatePicker();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=new TDatePicker();
 		$control->setFromYear(1900);
 		$control->setInputMode(TDatePickerInputMode::DropDownList);
 		$control->setDateFormat('yyyy-MM-dd');
 		if(!empty($value))
-			$control->setDate(substr($value,0,10));
+			$control->setDate(substr($value, 0, 10));
 		$control->setCssClass('date-dropdown');
 		$this->setNotNullProperty($container, $control, $column, $record);
 		return $control;
@@ -211,10 +211,10 @@ 
 
 	protected function createDateTimeControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$control = $this->createDateControl($container, $column, $record);
-		$container->Controls[] = ' @ ';
-		$time = $this->createTimeControl($container, $column, $record);
+		$value=$this->getRecordPropertyValue($column, $record);
+		$control=$this->createDateControl($container, $column, $record);
+		$container->Controls[]=' @ ';
+		$time=$this->createTimeControl($container, $column, $record);
 		if(!empty($value))
 		{
 			$match=array();
@@ -232,30 +232,30 @@ 
 
 	protected function getDateTimeValue($container, $column, $record)
 	{
-		$date = $container->findControl(self::DEFAULT_ID)->getDate();
-		$hour = $container->findControl('scaffold_time_hour')->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$date=$container->findControl(self::DEFAULT_ID)->getDate();
+		$hour=$container->findControl('scaffold_time_hour')->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$date} {$hour}:{$mins}:{$secs}";
 	}
 
 	protected function getTimeValue($container, $column, $record)
 	{
-		$hour = $container->findControl(self::DEFAULT_ID)->getSelectedValue();
-		$mins = $container->findControl('scaffold_time_min')->getSelectedValue();
-		$secs = $container->findControl('scaffold_time_sec')->getSelectedValue();
+		$hour=$container->findControl(self::DEFAULT_ID)->getSelectedValue();
+		$mins=$container->findControl('scaffold_time_min')->getSelectedValue();
+		$secs=$container->findControl('scaffold_time_sec')->getSelectedValue();
 		return "{$hour}:{$mins}:{$secs}";
 	}
 
 	protected function createSetControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TCheckBoxList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TCheckBoxList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
-		$control->setSelectedIndices($this->getMatchingIndices($values,$selectedValues));
+		$control->setSelectedIndices($this->getMatchingIndices($values, $selectedValues));
 		$control->setID(self::DEFAULT_ID);
 		$control->setCssClass('set-checkboxes');
 		$this->setNotNullProperty($container, $control, $column, $record);
@@ -265,23 +265,23 @@ 
 	protected function getMatchingIndices($checks, $values)
 	{
 		$index=array();
-		for($i=0, $k=count($checks); $i<$k; $i++)
+		for($i=0, $k=count($checks); $i < $k; $i++)
 		{
 			if(in_array($checks[$i], $values))
-				$index[] = $i;
+				$index[]=$i;
 		}
 		return $index;
 	}
 
 	protected function createEnumControl($container, $column, $record)
 	{
-		$value = $this->getRecordPropertyValue($column, $record);
-		$selectedValues = preg_split('/\s*,\s*/', $value);
-		$control = new TRadioButtonList();
-		$values = $column->getDbTypeValues();
+		$value=$this->getRecordPropertyValue($column, $record);
+		$selectedValues=preg_split('/\s*,\s*/', $value);
+		$control=new TRadioButtonList();
+		$values=$column->getDbTypeValues();
 		$control->setDataSource($values);
 		$control->dataBind();
-		$index = $this->getMatchingIndices($values,$selectedValues);
+		$index=$this->getMatchingIndices($values, $selectedValues);
 		if(count($index) > 0)
 			$control->setSelectedIndex($index[0]);
 		$control->setID(self::DEFAULT_ID);
@@ -296,7 +296,7 @@ 
 		foreach($container->findControl(self::DEFAULT_ID)->getItems() as $item)
 		{
 			if($item->getSelected())
-				$value[] = $item->getText();
+				$value[]=$item->getText();
 		}
 		return implode(',', $value);
 	}

framework/Data/Common/Mssql/TMssqlMetaData.php

Doc Comments +1 added lines

@@ -123,6 +123,7 @@
 	/**
 	 * @param TMssqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMssqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Indentation +7 added lines, -7 removed lines

@@ -259,15 +259,15 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='dbo')
 	{
-                $condition="TABLE_TYPE='BASE TABLE'";
+				$condition="TABLE_TYPE='BASE TABLE'";
 		$sql=<<<EOD
 SELECT TABLE_NAME, TABLE_SCHEMA FROM [INFORMATION_SCHEMA].[TABLES]
 WHERE TABLE_SCHEMA=:schema AND $condition

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'];

framework/Data/Common/Mssql/TMssqlTableColumn.php

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
-	 * @return boolean derived PHP primitive type from the column db type.
+	 * @return string derived PHP primitive type from the column db type.
 	 */
 	public function getPHPType()
 	{

Spacing +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
  */
 class TMssqlTableColumn extends TDbTableColumn
 {
-	private static $types = array();
+	private static $types=array();
 
 	/**
 	 * Overrides parent implementation, returns PHP type from the db type.
@@ -40,7 +40,7 @@ 
 	 */
 	public function getAutoIncrement()
 	{
-		return $this->getInfo('AutoIncrement',false);
+		return $this->getInfo('AutoIncrement', false);
 	}
 
 	/**

framework/Data/Common/Mysql/TMysqlMetaData.php

Doc Comments +1 added lines

@@ -114,6 +114,7 @@
 	/**
 	 * @param TMysqlTableInfo table information.
 	 * @param array column information.
+	 * @param TMysqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

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

Braces +2 added lines, -4 removed lines

@@ -154,8 +154,7 @@ 
 					$info['NumericPrecision'] = intval($pscale[1]);
 					if(count($pscale) > 2)
 						$info['NumericScale'] = intval($pscale[2]);
-				}
-				else
+				} else
 					$info['ColumnSize'] = intval($pscale[1]);
 			}
 		}
@@ -254,8 +253,7 @@ 
 		try
 		{
 			return count($result = $command->queryRow()) > 0 && $result['Table_type']==='VIEW';
-		}
-		catch(TDbException $e)
+		} catch(TDbException $e)
 		{
 			$table = $schemaName===null?$tableName:$schemaName.'.'.$tableName;
 			throw new TDbException('dbcommon_invalid_table_name',$table,$e->getMessage());

framework/Data/Common/Oracle/TOracleMetaData.php

Doc Comments +3 added lines, -1 removed lines

@@ -145,7 +145,7 @@ 
 	/**
 	 * @param string table schema name
 	 * @param string table name.
-	 * @return boolean true if the table is a view.
+	 * @return integer true if the table is a view.
 	 */
 	protected function getIsView($schemaName,$tableName)
 	{
@@ -167,6 +167,7 @@ 
 	/**
 	 * @param TOracleTableInfo table information.
 	 * @param array column information.
+	 * @param TOracleTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
@@ -322,6 +323,7 @@ 
 	/**
 	 * @param string column name.
 	 * @param TOracleTableInfo table information.
+	 * @param string $columnId
 	 * @return boolean true if column is a foreign key.
 	 */
 	protected function isForeignKeyColumn($columnId, $tableInfo)

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

Spacing +60 added lines, -60 removed lines

@@ -25,7 +25,7 @@ 
  */
 class TOracleMetaData extends TDbMetaData
 {
-	private $_defaultSchema = 'system';
+	private $_defaultSchema='system';
 
 
 	/**
@@ -58,10 +58,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]);
 	}
 
 	/**
@@ -71,12 +71,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.COLUMN_ID,
@@ -96,14 +96,14 @@ 
 EOD;
 		$this->getDbConnection()->setActive(true);
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$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)
@@ -116,15 +116,15 @@ 
 	 * @param string table name.
 	 * @return TOracleTableInfo
 	 */
-	protected function createNewTableInfo($schemaName,$tableName)
+	protected function createNewTableInfo($schemaName, $tableName)
 	{
-		$info['SchemaName'] = $this->assertIdentifier($schemaName);
-		$info['TableName']	= $this->assertIdentifier($tableName);
-		$info['IsView'] 	= false;
-		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);
+		$info['IsView']=false;
+		if($this->getIsView($schemaName, $tableName)) $info['IsView']=true;
+		list($primary, $foreign)=$this->getConstraintKeys($schemaName, $tableName);
+		$class=$this->getTableInfoClass();
+		return new $class($info, $primary, $foreign);
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	{
 		if(strpos($name, '"')!==false)
 		{
-			$ref = 'http://www.oracle.com';
+			$ref='http://www.oracle.com';
 			throw new TDbException('dbcommon_invalid_identifier_name', $name, $ref);
 		}
 		return $name;
@@ -147,10 +147,10 @@ 
 	 * @param string table name.
 	 * @return boolean true if the table is a view.
 	 */
-	protected function getIsView($schemaName,$tableName)
+	protected function getIsView($schemaName, $tableName)
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
-		$sql =
+		$sql=
 <<<EOD
 		select	OBJECT_TYPE
 		from 	ALL_OBJECTS
@@ -158,10 +158,10 @@ 
 		and 	OWNER = '{$schemaName}'
 EOD;
 		$this->getDbConnection()->setActive(true);
-		$command = $this->getDbConnection()->createCommand($sql);
+		$command=$this->getDbConnection()->createCommand($sql);
 		//$command->bindValue(':schema',$schemaName);
 		//$command->bindValue(':table', $tableName);
-		return intval($command->queryScalar() === 'VIEW');
+		return intval($command->queryScalar()==='VIEW');
 	}
 
 	/**
@@ -170,17 +170,17 @@ 
 	 */
 	protected function processColumn($tableInfo, $col)
 	{
-		$columnId = strtolower($col['attname']); //use column name as column Id
+		$columnId=strtolower($col['attname']); //use column name as column Id
 
 		//$info['ColumnName'] 	= '"'.$columnId.'"'; //quote the column names!
-		$info['ColumnName'] 	= $columnId; //NOT quote the column names!
-		$info['ColumnId'] 		= $columnId;
-		$info['ColumnIndex'] 	= $col['index'];
-		if(! (bool)$col['attnotnull'] ) $info['AllowNull'] = true;
-		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey'] = true;
-		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey'] = true;
-		if( (int)$col['atttypmod'] > 0 ) $info['ColumnSize'] =  $col['atttypmod']; // - 4;
-		if( (bool)$col['atthasdef'] ) $info['DefaultValue'] = $col['adsrc'];
+		$info['ColumnName']=$columnId; //NOT quote the column names!
+		$info['ColumnId']=$columnId;
+		$info['ColumnIndex']=$col['index'];
+		if(!(bool) $col['attnotnull']) $info['AllowNull']=true;
+		if(in_array($columnId, $tableInfo->getPrimaryKeys())) $info['IsPrimaryKey']=true;
+		if($this->isForeignKeyColumn($columnId, $tableInfo)) $info['IsForeignKey']=true;
+		if((int) $col['atttypmod'] > 0) $info['ColumnSize']=$col['atttypmod']; // - 4;
+		if((bool) $col['atthasdef']) $info['DefaultValue']=$col['adsrc'];
 		//
 		// For a while Oracle Tables has no  associated AutoIncrement Triggers
 		//
@@ -194,31 +194,31 @@ 
 			}
 		}
 		*/
-		$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'];
-		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
+			$info['DbType']=$col['type'];
+		$tableInfo->Columns[$columnId]=new TOracleTableColumn($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];
@@ -232,7 +232,7 @@ 
 	 */
 	protected function isPrecisionType($type)
 	{
-		$type = strtolower(trim($type));
+		$type=strtolower(trim($type));
 		return $type==='number'; // || $type==='interval' || strpos($type, 'time')===0;
 	}
 
@@ -246,7 +246,7 @@ 
 	{
 		$this->getDbConnection()->setAttribute(PDO::ATTR_CASE, PDO::CASE_LOWER);
 //		select decode( a.CONSTRAINT_TYPE, 'P', 'PRIMARY KEY (', 'FOREIGN KEY (' )||b.COLUMN_NAME||')' as consrc,
-		$sql =
+		$sql=
 <<<EOD
 		select b.COLUMN_NAME as consrc,
 			   a.CONSTRAINT_TYPE as contype
@@ -257,24 +257,24 @@ 
 		and   a.CONSTRAINT_TYPE in ('P','R')
 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( strtolower( $row['contype'] ) )
+			switch(strtolower($row['contype']))
 			{
 				case 'p':
-					$primary = array_merge( $primary, array(strtolower( $row['consrc'] )) );
+					$primary=array_merge($primary, array(strtolower($row['consrc'])));
 					/*
 					$arr = $this->getPrimaryKeys($row['consrc']);
 					$primary = array_merge( $primary, array(strtolower( $arr[0] )) );
 					*/
 					break;
 				case 'r':
-					$foreign = array_merge( $foreign, array(strtolower( $row['consrc'] )) );
+					$foreign=array_merge($foreign, array(strtolower($row['consrc'])));
 					/*
 					// if(($fkey = $this->getForeignKeys($row['consrc']))!==null)
 					$fkey = $this->getForeignKeys( $row['consrc'] );
@@ -283,7 +283,7 @@ 
 					break;
 			}
 		}
-		return array($primary,$foreign);
+		return array($primary, $foreign);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 */
 	protected function getPrimaryKeys($src)
 	{
-		$matches = array();
+		$matches=array();
 		if(preg_match('/PRIMARY\s+KEY\s+\(([^\)]+)\)/i', $src, $matches))
-			return preg_split('/,\s+/',$matches[1]);
+			return preg_split('/,\s+/', $matches[1]);
 		return array();
 	}
 
@@ -306,16 +306,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);
 		}
 	}
 
@@ -328,7 +328,7 @@ 
 	{
 		foreach($tableInfo->getForeignKeys() as $fk)
 		{
-			if( $fk==$columnId )
+			if($fk==$columnId)
 			//if(in_array($columnId, array_keys($fk['keys'])))
 				return true;
 		}
@@ -357,7 +357,7 @@ 
 WHERE object_type = 'TABLE' AND owner=:schema
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-			$command->bindParam(':schema',$schema);
+			$command->bindParam(':schema', $schema);
 		}
 
 		$rows=$command->queryAll();

Braces +3 added lines, -6 removed lines

@@ -203,11 +203,9 @@ 
 				$info['NumericPrecision'] = intval($matches[1]);
 				if(count($matches) > 2)
 					$info['NumericScale'] = intval($matches[2]);
-			}
-			else
+			} else
 				$info['ColumnSize'] = intval($matches[1]);
-		}
-		else
+		} else
 			$info['DbType'] = $col['type'];
 		$tableInfo->Columns[$columnId] = new TOracleTableColumn($info);
 	}
@@ -349,8 +347,7 @@ 
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
 EOD;
 			$command=$this->getDbConnection()->createCommand($sql);
-		}
-		else
+		} else
 		{
 			$sql=<<<EOD
 SELECT object_name as table_name, owner as table_schema FROM all_objects

framework/Data/Common/Pgsql/TPgsqlMetaData.php

Doc Comments +1 added lines

@@ -204,6 +204,7 @@
 	/**
 	 * @param TPgsqlTableInfo table information.
 	 * @param array column information.
+	 * @param TPgsqlTableInfo $tableInfo
 	 */
 	protected function processColumn($tableInfo, $col)
 	{

Indentation +6 added lines, -6 removed lines

@@ -417,12 +417,12 @@
 		return false;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	public function findTableNames($schema='public')
 	{
 		if($schema==='')

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)

Braces +2 added lines, -4 removed lines

@@ -233,8 +233,7 @@ 
 				$newid=substr($id,$pos+1);
 				if ($control!==null)
 					$control=$control->$newid;
-			}
-			else
+			} else
 			{
 				// TCheckBoxList overrides findControl() with a fake implementation
 				// but accepts a second parameter to use the standard one
@@ -296,8 +295,7 @@ 
 		{
 			$group=$this->getValidationGroup();
 			return $this->getPage()->getValidators($group)->getCount()>0;
-		}
-		else
+		} else
 			return false;
 	}
 

framework/Data/Common/TDbMetaData.php

Doc Comments -6 removed lines

@@ -127,8 +127,6 @@ 
 	/**
 	 * Quotes a table name for use in a query.
 	 * @param string $name table name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted table name
 	 */
 	public function quoteTableName($name)
@@ -150,8 +148,6 @@ 
 	/**
 	 * Quotes a column name for use in a query.
 	 * @param string $name column name
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column name
 	 */
 	public function quoteColumnName($name)
@@ -166,8 +162,6 @@ 
 	/**
 	 * Quotes a column alias for use in a query.
 	 * @param string $name column alias
-	 * @param string $lft left delimiter
-	 * @param string $rgt right delimiter
 	 * @return string the properly quoted column alias
 	 */
 	public function quoteColumnAlias($name)

Indentation +8 added lines, -8 removed lines

@@ -179,14 +179,14 @@
 		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
 	}
 
-        /**
-	 * Returns all table names in the database.
-	 * This method should be overridden by child classes in order to support this feature
-	 * because the default implementation simply throws an exception.
-	 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
-	 * If not empty, the returned table names will be prefixed with the schema name.
-	 * @return array all table names in the database.
-	 */
+		/**
+		 * Returns all table names in the database.
+		 * This method should be overridden by child classes in order to support this feature
+		 * because the default implementation simply throws an exception.
+		 * @param string $schema the schema of the tables. Defaults to empty string, meaning the current or default schema.
+		 * If not empty, the returned table names will be prefixed with the schema name.
+		 * @return array all table names in the database.
+		 */
 	abstract public function findTableNames($schema='');
 }
 

Spacing +21 added lines, -21 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * @var array
 	 */
-	protected static $delimiterIdentifier = array('[', ']', '"', '`', "'");
+	protected static $delimiterIdentifier=array('[', ']', '"', '`', "'");
 
 	/**
 	 * @param TDbConnection database connection.
@@ -53,7 +53,7 @@ 
 	public static function getInstance($conn)
 	{
 		$conn->setActive(true); //must be connected before retrieving driver name
-		$driver = $conn->getDriverName();
+		$driver=$conn->getDriverName();
 		switch(strtolower($driver))
 		{
 			case 'pgsql':
@@ -79,7 +79,7 @@ 
 //				Prado::using('System.Data.Common.IbmDb2.TIbmDb2MetaData');
 //				return new TIbmDb2MetaData($conn);
 			default:
-				throw new TDbException('ar_invalid_database_driver',$driver);
+				throw new TDbException('ar_invalid_database_driver', $driver);
 		}
 	}
 
@@ -90,12 +90,12 @@ 
 	 */
 	public function getTableInfo($tableName=null)
 	{
-		$key = $tableName===null?$this->getDbConnection()->getConnectionString():$tableName;
+		$key=$tableName===null ? $this->getDbConnection()->getConnectionString() : $tableName;
 		if(!isset($this->_tableInfoCache[$key]))
 		{
-			$class = $this->getTableInfoClass();
-			$tableInfo = $tableName===null ? new $class : $this->createTableInfo($tableName);
-			$this->_tableInfoCache[$key] = $tableInfo;
+			$class=$this->getTableInfoClass();
+			$tableInfo=$tableName===null ? new $class : $this->createTableInfo($tableName);
+			$this->_tableInfoCache[$key]=$tableInfo;
 		}
 		return $this->_tableInfoCache[$key];
 	}
@@ -133,17 +133,17 @@ 
 	 */
 	public function quoteTableName($name)
 	{
-		$name = str_replace(self::$delimiterIdentifier, '', $name);
+		$name=str_replace(self::$delimiterIdentifier, '', $name);
 
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
 		if(strpos($name, '.')===false)
-			return $lft . $name . $rgt;
+			return $lft.$name.$rgt;
 		$names=explode('.', $name);
 		foreach($names as &$n)
-			$n = $lft . $n . $rgt;
+			$n=$lft.$n.$rgt;
 		return implode('.', $names);
 	}
 
@@ -156,11 +156,11 @@ 
 	 */
 	public function quoteColumnName($name)
 	{
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
-		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
+		return $lft.str_replace(self::$delimiterIdentifier, '', $name).$rgt;
 	}
 
 	/**
@@ -172,11 +172,11 @@ 
 	 */
 	public function quoteColumnAlias($name)
 	{
-		$args = func_get_args();
-		$rgt = $lft = isset($args[1]) ? $args[1] : '';
-		$rgt = isset($args[2]) ? $args[2] : $rgt;
+		$args=func_get_args();
+		$rgt=$lft=isset($args[1]) ? $args[1] : '';
+		$rgt=isset($args[2]) ? $args[2] : $rgt;
 
-		return $lft . str_replace(self::$delimiterIdentifier, '', $name) . $rgt;
+		return $lft.str_replace(self::$delimiterIdentifier, '', $name).$rgt;
 	}
 
         /**

framework/Data/DataGateway/TSqlCriteria.php

Doc Comments +3 added lines, -1 removed lines

@@ -188,7 +188,7 @@ 
 	}
 
 	/**
-	 * @return boolean true if the parameter index are string base, false otherwise.
+	 * @return boolean|null true if the parameter index are string base, false otherwise.
 	 */
 	public function getIsNamedParameters()
 	{
@@ -206,6 +206,7 @@ 
 
 	/**
 	 * @param mixed ordering clause.
+	 * @param string $value
 	 */
 	public function setOrdersBy($value)
 	{
@@ -250,6 +251,7 @@ 
 
 	/**
 	 * @param int record offset.
+	 * @param double $value
 	 */
 	public function setOffset($value)
 	{

Spacing +30 added lines, -30 removed lines

@@ -48,10 +48,10 @@ 
 	public function __construct($condition=null, $parameters=array())
 	{
 		if(!is_array($parameters) && func_num_args() > 1)
-			$parameters = array_slice(func_get_args(),1);
+			$parameters=array_slice(func_get_args(), 1);
 		$this->_parameters=new TAttributeCollection;
 		$this->_parameters->setCaseSensitive(true);
-		$this->_parameters->copyFrom((array)$parameters);
+		$this->_parameters->copyFrom((array) $parameters);
 		$this->_ordersBy=new TAttributeCollection;
 		$this->_ordersBy->setCaseSensitive(true);
 
@@ -109,7 +109,7 @@ 
 	 */
 	public function setSelect($value)
 	{
-		$this->_select = $value;
+		$this->_select=$value;
 	}
 
 	/**
@@ -128,7 +128,7 @@ 
 	{
 		if(empty($value)) {
 			// reset the condition
-			$this->_condition = null;
+			$this->_condition=null;
 			return;
 		}
 
@@ -140,7 +140,7 @@ 
 
 		if(preg_match('/ORDER\s+BY\s+(.*?)(?=LIMIT)|ORDER\s+BY\s+(.*?)$/i', $value, $matches) > 0) {
 			// condition contains ORDER BY
-			$value = str_replace($matches[0], '', $value);
+			$value=str_replace($matches[0], '', $value);
 			if(strlen($matches[1]) > 0) {
 				$this->setOrdersBy($matches[1]);
 			} else if(strlen($matches[2]) > 0) {
@@ -150,23 +150,23 @@ 
 
 		if(preg_match('/LIMIT\s+([\d\s,]+)/i', $value, $matches) > 0) {
 			// condition contains limit
-			$value = str_replace($matches[0], '', $value); // remove limit from query
+			$value=str_replace($matches[0], '', $value); // remove limit from query
 			if(strpos($matches[1], ',')) { // both offset and limit given
-				list($offset, $limit) = explode(',', $matches[1]);
-				$this->_limit = (int)$limit;
-				$this->_offset = (int)$offset;
+				list($offset, $limit)=explode(',', $matches[1]);
+				$this->_limit=(int) $limit;
+				$this->_offset=(int) $offset;
 			} else { // only limit given
-				$this->_limit = (int)$matches[1];
+				$this->_limit=(int) $matches[1];
 			}
 		}
 
 		if(preg_match('/OFFSET\s+(\d+)/i', $value, $matches) > 0) {
 			// condition contains offset
-			$value = str_replace($matches[0], '', $value); // remove offset from query
-			$this->_offset = (int)$matches[1]; // set offset in criteria
+			$value=str_replace($matches[0], '', $value); // remove offset from query
+			$this->_offset=(int) $matches[1]; // set offset in criteria
 		}
 
-		$this->_condition = trim($value);
+		$this->_condition=trim($value);
 	}
 
 	/**
@@ -213,12 +213,12 @@ 
 			$this->_ordersBy->copyFrom($value);
 		else
 		{
-			$value=trim(preg_replace('/\s+/',' ',(string)$value));
+			$value=trim(preg_replace('/\s+/', ' ', (string) $value));
 			$orderBys=array();
-			foreach(explode(',',$value) as $orderBy)
+			foreach(explode(',', $value) as $orderBy)
 			{
-				$vs=explode(' ',trim($orderBy));
-				$orderBys[$vs[0]]=isset($vs[1])?$vs[1]:'asc';
+				$vs=explode(' ', trim($orderBy));
+				$orderBys[$vs[0]]=isset($vs[1]) ? $vs[1] : 'asc';
 			}
 			$this->_ordersBy->copyFrom($orderBys);
 		}
@@ -261,23 +261,23 @@ 
 	 */
 	public function __toString()
 	{
-		$str = '';
-		if(strlen((string)$this->getCondition()) > 0)
-			$str .= '"'.(string)$this->getCondition().'"';
-		$params = array();
+		$str='';
+		if(strlen((string) $this->getCondition()) > 0)
+			$str.='"'.(string) $this->getCondition().'"';
+		$params=array();
 		foreach($this->getParameters() as $k=>$v)
-			$params[] = "{$k} => ${v}";
+			$params[]="{$k} => ${v}";
 		if(count($params) > 0)
-			$str .= ', "'.implode(', ',$params).'"';
-		$orders = array();
+			$str.=', "'.implode(', ', $params).'"';
+		$orders=array();
 		foreach($this->getOrdersBy() as $k=>$v)
-			$orders[] = "{$k} => ${v}";
+			$orders[]="{$k} => ${v}";
 		if(count($orders) > 0)
-			$str .= ', "'.implode(', ',$orders).'"';
-		if($this->_limit !==null)
-			$str .= ', '.$this->_limit;
-		if($this->_offset !== null)
-			$str .= ', '.$this->_offset;
+			$str.=', "'.implode(', ', $orders).'"';
+		if($this->_limit!==null)
+			$str.=', '.$this->_limit;
+		if($this->_offset!==null)
+			$str.=', '.$this->_offset;
 		return $str;
 	}
 }