tsukasa-mixer / QueryBuilder

src/BaseAdapter.php

Braces +42 added lines, -21 removed lines

@@ -56,7 +56,8 @@ 
         if (($pos = strrpos($name, '.')) !== false) {
             $prefix = $this->quoteTableName(substr($name, 0, $pos)) . '.';
             $name = substr($name, $pos + 1);
-        } else {
+        }
+        else {
             $prefix = '';
         }
         return $prefix . $this->quoteSimpleColumnName($name);
@@ -134,13 +135,17 @@ 
     {
         if ($value instanceof IToSql) {
             return $value->toSql();
-        } else if ($value === true || strtolower($value) === 'true') {
+        }
+        else if ($value === true || strtolower($value) === 'true') {
             return 'TRUE';
-        } else if ($value === false || strtolower($value) === 'false') {
+        }
+        else if ($value === false || strtolower($value) === 'false') {
             return 'FALSE';
-        } else if ($value === null || strtolower($value) === 'null') {
+        }
+        else if ($value === null || strtolower($value) === 'null') {
             return 'NULL';
-        } else if (is_string($value) && $driver = $this->getDriver()) {
+        }
+        else if (is_string($value) && $driver = $this->getDriver()) {
             return $driver->quote($value);
         }
 
@@ -213,7 +218,8 @@ 
     {
         if ($rawValue === true || $rawValue === false || $rawValue === 'true' || $rawValue === 'false') {
             return $this->getBoolean($rawValue);
-        } else if ($rawValue === 'null' || $rawValue === null) {
+        }
+        else if ($rawValue === 'null' || $rawValue === null) {
             return 'NULL';
         }
         return $rawValue;
@@ -267,7 +273,8 @@ 
         foreach ($columns as $i => $column) {
             if ($column instanceof Expression) {
                 $columns[$i] = $column->toSQL();
-            } else if (strpos($column, '(') === false) {
+            }
+            else if (strpos($column, '(') === false) {
                 $columns[$i] = $this->quoteColumn($column);
             }
         }
@@ -417,12 +424,14 @@ 
             foreach ($columns as $name => $type) {
                 if (is_string($name)) {
                     $cols[] = "\t" . $this->quoteColumn($name) . ' ' . $type;
-                } else {
+                }
+                else {
                     $cols[] = "\t" . $type;
                 }
             }
             $sql = ($ifNotExists ? "CREATE TABLE IF NOT EXISTS " : "CREATE TABLE ") . $this->quoteTableName($tableName) . " (\n" . implode(",\n", $cols) . "\n)";
-        } else {
+        }
+        else {
             $sql = ($ifNotExists ? "CREATE TABLE IF NOT EXISTS " : "CREATE TABLE ") . $this->quoteTableName($tableName) . " " . $this->quoteSql($columns);
         }
         return empty($options) ? $sql : $sql . ' ' . $options;
@@ -472,11 +481,14 @@ 
     {
         if ($value === 'true' || $value === true) {
             return 'TRUE';
-        } else if ($value === null || $value === 'null') {
+        }
+        else if ($value === null || $value === 'null') {
             return 'NULL';
-        } else if ($value === false || $value === 'false') {
+        }
+        else if ($value === false || $value === 'false') {
             return 'FALSE';
-        } else {
+        }
+        else {
             return $value;
         }
     }
@@ -604,12 +616,14 @@ 
         foreach ($tables as $tableAlias => $table) {
             if ($table instanceof QueryBuilder) {
                 $tableRaw = $table->toSQL();
-            } else {
+            }
+            else {
                 $tableRaw = $this->getRawTableName($table);
             }
             if (strpos($tableRaw, 'SELECT') !== false) {
                 $quotedTableNames[] = '(' . $tableRaw . ')' . (is_numeric($tableAlias) ? '' : ' AS ' . $this->quoteTableName($tableAlias));
-            } else {
+            }
+            else {
                 $quotedTableNames[] = $this->quoteTableName($tableRaw) . (is_numeric($tableAlias) ? '' : ' AS ' . $this->quoteTableName($tableAlias));
             }
         }
@@ -630,12 +644,15 @@ 
         if (is_string($tableName) && $tableName = $this->getRawTableName($tableName)) {
             if (strpos($tableName, 'SELECT') !== false) {
                 $toSql[] = '(' . $this->quoteSql($tableName) . ')' ;
-            } else {
+            }
+            else {
                 $toSql[]  = $this->quoteTableName($tableName);
             }
-        } else if ($tableName instanceof QueryBuilder) {
+        }
+        else if ($tableName instanceof QueryBuilder) {
             $toSql[] =  '(' . $this->quoteSql($tableName->toSQL()) . ')' ;
-        } else {
+        }
+        else {
             throw new QBException('Incorrect table name');
         }
 
@@ -647,11 +664,13 @@ 
             $onSQL = [];
             if (is_string($on)) {
                 $onSQL[] = $this->quoteSql($on);
-            } else {
+            }
+            else {
                 foreach ($on as $leftColumn => $rightColumn) {
                     if ($rightColumn instanceof Expression) {
                         $onSQL[] = $this->quoteColumn($leftColumn) . '=' . $this->quoteSql($rightColumn->toSQL());
-                    } else {
+                    }
+                    else {
                         $onSQL[] = $this->quoteColumn($leftColumn) . '=' . $this->quoteColumn($rightColumn);
                     }
                 }
@@ -689,7 +708,8 @@ 
         if ($having instanceof IToSql) {
             $sql = $having
                 ->toSql();
-        } else {
+        }
+        else {
             $sql = $this->quoteSql($having);
         }
 
@@ -709,7 +729,8 @@ 
 
         if ($union instanceof QueryBuilderInterface) {
             $unionSQL = $union->setOrder(null)->toSQL();
-        } else {
+        }
+        else {
             $unionSQL = $this->quoteSql($union);
         }
 

src/QueryBuilder.php

Braces +60 added lines, -30 removed lines

@@ -182,7 +182,8 @@ 
         $types = [static::TYPE_INSERT, static::TYPE_UPDATE, static::TYPE_DELETE, static::TYPE_SELECT];
         if (in_array($type, $types, true)) {
             $this->_type = $type;
-        } else {
+        }
+        else {
             throw new QBException('Incorrect type');
         }
 
@@ -255,12 +256,15 @@ 
         if ($newSelect === false) {
             if ($tableAlias === null || $rawColumn === '*') {
                 $columns = $rawColumn;
-            } elseif (strpos($rawColumn, '.') !== false) {
+            }
+            elseif (strpos($rawColumn, '.') !== false) {
                 $columns = $rawColumn;
-            } else {
+            }
+            else {
                 $columns = $tableAlias . '.' . $rawColumn;
             }
-        } else {
+        }
+        else {
             list($alias, $joinColumn) = $newSelect;
             $columns = $alias . '.' . $joinColumn;
         }
@@ -286,17 +290,21 @@ 
             foreach ($this->_select as $alias => $column) {
                 if ($column instanceof Aggregation) {
                     $select[$alias] = $this->buildSelectFromAggregation($column);
-                } else if (is_string($column)) {
+                }
+                else if (is_string($column)) {
                     if (strpos($column, 'SELECT') !== false) {
                         $select[$alias] = $column;
-                    } else {
+                    }
+                    else {
                         $select[$alias] = $this->addColumnAlias($builder->fetchColumnName($column));
                     }
-                } else {
+                }
+                else {
                     $select[$alias] = $column;
                 }
             }
-        } else if (is_string($this->_select)) {
+        }
+        else if (is_string($this->_select)) {
             $select = $this->addColumnAlias($this->_select);
         }
         return $this->getAdapter()->sqlSelect($select, $this->_queryOptions);
@@ -316,7 +324,8 @@ 
 
         if ($alias) {
             $this->_select[$alias] = $select;
-        } else {
+        }
+        else {
             $this->_select[] = $select;
         }
 
@@ -333,7 +342,8 @@ 
         if (is_string($select) && $newSelect = $this->getLookupBuilder()->buildJoin($this, $select)) {
             list($t_alias, $column) = $newSelect;
             $this->pushToSelect($t_alias . '.' . $column, $alias);
-        } else {
+        }
+        else {
             $this->pushToSelect(
                 $this->hydrate($select),
                 $alias
@@ -359,7 +369,8 @@ 
             foreach ($select as $key => $part) {
                 $this->addSelect($part, $key);
             }
-        } else {
+        }
+        else {
             $this->addSelect($select);
         }
 
@@ -473,10 +484,12 @@ 
     {
         if ($tableName instanceof QueryBuilderInterface) {
             $this->_join[] = $this->getAdapter()->sqlJoin($joinType, $tableName, $on, $alias, $index);
-        } else {
+        }
+        else {
             if ($joinType === 'RAW' && !empty($tableName)) {
                 $join = $this->getAdapter()->quoteSql($tableName);
-            } else {
+            }
+            else {
                 $join = $this->getAdapter()->sqlJoin($joinType, $tableName, $on, $alias);
             }
 
@@ -548,7 +561,8 @@ 
             foreach ($columns as $column) {
                 $this->addOrder($column);
             }
-        } else {
+        }
+        else {
             $this->addOrder($columns);
         }
 
@@ -582,11 +596,13 @@ 
                     }
 
                     $this->_order[] = $_column;
-                } else {
+                }
+                else {
                     $this->_order[] = current($temp);
                 }
             }
-        } else {
+        }
+        else {
             $this->_order[] = $column;
         }
 
@@ -675,14 +691,18 @@ 
                 if (is_numeric($key)) {
                     if ($value instanceof IToSql) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } elseif ($value instanceof QueryBuilder) {
+                    }
+                    elseif ($value instanceof QueryBuilder) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } else if (is_array($value)) {
+                    }
+                    else if (is_array($value)) {
                         $parts[] = $this->parseCondition($value, $operator);
-                    } else if (is_string($value)) {
+                    }
+                    else if (is_string($value)) {
                         $parts[] = $value;
                     }
-                } else {
+                }
+                else {
                     $tableAlias = $this->getAlias();
                     $value = $this->getAdapter()->prepareValue($value);
 
@@ -703,13 +723,16 @@ 
                 return '(' . implode(') ' . $operator . ' (', $parts) . ')';
             }
 
-        } else if ($condition instanceof IToSql) {
+        }
+        else if ($condition instanceof IToSql) {
             return $condition
                 ->setQb($this)
                 ->toSql();
-        } else if ($condition instanceof QueryBuilder) {
+        }
+        else if ($condition instanceof QueryBuilder) {
             return $condition->toSQL();
-        } else if (is_string($condition)) {
+        }
+        else if (is_string($condition)) {
             return $condition;
         }
 
@@ -722,7 +745,8 @@ 
         foreach ($operands as $operand) {
             if (is_array($operand)) {
                 $operand = $this->buildCondition($operand, $params);
-            } else {
+            }
+            else {
                 $operand = $this->parseCondition($operand);
             }
             if ($operand !== '') {
@@ -783,7 +807,8 @@ 
         foreach ($this->_whereAnd as $condition) {
             if (empty($where)) {
                 $where = ['and', $condition];
-            } else {
+            }
+            else {
                 $where = ['and', $where, ['and', $condition]];
             }
         }
@@ -791,7 +816,8 @@ 
         foreach ($this->_whereOr as $condition) {
             if (empty($where)) {
                 $where = ['or', $condition];
-            } else {
+            }
+            else {
                 $where = ['or', $where, ['and', $condition]];
             }
         }
@@ -1116,7 +1142,8 @@ 
     {
         if (strpos($order, '-') === false) {
             $direction = 'ASC';
-        } else {
+        }
+        else {
             $direction = 'DESC';
             $order = substr($order, 1);
         }
@@ -1153,12 +1180,14 @@ 
                 }
                 else if ($column === '?') {
                     $order[] = $this->getAdapter()->getRandomOrder();
-                } else {
+                }
+                else {
                     list($newColumn, $direction) = $this->buildOrderJoin($column);
                     $order[$this->applyTableAlias($newColumn)] = $direction;
                 }
             }
-        } else {
+        }
+        else {
             $order[] = $this->buildOrderJoin($this->_order);
         }
 
@@ -1205,7 +1234,8 @@ 
     {
         if ($this->_alias !== null && !is_array($this->_from)) {
             $from = [$this->_alias => $this->_from];
-        } else {
+        }
+        else {
             $from = $this->_from;
         }
         $sql = $this->getAdapter()->sqlFrom($from);

Spacing +2 added lines, -2 removed lines

@@ -843,7 +843,7 @@ 
 
     protected function generateDeleteSql()
     {
-        $options = $this->_queryOptions ;
+        $options = $this->_queryOptions;
         if ($options) {
             $options = " {$options} ";
         }
@@ -979,7 +979,7 @@ 
         $tableName = $this->getAdapter()->getRawTableName($table);
 
         if (strpos($tableName, '.') !== false) {
-            $tableName = substr($tableName, strpos($tableName, '.')+1);
+            $tableName = substr($tableName, strpos($tableName, '.') + 1);
         }
 
         return strtr('{table}_{count}', [