edgardmessias / yii2-ibm-db2

src/Schema.php

Doc Comments +6 added lines

@@ -98,6 +98,7 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
      */
     protected function resolveTableNames($table, $name)
     {
@@ -182,6 +183,7 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
      */
     protected function findColumns($table)
     {
@@ -271,6 +273,7 @@ 
 
     /**
      * @inheritdoc
+     * @param TableSchema $table
      */
     protected function findConstraints($table)
     {
@@ -862,6 +865,9 @@ 
         return $result;
     }
 
+    /**
+     * @param boolean $multiple
+     */
     protected function normalizePdoRowKeyCase(array $row, $multiple)
     {
         if ($this->db->getSlavePdo()->getAttribute(\PDO::ATTR_CASE) === \PDO::CASE_LOWER) {

Spacing +67 added lines, -67 removed lines

@@ -102,12 +102,12 @@ 
     protected function resolveTableNames($table, $name)
     {
         $parts = explode('.', str_replace('"', '', $name));
-        if (isset($parts[1])) {
-            $table->schemaName = $parts[0];
-            $table->name = $parts[1];
+        if (isset($parts[ 1 ])) {
+            $table->schemaName = $parts[ 0 ];
+            $table->name = $parts[ 1 ];
             $table->fullName = $table->schemaName . '.' . $table->name;
         } else {
-            $table->fullName = $table->name = $parts[0];
+            $table->fullName = $table->name = $parts[ 0 ];
         }
     }
 
@@ -139,7 +139,7 @@ 
         ];
         $type = gettype($data);
 
-        return isset($typeMap[$type]) ? $typeMap[$type] : PDO::PARAM_STR;
+        return isset($typeMap[ $type ]) ? $typeMap[ $type ] : PDO::PARAM_STR;
     }
 
     /**
@@ -149,24 +149,24 @@ 
     {
         $column = $this->createColumnSchema();
 
-        $column->name = $info['name'];
-        $column->dbType = $info['dbtype'];
-        $column->defaultValue = isset($info['defaultvalue']) ? trim($info['defaultvalue'], "''") : null;
-        $column->scale = (int) $info['scale'];
-        $column->size = (int) $info['size'];
-        $column->precision = (int) $info['size'];
-        $column->allowNull = $info['allownull'] === '1';
-        $column->isPrimaryKey = $info['isprimarykey'] === '1';
-        $column->autoIncrement = $info['autoincrement'] === '1';
+        $column->name = $info[ 'name' ];
+        $column->dbType = $info[ 'dbtype' ];
+        $column->defaultValue = isset($info[ 'defaultvalue' ]) ? trim($info[ 'defaultvalue' ], "''") : null;
+        $column->scale = (int) $info[ 'scale' ];
+        $column->size = (int) $info[ 'size' ];
+        $column->precision = (int) $info[ 'size' ];
+        $column->allowNull = $info[ 'allownull' ] === '1';
+        $column->isPrimaryKey = $info[ 'isprimarykey' ] === '1';
+        $column->autoIncrement = $info[ 'autoincrement' ] === '1';
         $column->unsigned = false;
-        $column->type = $this->typeMap[strtolower($info['dbtype'])];
+        $column->type = $this->typeMap[ strtolower($info[ 'dbtype' ]) ];
         $column->enumValues = null;
-        $column->comment = isset($info['comment']) ? $info['comment'] : null;
+        $column->comment = isset($info[ 'comment' ]) ? $info[ 'comment' ] : null;
 
-        if (preg_match('/(varchar|character|clob|graphic|binary|blob)/i', $info['dbtype'])) {
-            $column->dbType .= '(' . $info['size'] . ')';
-        } elseif (preg_match('/(decimal|double|real)/i', $info['dbtype'])) {
-            $column->dbType .= '(' . $info['size'] . ',' . $info['scale'] . ')';
+        if (preg_match('/(varchar|character|clob|graphic|binary|blob)/i', $info[ 'dbtype' ])) {
+            $column->dbType .= '(' . $info[ 'size' ] . ')';
+        } elseif (preg_match('/(decimal|double|real)/i', $info[ 'dbtype' ])) {
+            $column->dbType .= '(' . $info[ 'size' ] . ',' . $info[ 'scale' ] . ')';
         }
 
         if ($column->defaultValue) {
@@ -240,11 +240,11 @@ 
 
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
             $command->bindValue(':table1', $table->name);
 
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -258,9 +258,9 @@ 
 
         foreach ($columns as $info) {
             $column = $this->loadColumnSchema($info);
-            $table->columns[$column->name] = $column;
+            $table->columns[ $column->name ] = $column;
             if ($column->isPrimaryKey) {
-                $table->primaryKey[] = $column->name;
+                $table->primaryKey[ ] = $column->name;
                 if ($column->autoIncrement) {
                     $table->sequenceName = $column->name;
                 }
@@ -318,9 +318,9 @@ 
         }
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else {
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -329,22 +329,22 @@ 
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
 
-        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, ['name']);
+        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, [ 'name' ]);
 
         foreach ($constraints as $name => $constraint) {
             $fks = \yii\helpers\ArrayHelper::getColumn($constraint, 'fk');
             $pks = \yii\helpers\ArrayHelper::getColumn($constraint, 'pk');
 
-            $tablename = $constraint[0]['tablename'];
+            $tablename = $constraint[ 0 ][ 'tablename' ];
             
             $keymap = array_combine($fks, $pks);
 
-            $foreignKeys = [$tablename];
+            $foreignKeys = [ $tablename ];
             foreach ($keymap as $fk => $pk) {
-                $foreignKeys[$fk] = $pk;
+                $foreignKeys[ $fk ] = $pk;
             }
 
-            $table->foreignKeys[$name] = $foreignKeys;
+            $table->foreignKeys[ $name ] = $foreignKeys;
         }
     }
 
@@ -369,7 +369,7 @@ 
                   AND qsys2.syscst.table_schema = :schema
                   ORDER BY qsys2.syskeycst.column_position
 SQL;
-        }else {
+        } else {
             $sql = <<<SQL
             SELECT
                 i.indname AS indexname,
@@ -391,9 +391,9 @@ 
         $command = $this->db->createCommand($sql);
         $command->bindValue(':table', $table->name);
 
-        if($this->db->isISeries){
+        if ($this->db->isISeries) {
             $command->bindValue(':schema', $this->db->defaultSchema);
-        }else{
+        } else {
             if (isset($table->schemaName)) {
                 $command->bindValue(':schema', $table->schemaName);
             }
@@ -401,9 +401,9 @@ 
         $results = $command->queryAll();
         $results = $this->normalizePdoRowKeyCase($results, true);
 
-        $indexes = [];
+        $indexes = [ ];
         foreach ($results as $result) {
-            $indexes[$result['indexname']][] = $result['column'];
+            $indexes[ $result[ 'indexname' ] ][ ] = $result[ 'column' ];
         }
         return $indexes;
     }
@@ -415,7 +415,7 @@ 
     {
 
         if ($schema === '' && $this->db->isISeries) {
-                $schema= $this->db->defaultSchema;
+                $schema = $this->db->defaultSchema;
         }
 
         if ($this->db->isISeries) {
@@ -427,7 +427,7 @@ 
                   AND TABLE_SCHEMA = :schema
                 ORDER BY TABLE_NAME
 SQL;
-        }else {
+        } else {
 
             $sql = <<<SQL
             SELECT
@@ -531,8 +531,8 @@ 
             } catch (\Exception $ex) {
                 // Do not throw error on table which doesn't exist (-2211)
                 // Do not throw error on view (-2212)
-                $code = isset($ex->errorInfo[1]) ? $ex->errorInfo[1] : 0;
-                if (!in_array($code, [-2211, -2212])) {
+                $code = isset($ex->errorInfo[ 1 ]) ? $ex->errorInfo[ 1 ] : 0;
+                if (!in_array($code, [-2211, -2212 ])) {
                     throw new \Exception($ex->getMessage(), $ex->getCode(), $ex->getPrevious());
                 }
             }
@@ -607,7 +607,7 @@ 
         $columns = \yii\helpers\ArrayHelper::getColumn($constraints, 'column_name');
         
         return new \yii\db\Constraint([
-            'name' => $constraints[0]['name'],
+            'name' => $constraints[ 0 ][ 'name' ],
             'columnNames' => $columns,
         ]);
     }
@@ -644,12 +644,12 @@ 
         
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
-        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, ['name']);
-        $result = [];
+        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, [ 'name' ]);
+        $result = [ ];
         foreach ($constraints as $name => $constraint) {
             $columns = \yii\helpers\ArrayHelper::getColumn($constraint, 'column_name');
 
-            $result[] = new \yii\db\Constraint([
+            $result[ ] = new \yii\db\Constraint([
                 'name' => $name,
                 'columnNames' => $columns,
             ]);
@@ -685,12 +685,12 @@ 
         
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
-        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, ['name']);
-        $result = [];
+        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, [ 'name' ]);
+        $result = [ ];
         foreach ($constraints as $name => $constraint) {
             $columns = \yii\helpers\ArrayHelper::getColumn($constraint, 'column_name');
-            $check_expr = $constraint[0]['check_expr'];
-            $result[] = new \yii\db\CheckConstraint([
+            $check_expr = $constraint[ 0 ][ 'check_expr' ];
+            $result[ ] = new \yii\db\CheckConstraint([
                 'name' => strtolower(trim($name)),
                 'columnNames' => $columns,
                 'expression' => $check_expr,
@@ -727,11 +727,11 @@ 
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
 
-        $result = [];
+        $result = [ ];
         foreach ($constraints as $constraint) {
-            $columns = [$constraint['column_name']];
-            $default_value = $constraint['default_value'];
-            $result[] = new \yii\db\DefaultValueConstraint([
+            $columns = [ $constraint[ 'column_name' ] ];
+            $default_value = $constraint[ 'default_value' ];
+            $result[ ] = new \yii\db\DefaultValueConstraint([
                 'columnNames' => $columns,
                 'value' => $default_value,
             ]);
@@ -775,16 +775,16 @@ 
         
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
-        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, ['name']);
-        $result = [];
+        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, [ 'name' ]);
+        $result = [ ];
         foreach ($constraints as $name => $constraint) {
             $columns = \yii\helpers\ArrayHelper::getColumn($constraint, 'column_name');
             $foreignColumnNames = \yii\helpers\ArrayHelper::getColumn($constraint, 'ref_column');
 
-            $foreignSchemaName = $constraint[0]['ref_schema'];
-            $foreignTableName = $constraint[0]['ref_table'];
-            $onDelete = $constraint[0]['on_delete'];
-            $onUpdate = $constraint[0]['on_update'];
+            $foreignSchemaName = $constraint[ 0 ][ 'ref_schema' ];
+            $foreignTableName = $constraint[ 0 ][ 'ref_table' ];
+            $onDelete = $constraint[ 0 ][ 'on_delete' ];
+            $onUpdate = $constraint[ 0 ][ 'on_update' ];
             
             static $onRuleMap = [
                 'C' => 'CASCADE',
@@ -792,14 +792,14 @@ 
                 'R' => 'RESTRICT',
             ];
 
-            $result[] = new \yii\db\ForeignKeyConstraint([
+            $result[ ] = new \yii\db\ForeignKeyConstraint([
                 'name' => $name,
                 'columnNames' => $columns,
                 'foreignSchemaName' => $foreignSchemaName,
                 'foreignTableName' => $foreignTableName,
                 'foreignColumnNames' => $foreignColumnNames,
-                'onUpdate' => isset($onRuleMap[$onUpdate]) ? $onRuleMap[$onUpdate] : null,
-                'onDelete' => isset($onRuleMap[$onDelete]) ? $onRuleMap[$onDelete] : null,
+                'onUpdate' => isset($onRuleMap[ $onUpdate ]) ? $onRuleMap[ $onUpdate ] : null,
+                'onDelete' => isset($onRuleMap[ $onDelete ]) ? $onRuleMap[ $onDelete ] : null,
             ]);
         }
         return $result;
@@ -844,15 +844,15 @@ 
         
         $constraints = $command->queryAll();
         $constraints = $this->normalizePdoRowKeyCase($constraints, true);
-        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, ['name']);
-        $result = [];
+        $constraints = \yii\helpers\ArrayHelper::index($constraints, null, [ 'name' ]);
+        $result = [ ];
         foreach ($constraints as $name => $constraint) {
             $columns = \yii\helpers\ArrayHelper::getColumn($constraint, 'column_name');
 
-            $isUnique = $constraint[0]['index_is_unique'];
-            $isPrimary = $constraint[0]['index_is_primary'];
+            $isUnique = $constraint[ 0 ][ 'index_is_unique' ];
+            $isPrimary = $constraint[ 0 ][ 'index_is_primary' ];
             
-            $result[] = new \yii\db\IndexConstraint([
+            $result[ ] = new \yii\db\IndexConstraint([
                 'name' => $name,
                 'columnNames' => $columns,
                 'isUnique' => !!$isUnique,
@@ -869,7 +869,7 @@ 
         }
 
         if ($multiple) {
-            return array_map(function (array $row) {
+            return array_map(function(array $row) {
                 return array_change_key_case($row, CASE_LOWER);
             }, $row);
         }

src/QueryBuilder.php

Spacing +29 added lines, -29 removed lines

@@ -68,14 +68,14 @@ 
     {
         $table = $this->db->getTableSchema($tableName);
 
-        if ($table !== null && isset($table->columns[$table->sequenceName])) {
+        if ($table !== null && isset($table->columns[ $table->sequenceName ])) {
             if ($value === null) {
-                $sql = 'SELECT MAX("'. $table->sequenceName .'") FROM "'. $tableName . '"';
+                $sql = 'SELECT MAX("' . $table->sequenceName . '") FROM "' . $tableName . '"';
                 $value = $this->db->createCommand($sql)->queryScalar() + 1;
             } else {
                 $value = (int) $value;
             }
-            return 'ALTER TABLE "' . $tableName . '" ALTER COLUMN "'.$table->sequenceName.'" RESTART WITH ' . $value;
+            return 'ALTER TABLE "' . $tableName . '" ALTER COLUMN "' . $table->sequenceName . '" RESTART WITH ' . $value;
         } elseif ($table === null) {
             throw new InvalidParamException("Table not found: $tableName");
         } else {
@@ -95,7 +95,7 @@ 
     public function checkIntegrity($check = true, $schema = '', $table = '')
     {
         if ($table) {
-            $tableNames = [$table];
+            $tableNames = [ $table ];
         } else {
             if (!$schema) {
                 $schema = $this->db->defaultSchema;
@@ -128,13 +128,13 @@ 
             return '';
         }
 
-        $quotedTableNames = [];
+        $quotedTableNames = [ ];
         foreach ($tableNames as $tableName) {
-            $quotedTableNames[] = $this->db->quoteTableName($tableName) . ($check? '' : ' ALL');
+            $quotedTableNames[ ] = $this->db->quoteTableName($tableName) . ($check ? '' : ' ALL');
         }
 
         $enable = $check ? 'CHECKED' : 'UNCHECKED';
-        return 'SET INTEGRITY FOR ' . implode(', ', $quotedTableNames) . ' IMMEDIATE ' . $enable. ';';
+        return 'SET INTEGRITY FOR ' . implode(', ', $quotedTableNames) . ' IMMEDIATE ' . $enable . ';';
     }
 
     /**
@@ -147,22 +147,22 @@ 
             $sql = str_replace(':query', $sql, $limitOffsetStatment);
 
             //convert "item"."id" to "id" to use in OVER()
-            $newOrderBy = [];
+            $newOrderBy = [ ];
 
-            if(!empty($orderBy)){
+            if (!empty($orderBy)) {
                 foreach ($orderBy as $name => $direction) {
-                    if(is_string($name)){
+                    if (is_string($name)) {
                         $e = explode('.', $name);
                         $name = array_pop($e);
                     }
-                    $newOrderBy[$name] = $direction;
+                    $newOrderBy[ $name ] = $direction;
                 }
             }
 
             $orderByStatment = $this->buildOrderBy($newOrderBy);
 
-            $sql = str_replace(':order', $orderByStatment,$sql);
-        }else{
+            $sql = str_replace(':order', $orderByStatment, $sql);
+        } else {
             $orderByStatment = $this->buildOrderBy($orderBy);
             if ($orderByStatment !== '') {
                 $sql .= $this->separator . $orderByStatment;
@@ -196,7 +196,7 @@ 
         
         if ($this->hasLimit($limit)) {
             if ($limit instanceof \yii\db\ExpressionInterface || $offset instanceof \yii\db\ExpressionInterface) {
-                $replacement = 'AND t.RN_ <= (' . $limit  . ' + ' . $offset . ')';
+                $replacement = 'AND t.RN_ <= (' . $limit . ' + ' . $offset . ')';
             } else {
                 $replacement = 'AND t.RN_ <= ' . ($limit + $offset);
             }
@@ -219,19 +219,19 @@ 
     /**
      * @inheritdoc
      */
-    public function prepareInsertValues($table, $columns, $params = [])
+    public function prepareInsertValues($table, $columns, $params = [ ])
     {
         $result = parent::prepareInsertValues($table, $columns, $params);
 
         // Empty placeholders, replace for (DEFAULT, DEFAULT, ...)
-        if (empty($result[1]) && $result[2] === ' DEFAULT VALUES') {
+        if (empty($result[ 1 ]) && $result[ 2 ] === ' DEFAULT VALUES') {
             $schema = $this->db->getSchema();
             if (($tableSchema = $schema->getTableSchema($table)) !== null) {
                 $columnSchemas = $tableSchema->columns;
             } else {
-                $columnSchemas = [];
+                $columnSchemas = [ ];
             }
-            $result[1] = array_fill(0, count($columnSchemas), 'DEFAULT');
+            $result[ 1 ] = array_fill(0, count($columnSchemas), 'DEFAULT');
         }
 
         return $result;
@@ -248,22 +248,22 @@ 
             return $this->insert($table, $insertColumns, $params);
         }
 
-        $onCondition = ['or'];
+        $onCondition = [ 'or' ];
         $quotedTableName = $this->db->quoteTableName($table);
         foreach ($constraints as $constraint) {
-            $constraintCondition = ['and'];
+            $constraintCondition = [ 'and' ];
             foreach ($constraint->columnNames as $name) {
                 $quotedName = $this->db->quoteColumnName($name);
-                $constraintCondition[] = "$quotedTableName.$quotedName=\"EXCLUDED\".$quotedName";
+                $constraintCondition[ ] = "$quotedTableName.$quotedName=\"EXCLUDED\".$quotedName";
             }
-            $onCondition[] = $constraintCondition;
+            $onCondition[ ] = $constraintCondition;
         }
         $on = $this->buildCondition($onCondition, $params);
         list(, $placeholders, $values, $params) = $this->prepareInsertValues($table, $insertColumns, $params);
         if (!empty($placeholders)) {
-            $usingSelectValues = [];
+            $usingSelectValues = [ ];
             foreach ($insertNames as $index => $name) {
-                $usingSelectValues[$name] = new Expression($placeholders[$index]);
+                $usingSelectValues[ $name ] = new Expression($placeholders[ $index ]);
             }
             $usingSubQuery = (new Query())
                 ->select($usingSelectValues)
@@ -273,13 +273,13 @@ 
         $mergeSql = 'MERGE INTO ' . $this->db->quoteTableName($table) . ' '
             . 'USING (' . (isset($usingValues) ? $usingValues : ltrim($values, ' ')) . ') "EXCLUDED" '
             . "ON ($on)";
-        $insertValues = [];
+        $insertValues = [ ];
         foreach ($insertNames as $name) {
             $quotedName = $this->db->quoteColumnName($name);
             if (strrpos($quotedName, '.') === false) {
                 $quotedName = '"EXCLUDED".' . $quotedName;
             }
-            $insertValues[] = $quotedName;
+            $insertValues[ ] = $quotedName;
         }
         $insertSql = 'INSERT (' . implode(', ', $insertNames) . ')'
             . ' VALUES (' . implode(', ', $insertValues) . ')';
@@ -288,13 +288,13 @@ 
         }
 
         if ($updateColumns === true) {
-            $updateColumns = [];
+            $updateColumns = [ ];
             foreach ($updateNames as $name) {
                 $quotedName = $this->db->quoteColumnName($name);
                 if (strrpos($quotedName, '.') === false) {
                     $quotedName = '"EXCLUDED".' . $quotedName;
                 }
-                $updateColumns[$name] = new Expression($quotedName);
+                $updateColumns[ $name ] = new Expression($quotedName);
             }
         }
         list($updates, $params) = $this->prepareUpdateSets($table, $updateColumns, $params);
@@ -311,7 +311,7 @@ 
      */
     public function selectExists($rawSql)
     {
-        return 'SELECT CASE WHEN COUNT(*)>0 THEN 1 ELSE 0 END FROM (' . $rawSql . ') CHECKEXISTS';;
+        return 'SELECT CASE WHEN COUNT(*)>0 THEN 1 ELSE 0 END FROM (' . $rawSql . ') CHECKEXISTS'; ;
     }
 
     /**

src/conditions/InConditionBuilder.php

Spacing +8 added lines, -8 removed lines

@@ -18,22 +18,22 @@
      */
     protected function buildCompositeInCondition($operator, $columns, $values, &$params)
     {
-        $vss = [];
+        $vss = [ ];
         foreach ($values as $value) {
-            $vs = [];
+            $vs = [ ];
             foreach ($columns as $column) {
-                if (isset($value[$column])) {
-                    $vs[] = $this->queryBuilder->bindParam($value[$column], $params);
+                if (isset($value[ $column ])) {
+                    $vs[ ] = $this->queryBuilder->bindParam($value[ $column ], $params);
                 } else {
-                    $vs[] = 'NULL';
+                    $vs[ ] = 'NULL';
                 }
             }
-            $vss[] = 'select ' . implode(', ', $vs) . ' from SYSIBM.SYSDUMMY1';
+            $vss[ ] = 'select ' . implode(', ', $vs) . ' from SYSIBM.SYSDUMMY1';
         }
 
-        $sqlColumns = [];
+        $sqlColumns = [ ];
         foreach ($columns as $i => $column) {
-            $sqlColumns[] = strpos($column, '(') === false ? $this->queryBuilder->db->quoteColumnName($column) : $column;
+            $sqlColumns[ ] = strpos($column, '(') === false ? $this->queryBuilder->db->quoteColumnName($column) : $column;
         }
 
         return '(' . implode(', ', $sqlColumns) . ") $operator (" . implode(' UNION ', $vss) . ')';