vakata / database

src/driver/pdo/Result.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     }
     public function next()
     {
-        $this->fetched ++;
+        $this->fetched++;
         $this->last = $this->statement->fetch(\PDO::FETCH_ASSOC);
     }
     public function valid()

src/driver/pdo/Driver.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
                     isset($this->connection['opts']) ? $this->connection['opts'] : []
                 );
             } catch (\PDOException $e) {
-                throw new DBException('Connect error: ' . $e->getMessage());
+                throw new DBException('Connect error: '.$e->getMessage());
             }
         }
     }

src/schema/TableColumn.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
             $instance->setDefault($data['default']);
         }
         if ($instance->getBasicType() === 'enum' && strpos($instance->getType(), 'enum(') === 0) {
-            $temp = array_map(function ($v) {
+            $temp = array_map(function($v) {
                 return str_replace("''", "'", $v);
             }, explode("','", substr($instance->getType(), 6, -2)));
             $instance->setValues($temp);

src/schema/Table.php

Spacing +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
     public function setPrimaryKey($column) : Table
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         $this->data['primary'] = $column;
         return $this;
@@ -165,7 +165,7 @@ 
         }
 
         if (!isset($name)) {
-            $name = $toTable->getName() . '_' . implode('_', array_keys($keymap));
+            $name = $toTable->getName().'_'.implode('_', array_keys($keymap));
         }
         $this->addRelation(new TableRelation(
             $name,

src/driver/mysql/Statement.php

Spacing +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
             }
         }
         if (!$this->statement->execute()) {
-            throw new DBException('Prepared execute error: ' . $this->statement->error);
+            throw new DBException('Prepared execute error: '.$this->statement->error);
         }
         return new Result($this->statement);
     }

src/DB.php

Spacing +13 added lines, -15 removed lines

@@ -74,8 +74,7 @@ 
         }
         $connection['name'] = $connectionString;
         $connection['type'] = isset($aliases[$connection['type']]) ?
-            $aliases[$connection['type']] :
-            $connection['type'];
+            $aliases[$connection['type']] : $connection['type'];
         $tmp = '\\vakata\\database\\driver\\'.strtolower($connection['type']).'\\Driver';
         return new $tmp($connection);
     }
@@ -95,7 +94,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -105,7 +104,7 @@ 
             $index += count($tmp) - 1;
             if (isset($par[$index])) {
                 if (!is_array($par[$index])) {
-                    $par[$index] = [ $par[$index] ];
+                    $par[$index] = [$par[$index]];
                 }
                 $params = $par[$index];
                 array_splice($par, $index, 1, $params);
@@ -113,7 +112,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -145,7 +144,7 @@ 
     {
         $coll = Collection::from($this->query($sql, $par));
         if (($keys = $this->driver->option('mode')) && in_array($keys, ['strtoupper', 'strtolower'])) {
-            $coll->map(function ($v) use ($keys) {
+            $coll->map(function($v) use ($keys) {
                 $new = [];
                 foreach ($v as $k => $vv) {
                     $new[call_user_func($keys, $k)] = $vv;
@@ -154,13 +153,13 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key) { return $v[$key]; });
+            $coll->mapKey(function($v) use ($key) { return $v[$key]; });
         }
         if ($skip) {
-            $coll->map(function ($v) use ($key) { unset($v[$key]); return $v; });
+            $coll->map(function($v) use ($key) { unset($v[$key]); return $v; });
         }
         if ($opti) {
-            $coll->map(function ($v) { return count($v) === 1 ? current($v) : $v; });
+            $coll->map(function($v) { return count($v) === 1 ? current($v) : $v; });
         }
         return $coll;
     }
@@ -233,8 +232,7 @@ 
     public function definition(string $table, bool $detectRelations = true) : Table
     {
         return isset($this->tables[$table]) ?
-            $this->tables[$table] :
-            $this->driver->table($table, $detectRelations);
+            $this->tables[$table] : $this->driver->table($table, $detectRelations);
     }
     /**
      * Parse all tables from the database.
@@ -251,12 +249,12 @@ 
      */
     public function getSchema($asPlainArray = true)
     {
-        return !$asPlainArray ? $this->tables : array_map(function ($table) {
+        return !$asPlainArray ? $this->tables : array_map(function($table) {
             return [
                 'name' => $table->getName(),
                 'pkey' => $table->getPrimaryKey(),
                 'comment' => $table->getComment(),
-                'columns' => array_map(function ($column) {
+                'columns' => array_map(function($column) {
                     return [
                         'name' => $column->getName(),
                         'type' => $column->getType(),
@@ -266,13 +264,13 @@ 
                         'nullable' => $column->isNullable()
                     ];
                 }, $table->getFullColumns()),
-                'relations' => array_map(function ($rel) {
+                'relations' => array_map(function($rel) {
                     $relation = clone $rel;
                     $relation->table = $relation->table->getName();
                     if ($relation->pivot) {
                         $relation->pivot = $relation->pivot->getName();
                     }
-                    return (array)$relation;
+                    return (array) $relation;
                 }, $table->getRelations())
             ];
         }, $this->tables);

src/schema/TableQueryIterator.php

Spacing +7 added lines, -7 removed lines

@@ -65,27 +65,27 @@ 
                 $fields = [];
                 $exists = false;
                 foreach ($relation->table->getColumns() as $column) {
-                    $fields[$column] = $row[$name . static::SEP . $column];
-                    if (!$exists && $row[$name . static::SEP . $column] !== null) {
+                    $fields[$column] = $row[$name.static::SEP.$column];
+                    if (!$exists && $row[$name.static::SEP.$column] !== null) {
                         $exists = true;
                     }
-                    $remove[] = $name . static::SEP . $column;
+                    $remove[] = $name.static::SEP.$column;
                 }
                 $temp  = &$result;
                 $parts = explode(static::SEP, $name);
                 $name  = array_pop($parts);
                 $full  = '';
                 foreach ($parts as $item) {
-                    $full = $full ? $full . static::SEP . $item : $item;
+                    $full = $full ? $full.static::SEP.$item : $item;
                     $temp = &$temp[$item];
                     $rpk = [];
                     foreach ($this->relations[$full][0]->table->getPrimaryKey() as $pkey) {
-                        $rpk[$pkey] = $row[$full . static::SEP . $pkey];
+                        $rpk[$pkey] = $row[$full.static::SEP.$pkey];
                     }
                     $temp = &$temp[json_encode($rpk)];
                 }
                 if (!isset($temp[$name])) {
-                    $temp[$name] = $relation->many ? [ '___clean' => true ] : null;
+                    $temp[$name] = $relation->many ? ['___clean' => true] : null;
                 }
                 $temp = &$temp[$name];
                 if ($exists) {
@@ -144,7 +144,7 @@ 
                 return;
             }
         }
-        $this->fetched ++;
+        $this->fetched++;
         while ($this->result->valid()) {
             $row = $this->result->current();
             $pk = [];

src/driver/oracle/Driver.php

Spacing +23 added lines, -23 removed lines

@@ -124,16 +124,16 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM all_tab_cols WHERE table_name = ? AND owner = ?",
-                [ strtoupper($table), $this->name() ]
+                [strtoupper($table), $this->name()]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v) { return $v['COLUMN_NAME']; })
+            ->mapKey(function($v) { return $v['COLUMN_NAME']; })
             ->toArray();
         if (!count($columns)) {
             throw new DBException('Table not found by name');
@@ -143,9 +143,9 @@ 
             ->query(
                 "SELECT constraint_name FROM all_constraints
                 WHERE table_name = ? AND constraint_type = ? AND owner = ?",
-                [ strtoupper($table), 'P', $owner ]
+                [strtoupper($table), 'P', $owner]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -160,9 +160,9 @@ 
                 ->query(
                     "SELECT column_name FROM all_cons_columns
                     WHERE table_name = ? AND constraint_name = ? AND owner = ?",
-                    [ strtoupper($table), $pkname, $owner ]
+                    [strtoupper($table), $pkname, $owner]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -189,9 +189,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, $pkname, 'R' ]
+                    [$owner, $owner, $pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -201,7 +201,7 @@ 
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] = $relation['COLUMN_NAME'];
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] = $relation['COLUMN_NAME'];
             }
             foreach ($relations as $data) {
                 $rtable = $this->table($data['table'], true);
@@ -225,9 +225,9 @@ 
                                 ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                 cc.COLUMN_NAME IN (??)
                             ORDER BY POSITION",
-                            [ $owner, $owner, $data['table'], 'R', $columns ]
+                            [$owner, $owner, $data['table'], 'R', $columns]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -245,9 +245,9 @@ 
                     $rcolumns = Collection::from($this
                         ->query(
                             "SELECT COLUMN_NAME FROM all_cons_columns WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                            [ $owner, current($foreign['keymap']) ]
+                            [$owner, current($foreign['keymap'])]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -262,7 +262,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -278,7 +278,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -302,9 +302,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, strtoupper($table), 'R' ]
+                    [$owner, $owner, strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -320,9 +320,9 @@ 
                 $rcolumns = Collection::from($this
                     ->query(
                         "SELECT COLUMN_NAME FROM all_cons_columns WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ $owner, current($data['keymap']) ]
+                        [$owner, current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -337,7 +337,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -358,7 +358,7 @@ 
                 "SELECT TABLE_NAME FROM ALL_TABLES where OWNER = ?",
                 [$this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -366,7 +366,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/schema/TableQuery.php

Spacing +77 added lines, -80 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * @var int[]
      */
-    protected $li_of = [0,0];
+    protected $li_of = [0, 0];
     /**
      * @var array
      */
@@ -69,7 +69,7 @@ 
     public function __construct(DBInterface $db, $table)
     {
         $this->db = $db;
-        $this->definition = $table instanceof Table ? $table : $this->db->definition((string)$table);
+        $this->definition = $table instanceof Table ? $table : $this->db->definition((string) $table);
         $primary = $this->definition->getPrimaryKey();
         $columns = $this->definition->getColumns();
         $this->pkey = count($primary) ? $primary : $columns;
@@ -92,7 +92,7 @@ 
     {
         $column = explode('.', $column);
         if (count($column) === 1) {
-            $column = [ $this->definition->getName(), $column[0] ];
+            $column = [$this->definition->getName(), $column[0]];
             $col = $this->definition->getColumn($column[1]);
         } elseif (count($column) === 2) {
             if ($column[0] === $this->definition->getName()) {
@@ -112,7 +112,7 @@ 
                         throw new DBException('Invalid column name in related table');
                     }
                 } else {
-                    throw new DBException('Invalid foreign table name: ' . implode(',', $column));
+                    throw new DBException('Invalid foreign table name: '.implode(',', $column));
                 }
             }
         } else {
@@ -121,15 +121,15 @@ 
             $table = $this->definition;
             $table = array_reduce(
                 $column,
-                function ($carry, $item) use (&$table) {
+                function($carry, $item) use (&$table) {
                     $table = $table->getRelation($item)->table;
                     return $table;
                 }
             );
             $col = $table->getColumn($name);
-            $column = [ implode(static::SEP, $column), $name ];
+            $column = [implode(static::SEP, $column), $name];
         }
-        return [ 'name' => implode('.', $column), 'data' => $col ];
+        return ['name' => implode('.', $column), 'data' => $col];
     }
     protected function normalizeValue(TableColumn $col, $value)
     {
@@ -176,7 +176,7 @@ 
                 }
                 return $value;
             case 'int':
-                return (int)$value;
+                return (int) $value;
             default:
                 return $value;
         }
@@ -194,18 +194,16 @@ 
         list($name, $column) = array_values($this->getColumn($column));
         if (is_null($value)) {
             return $negate ?
-                $this->where($name . ' IS NOT NULL') :
-                $this->where($name . ' IS NULL');
+                $this->where($name.' IS NOT NULL') : $this->where($name.' IS NULL');
         }
         if (!is_array($value)) {
             return $negate ?
                 $this->where(
-                    $name . ' <> ?',
-                    [ $this->normalizeValue($column, $value) ]
-                ) :
-                $this->where(
-                    $name . ' = ?',
-                    [ $this->normalizeValue($column, $value) ]
+                    $name.' <> ?',
+                    [$this->normalizeValue($column, $value)]
+                ) : $this->where(
+                    $name.' = ?',
+                    [$this->normalizeValue($column, $value)]
                 );
         }
         if (isset($value['beg']) && isset($value['end'])) {
@@ -216,8 +214,7 @@ 
                         $this->normalizeValue($column, $value['beg']),
                         $this->normalizeValue($column, $value['end'])
                     ]
-                ) :
-                $this->where(
+                ) : $this->where(
                     $name.' BETWEEN ? AND ?',
                     [
                         $this->normalizeValue($column, $value['beg']),
@@ -227,12 +224,12 @@ 
         }
         return $negate ?
             $this->where(
-                $name . ' NOT IN (??)',
-                [ array_map(function ($v) use ($column) { return $this->normalizeValue($column, $v); }, $value) ]
+                $name.' NOT IN (??)',
+                [array_map(function($v) use ($column) { return $this->normalizeValue($column, $v); }, $value)]
             ) :
             $this->where(
-                $name . ' IN (??)',
-                [ array_map(function ($v) use ($column) { return $this->normalizeValue($column, $v); }, $value) ]
+                $name.' IN (??)',
+                [array_map(function($v) use ($column) { return $this->normalizeValue($column, $v); }, $value)]
             );
     }
     /**
@@ -243,7 +240,7 @@ 
      */
     public function sort(string $column, bool $desc = false) : TableQuery
     {
-        return $this->order($this->getColumn($column)['name'] . ' ' . ($desc ? 'DESC' : 'ASC'));
+        return $this->order($this->getColumn($column)['name'].' '.($desc ? 'DESC' : 'ASC'));
     }
     /**
      * Group by a column (or columns)
@@ -253,7 +250,7 @@ 
     public function group($column) : TableQuery
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         foreach ($column as $k => $v) {
             $column[$k] = $this->getColumn($v)['name'];
@@ -294,7 +291,7 @@ 
         $this->withr = [];
         $this->order = [];
         $this->having = [];
-        $this->li_of = [0,0];
+        $this->li_of = [0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -307,7 +304,7 @@ 
     public function groupBy(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -320,7 +317,7 @@ 
      */
     public function join($table, array $fields, string $name = null, bool $multiple = true)
     {
-        $table = $table instanceof Table ? $table : $this->db->definition((string)$table);
+        $table = $table instanceof Table ? $table : $this->db->definition((string) $table);
         $name = $name ?? $table->getName();
         if (isset($this->joins[$name]) || $this->definition->hasRelation($name)) {
             throw new DBException('Alias / table name already in use');
@@ -329,7 +326,7 @@ 
         foreach ($fields as $k => $v) {
             $k = explode('.', $k, 2);
             $k = count($k) == 2 ? $k[1] : $k[0];
-            $this->joins[$name]->keymap[$this->getColumn($name . '.' . $k)['name']] = $this->getColumn($v)['name'];
+            $this->joins[$name]->keymap[$this->getColumn($name.'.'.$k)['name']] = $this->getColumn($v)['name'];
         }
         return $this;
     }
@@ -342,7 +339,7 @@ 
     public function where(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -354,7 +351,7 @@ 
     public function having(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -366,7 +363,7 @@ 
     public function order(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->order = [ $sql, $params ];
+        $this->order = [$sql, $params];
         return $this;
     }
     /**
@@ -378,7 +375,7 @@ 
     public function limit(int $limit, int $offset = 0) : TableQuery
     {
         $this->qiterator = null;
-        $this->li_of = [ $limit, $offset ];
+        $this->li_of = [$limit, $offset];
         return $this;
     }
     /**
@@ -394,22 +391,22 @@ 
         $relations = $this->withr;
         foreach ($this->definition->getRelations() as $k => $v) {
             foreach ($this->where as $vv) {
-                if (strpos($vv[0], $k . '.') !== false) {
-                    $relations[$k] = [ $v, $table ];
+                if (strpos($vv[0], $k.'.') !== false) {
+                    $relations[$k] = [$v, $table];
                 }
             }
-            if (isset($this->order[0]) && strpos($this->order[0], $k . '.') !== false) {
-                $relations[$k] = [ $v, $table ];
+            if (isset($this->order[0]) && strpos($this->order[0], $k.'.') !== false) {
+                $relations[$k] = [$v, $table];
             }
         }
 
         foreach ($this->joins as $k => $v) {
-            $sql .= ($v->many ? 'LEFT ' : '' ) . 'JOIN '.$v->table->getName().' '.$k.' ON ';
+            $sql .= ($v->many ? 'LEFT ' : '').'JOIN '.$v->table->getName().' '.$k.' ON ';
             $tmp = [];
             foreach ($v->keymap as $kk => $vv) {
                 $tmp[] = $kk.' = '.$vv;
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         foreach ($relations as $k => $v) {
             $table = $v[1];
@@ -420,13 +417,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$k.'_pivot.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$k.' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $k.'.'.$vv.' = '.$k.'_pivot.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$k.' ON ';
                 $tmp = [];
@@ -434,30 +431,30 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$k.'.'.$vv.' ';
                 }
                 if ($v->sql) {
-                    $tmp[] = $v->sql . ' ';
+                    $tmp[] = $v->sql.' ';
                     $par = array_merge($par, $v->par ?? []);
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             }
         }
         if (count($this->where)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($this->where as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->group)) {
-            $sql .= 'GROUP BY ' . $this->group[0] . ' ';
+            $sql .= 'GROUP BY '.$this->group[0].' ';
             $par = array_merge($par, $this->group[1]);
         }
         if (count($this->having)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($this->having as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
@@ -491,7 +488,7 @@ 
                     $this->with(implode('.', $temp));
                     $table = array_reduce(
                         $temp,
-                        function ($carry, $item) use (&$table) {
+                        function($carry, $item) use (&$table) {
                             return $table->getRelation($item)->table;
                         }
                     );
@@ -500,7 +497,7 @@ 
                 }
                 unset($fields[$k]);
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
             }
         }
@@ -538,37 +535,37 @@ 
         $relations = $this->withr;
         foreach ($this->definition->getRelations() as $k => $relation) {
             foreach ($this->fields as $field) {
-                if (strpos($field, $k . '.') === 0) {
-                    $relations[$k] = [ $relation, $table ];
+                if (strpos($field, $k.'.') === 0) {
+                    $relations[$k] = [$relation, $table];
                 }
             }
             foreach ($this->where as $v) {
-                if (strpos($v[0], $k . '.') !== false) {
-                    $relations[$k] = [ $relation, $table ];
+                if (strpos($v[0], $k.'.') !== false) {
+                    $relations[$k] = [$relation, $table];
                 }
             }
-            if (isset($this->order[0]) && strpos($this->order[0], $k . '.') !== false) {
-                $relations[$k] = [ $relation, $table ];
+            if (isset($this->order[0]) && strpos($this->order[0], $k.'.') !== false) {
+                $relations[$k] = [$relation, $table];
             }
         }
         $select = [];
         foreach ($this->fields as $k => $field) {
-            $select[] = $field . (!is_numeric($k) ? ' ' . $k : '');
+            $select[] = $field.(!is_numeric($k) ? ' '.$k : '');
         }
         foreach ($this->withr as $name => $relation) {
             foreach ($relation[0]->table->getColumns() as $column) {
-                $select[] = $name . '.' . $column . ' ' . $name . static::SEP . $column;
+                $select[] = $name.'.'.$column.' '.$name.static::SEP.$column;
             }
         }
         $sql = 'SELECT '.implode(', ', $select).' FROM '.$table.' ';
         $par = [];
         foreach ($this->joins as $k => $v) {
-            $sql .= ($v->many ? 'LEFT ' : '' ) . 'JOIN '.$v->table->getName().' '.$k.' ON ';
+            $sql .= ($v->many ? 'LEFT ' : '').'JOIN '.$v->table->getName().' '.$k.' ON ';
             $tmp = [];
             foreach ($v->keymap as $kk => $vv) {
                 $tmp[] = $kk.' = '.$vv;
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         foreach ($relations as $relation => $v) {
             $table = $v[1];
@@ -579,13 +576,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$relation.'_pivot.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$relation.' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $relation.'.'.$vv.' = '.$relation.'_pivot.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$relation.' ON ';
                 $tmp = [];
@@ -593,36 +590,36 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$relation.'.'.$vv.' ';
                 }
                 if ($v->sql) {
-                    $tmp[] = $v->sql . ' ';
+                    $tmp[] = $v->sql.' ';
                     $par = array_merge($par, $v->par ?? []);
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             }
         }
         if (count($this->where)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($this->where as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->group)) {
-            $sql .= 'GROUP BY ' . $this->group[0] . ' ';
+            $sql .= 'GROUP BY '.$this->group[0].' ';
             $par = array_merge($par, $this->group[1]);
         }
         if (count($this->having)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($this->having as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->order)) {
-            $sql .= 'ORDER BY ' . $this->order[0] . ' ';
+            $sql .= 'ORDER BY '.$this->order[0].' ';
             $par = array_merge($par, $this->order[1]);
         }
         $porder = [];
@@ -630,30 +627,30 @@ 
             $porder[] = $this->getColumn($field)['name'];
         }
         if (count($porder)) {
-            $sql .= (count($this->order) ? ', ' : 'ORDER BY ') . implode(', ', $porder) . ' ';
+            $sql .= (count($this->order) ? ', ' : 'ORDER BY ').implode(', ', $porder).' ';
         }
 
         if ($this->li_of[0]) {
             if ($this->db->driverName() === 'oracle') {
-                if ((int)$this->db->driverOption('version', 0) >= 12) {
-                    $sql .= 'OFFSET ' . $this->li_of[1] . ' ROWS FETCH NEXT ' . $this->li_of[0] . ' ROWS ONLY';
+                if ((int) $this->db->driverOption('version', 0) >= 12) {
+                    $sql .= 'OFFSET '.$this->li_of[1].' ROWS FETCH NEXT '.$this->li_of[0].' ROWS ONLY';
                 } else {
-                    $f = array_map(function ($v) {
+                    $f = array_map(function($v) {
                         $v = explode(' ', trim($v), 2);
                         if (count($v) === 2) { return $v[1]; }
                         $v = explode('.', $v[0], 2);
                         return count($v) === 2 ? $v[1] : $v[0];
                     }, $select);
-                    $sql = "SELECT " . implode(', ', $f) . " 
+                    $sql = "SELECT ".implode(', ', $f)." 
                             FROM (
                                 SELECT tbl__.*, rownum rnum__ FROM (
-                                    " . $sql . "
+                                    " . $sql."
                                 ) tbl__ 
-                                WHERE rownum <= " . ($this->li_of[0] + $this->li_of[1]) . "
+                                WHERE rownum <= " . ($this->li_of[0] + $this->li_of[1])."
                             ) WHERE rnum__ > " . $this->li_of[1];
                 }
             } else {
-                $sql .= 'LIMIT ' . $this->li_of[0] . ' OFFSET ' . $this->li_of[1];
+                $sql .= 'LIMIT '.$this->li_of[0].' OFFSET '.$this->li_of[1];
             }
         }
         return $this->qiterator = new TableQueryIterator(
@@ -702,7 +699,7 @@ 
                 $ret[$k] = str_repeat(' ', 255);
                 $par[] = &$ret[$k];
             }
-            $sql .= ' RETURNING ' . implode(',', $primary) . ' INTO ' . implode(',', array_fill(0, count($primary), '?'));
+            $sql .= ' RETURNING '.implode(',', $primary).' INTO '.implode(',', array_fill(0, count($primary), '?'));
             $this->db->query($sql, $par);
             return $ret;
         } else {
@@ -734,7 +731,7 @@ 
         }
         $sql = 'UPDATE '.$table.' SET ';
         $par = [];
-        $sql .= implode(', ', array_map(function ($v) { return $v . ' = ?'; }, array_keys($update))) . ' ';
+        $sql .= implode(', ', array_map(function($v) { return $v.' = ?'; }, array_keys($update))).' ';
         $par = array_merge($par, array_values($update));
         if (count($this->where)) {
             $sql .= 'WHERE ';
@@ -743,7 +740,7 @@ 
                 $tmp[] = $v[0];
                 $par = array_merge($par, $v[1]);
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->order)) {
             $sql .= $this->order[0];
@@ -767,7 +764,7 @@ 
                 $tmp[] = $v[0];
                 $par = array_merge($par, $v[1]);
             }
-            $sql .= implode(' AND ', $tmp) . ' ';
+            $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($this->order)) {
             $sql .= $this->order[0];
@@ -787,13 +784,13 @@ 
         $table = $this->definition;
         array_reduce(
             $parts,
-            function ($carry, $item) use (&$table) {
+            function($carry, $item) use (&$table) {
                 $relation = $table->getRelation($item);
                 if (!$relation) {
                     throw new DBException('Invalid relation name');
                 }
-                $name = $carry ? $carry . static::SEP . $item : $item;
-                $this->withr[$name] = [ $relation, $carry ?? $table->getName() ];
+                $name = $carry ? $carry.static::SEP.$item : $item;
+                $this->withr[$name] = [$relation, $carry ?? $table->getName()];
                 $table = $relation->table;
                 return $name;
             }