Coding style PSR-2

framework/yii/db/oci/ColumnSchema.php

@@ -1,16 +1,17 @@
 <?php
 namespace yii\db\oci;
 
-
-
 class ColumnSchema extends \yii\db\ColumnSchema
 {
 
     /**
      * Initializes the column with its DB type and default value.
      * This sets up the column's PHP type, size, precision, scale as well as default value.
-     * @param string $dbType the column's DB type
+     * 
-     * @param mixed $defaultValue the default value
+     * @param string $dbType
+     *            the column's DB type
+     * @param mixed $defaultValue
+     *            the default value
      */
     public function extract($dbType, $defaultValue)
     {
@@ -23,32 +24,34 @@ class ColumnSchema extends \yii\db\ColumnSchema
 
     /**
      * Extracts the PHP type from DB type.
-     * @param string $dbType DB type
+     * 
+     * @param string $dbType
+     *            DB type
      * @return string
      */
-    protected function extractOraType($dbType){
+    protected function extractOraType($dbType)
-        if(strpos($dbType,'FLOAT')!==false) return 'double';
-    
-        if (strpos($dbType,'NUMBER')!==false || strpos($dbType,'INTEGER')!==false)
-        {
-            if(strpos($dbType,'(') && preg_match('/\((.*)\)/',$dbType,$matches))
     {
+        if (strpos($dbType, 'FLOAT') !== false)
+            return 'double';
+        
+        if (strpos($dbType, 'NUMBER') !== false || strpos($dbType, 'INTEGER') !== false) {
+            if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) {
                 $values = explode(',', $matches[1]);
                 if (isset($values[1]) and (((int) $values[1]) > 0))
                     return 'double';
                 else
                     return 'integer';
-            }
+            } else
-            else
                 return 'double';
-        }
+        } else
-        else
             return 'string';
     }
 
     /**
      * Extracts the PHP type from DB type.
-	 * @param string $dbType DB type
+     * 
+     * @param string $dbType
+     *            DB type
      */
     protected function extractType($dbType)
     {
@@ -57,12 +60,13 @@ class ColumnSchema extends \yii\db\ColumnSchema
 
     /**
      * Extracts size, precision and scale information from column's DB type.
-	 * @param string $dbType the column's DB type
+     * 
+     * @param string $dbType
+     *            the column's DB type
      */
     protected function extractLimit($dbType)
     {
-	    if(strpos($dbType,'(') && preg_match('/\((.*)\)/',$dbType,$matches))
+        if (strpos($dbType, '(') && preg_match('/\((.*)\)/', $dbType, $matches)) {
-	    {
             $values = explode(',', $matches[1]);
             $this->size = $this->precision = (int) $values[0];
             if (isset($values[1]))
@@ -73,16 +77,16 @@ class ColumnSchema extends \yii\db\ColumnSchema
     /**
      * Extracts the default value for the column.
      * The value is typecasted to correct PHP type.
-	 * @param mixed $defaultValue the default value obtained from metadata
+     * 
+     * @param mixed $defaultValue
+     *            the default value obtained from metadata
      */
     protected function extractDefault($defaultValue)
     {
         if (stripos($defaultValue, 'timestamp') !== false) {
             $this->defaultValue = null;
-		}
+        } else {
-		else {
             $this->defaultValue = $this->typecast($defaultValue);
         }
     }
-    
 }

framework/yii/db/oci/QueryBuilder.php

@@ -1,21 +1,20 @@
 <?php
-
 namespace yii\db\oci;
 
 use yii\db\Exception;
 use yii\base\InvalidParamException;
 
 /**
- * QueryBuilder is the query builder for MySQL databases.
+ * QueryBuilder is the query builder for Oracle databases.
  * 
- * @author Qiang Xue <qiang.xue@gmail.com>
- * @since 2.0
  */
-class QueryBuilder extends \yii\db\QueryBuilder {
+class QueryBuilder extends \yii\db\QueryBuilder
+{
 
     private $sql;
 
-	public function build($query) {
+    public function build($query)
+    {
         // var_dump($query);exit;
         $params = $query->params;
 		$clauses = [ 
@@ -26,20 +25,25 @@ class QueryBuilder extends \yii\db\QueryBuilder {
 				$this->buildGroupBy ( $query->groupBy ),
 				$this->buildHaving ( $query->having, $params ),
 				$this->buildUnion ( $query->union, $params ),
-			$this->buildOrderBy($query->orderBy),
+				$this->buildOrderBy ( $query->orderBy ) 
 		// $this->buildLimit($query->limit, $query->offset),
-		];
+		
+        ;
         // var_dump( [implode($this->separator, array_filter($clauses)), $params]);exit;
         $this->sql = implode($this->separator, array_filter($clauses));
         
         if (! is_null($query->limit) && ! is_null($query->offset)) {
             $this->sql = $this->buildLimit($query->limit, $query->offset);
         }
-		return [$this->sql, $params];
+        return [
+            $this->sql,
+            $params
+        ];
         // return [implode($this->separator, array_filter($clauses)), $params];
     }
 
-	public function buildLimit($limit, $offset) {
+    public function buildLimit($limit, $offset)
+    {
         // var_dump($limit >= 0);
         // var_dump($offset);exit;
         // var_dump($limit, $offset);
@@ -71,5 +75,4 @@ FROM PAGINATION
 EOD;
         return $sql;
     }
-
 }

framework/yii/db/oci/Schema.php

@@ -1,19 +1,26 @@
 <?php
-
 namespace yii\db\oci;
 
 use yii\db\TableSchema;
 use yii\db\oci\ColumnSchema;
 
-class Schema extends \yii\db\Schema {
+/**
+ * Schema is the class for retrieving metadata information from an Oracle database.
+ * 
+ */
+
+class Schema extends \yii\db\Schema
+{
 
     private $_defaultSchema = '';
 
-	public function createQueryBuilder() {
+    public function createQueryBuilder()
+    {
         return new QueryBuilder($this->db);
     }
 
-	public function quoteTableName($name) {
+    public function quoteTableName($name)
+    {
         if (strpos($name, '.') === false) {
             return $this->quoteSimpleTableName($name);
         }
@@ -24,12 +31,14 @@ class Schema extends \yii\db\Schema {
         return implode('.', $parts);
     }
 
-	public function quoteSimpleTableName($name) {
+    public function quoteSimpleTableName($name)
+    {
         return '"' . $name . '"';
         // return $name;
     }
 
-	public function quoteColumnName($name) {
+    public function quoteColumnName($name)
+    {
         if (($pos = strrpos($name, '.')) !== false) {
             $prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
             $name = substr($name, $pos + 1);
@@ -39,12 +48,14 @@ class Schema extends \yii\db\Schema {
         return $prefix . ($name === '*' ? $name : $this->quoteSimpleColumnName($name));
     }
 
-	public function quoteSimpleColumnName($name) {
+    public function quoteSimpleColumnName($name)
+    {
         return '"' . $name . '"';
         // return $name;
     }
 
-	public function loadTableSchema($name) {
+    public function loadTableSchema($name)
+    {
         $table = new TableSchema();
         $this->resolveTableNames($table, $name);
         // $this->findPrimaryKeys($table);
@@ -58,10 +69,13 @@ class Schema extends \yii\db\Schema {
     /**
      * Resolves the table name and schema name (if any).
      *
-	 * @param TableSchema $table the table metadata object
+     * @param TableSchema $table
-	 * @param string $name the table name
+     *            the table metadata object
+     * @param string $name
+     *            the table name
      */
-	protected function resolveTableNames($table, $name) {
+    protected function resolveTableNames($table, $name)
+    {
         $parts = explode('.', str_replace('"', '', $name));
         if (isset($parts[1])) {
             $table->schemaName = $parts[0];
@@ -79,7 +93,8 @@ class Schema extends \yii\db\Schema {
      *
      * @return string default schema.
      */
-	public function getDefaultSchema() {
+    public function getDefaultSchema()
+    {
         if (! strlen($this->_defaultSchema)) {
             $this->setDefaultSchema(strtoupper($this->db->username));
         }
@@ -89,13 +104,16 @@ class Schema extends \yii\db\Schema {
 
     /**
      *
-	 * @param string $schema default schema.
+     * @param string $schema
+     *            default schema.
      */
-	public function setDefaultSchema($schema) {
+    public function setDefaultSchema($schema)
+    {
         $this->_defaultSchema = $schema;
     }
 
-	public function getLastInsertID($sequenceName = '') {
+    public function getLastInsertID($sequenceName = '')
+    {
         if ($this->db->isActive) {
             $sql = "select {$sequenceName}.currval from dual";
             return $this->db->createCommand($sql)->queryScalar();
@@ -106,10 +124,10 @@ class Schema extends \yii\db\Schema {
 
     /**
      * Collects the table column metadata.
-	 * @param COciTableSchema $table the table metadata
+     *     
-	 * @return boolean whether the table exists in the database
      */
-	protected function findColumns($table) {
+    protected function findColumns($table)
+    {
         $schemaName = $table->schemaName;
         $tableName = $table->name;
         
@@ -143,7 +161,6 @@ WHERE
 ORDER by a.column_id
 EOD;
         
-
         try {
             $columns = $this->db->createCommand($sql)->queryAll();
         } catch (\Exception $e) {
@@ -158,7 +175,10 @@ EOD;
                 if ($table->primaryKey === null) {
                     $table->primaryKey = $c->name;
                 } elseif (is_string($table->primaryKey)) {
-					$table->primaryKey = array($table->primaryKey, $c->name);
+                    $table->primaryKey = array(
+                        $table->primaryKey,
+                        $c->name
+                    );
                 } else {
                     $table->primaryKey[] = $c->name;
                 }
@@ -184,8 +204,9 @@ where tabs.table_name = '{$tableName}'
         return true;
     }
 
-	protected function createColumn($column) {
+    protected function createColumn($column)
-		$c = new ColumnSchema;
+    {
+        $c = new ColumnSchema();
         $c->name = $column['COLUMN_NAME'];
         $c->allowNull = $column['NULLABLE'] === 'Y';
         $c->isPrimaryKey = strpos($column['KEY'], 'P') !== false;
@@ -195,7 +216,8 @@ where tabs.table_name = '{$tableName}'
         return $c;
     }
 
-	protected function findConstraints($table) {
+    protected function findConstraints($table)
+    {
         $sql = <<<EOD
 		SELECT D.constraint_type as CONSTRAINT_TYPE, C.COLUMN_NAME, C.position, D.r_constraint_name,
                 E.table_name as table_ref, f.column_name as column_ref,
@@ -213,12 +235,12 @@ EOD;
         foreach ($command->queryAll() as $row) {
             if ($row['CONSTRAINT_TYPE'] === 'R') { // foreign key
                 $name = $row["COLUMN_NAME"];
-				$table->foreignKeys[$name] = array($row["TABLE_REF"], $row["COLUMN_REF"]);
+                $table->foreignKeys[$name] = array(
+                    $row["TABLE_REF"],
+                    $row["COLUMN_REF"]
+                );
                 /*
-				  if (isset($table->columns[$name])) {
+                 * if (isset($table->columns[$name])) { $table->columns[$name]->isForeignKey = true; }
-				  $table->columns[$name]->isForeignKey = true;
-				  }
-				 * 
                  */
             }
         }
@@ -226,11 +248,14 @@ EOD;
 
     /**
      * 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.
+     * 
+     * @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.
      */
-	protected function findTableNames($schema = '') {
+    protected function findTableNames($schema = '')
+    {
         if ($schema === '') {
             $sql = <<<EOD
 SELECT table_name, '{$schema}' as table_schema FROM user_tables
@@ -259,41 +284,52 @@ EOD;
 
     /**
      * Builds a SQL statement for renaming a DB table.
-	 * @param string $table the table to be renamed. The name will be properly quoted by the method.
+     * 
-	 * @param string $newName the new table name. The name will be properly quoted by the method.
+     * @param string $table
+     *            the table to be renamed. The name will be properly quoted by the method.
+     * @param string $newName
+     *            the new table name. The name will be properly quoted by the method.
      * @return string the SQL statement for renaming a DB table.
      * @since 1.1.6
      */
-	public function renameTable($table, $newName) {
+    public function renameTable($table, $newName)
+    {
         return 'ALTER TABLE ' . $this->quoteTableName($table) . ' RENAME TO ' . $this->quoteTableName($newName);
     }
 
     /**
      * Builds a SQL statement for changing the definition of a column.
-	 * @param string $table the table whose column is to be changed. The table name will be properly quoted by the method.
+     * 
-	 * @param string $column the name of the column to be changed. The name will be properly quoted by the method.
+     * @param string $table
-	 * @param string $type the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any)
+     *            the table whose column is to be changed. The table name will be properly quoted by the method.
+     * @param string $column
+     *            the name of the column to be changed. The name will be properly quoted by the method.
+     * @param string $type
+     *            the new column type. The {@link getColumnType} method will be invoked to convert abstract column type (if any)
      *            into the physical one. Anything that is not recognized as abstract type will be kept in the generated SQL.
      *            For example, 'string' will be turned into 'varchar(255)', while 'string not null' will become 'varchar(255) not null'.
      * @return string the SQL statement for changing the definition of a column.
      * @since 1.1.6
      */
-	public function alterColumn($table, $column, $type) {
+    public function alterColumn($table, $column, $type)
+    {
         $type = $this->getColumnType($type);
-		$sql = 'ALTER TABLE ' . $this->quoteTableName($table) . ' MODIFY '
+        $sql = 'ALTER TABLE ' . $this->quoteTableName($table) . ' MODIFY ' . $this->quoteColumnName($column) . ' ' . $this->getColumnType($type);
-				. $this->quoteColumnName($column) . ' '
-				. $this->getColumnType($type);
         return $sql;
     }
 
     /**
      * Builds a SQL statement for dropping an index.
-	 * @param string $name the name of the index to be dropped. The name will be properly quoted by the method.
+     * 
-	 * @param string $table the table whose index is to be dropped. The name will be properly quoted by the method.
+     * @param string $name
+     *            the name of the index to be dropped. The name will be properly quoted by the method.
+     * @param string $table
+     *            the table whose index is to be dropped. The name will be properly quoted by the method.
      * @return string the SQL statement for dropping an index.
      * @since 1.1.6
      */
-	public function dropIndex($name, $table) {
+    public function dropIndex($name, $table)
+    {
         return 'DROP INDEX ' . $this->quoteTableName($name);
     }
 
@@ -301,12 +337,16 @@ EOD;
      * Resets the sequence value of a table's primary key.
      * The sequence will be reset such that the primary key of the next new row inserted
      * will have the specified value or 1.
-	 * @param CDbTableSchema $table the table schema whose primary key sequence will be reset
+     * 
-	 * @param mixed $value the value for the primary key of the next new row inserted. If this is not set,
+     * @param CDbTableSchema $table
+     *            the table schema whose primary key sequence will be reset
+     * @param mixed $value
+     *            the value for the primary key of the next new row inserted. If this is not set,
      *            the next new row's primary key will have a value 1.
      * @since 1.1.13
      */
-	public function resetSequence($table, $value = 1) {
+    public function resetSequence($table, $value = 1)
+    {
         $seq = $table->name . "_SEQ";
         if ($table->sequenceName !== null) {
             $this->db->createCommand("DROP SEQUENCE " . $seq)->execute();
@@ -321,5 +361,4 @@ SQL;
             $this->db->createCommand($createSequenceSql)->execute();
         }
     }
-
 }