vakata / database

src/schema/TableQuery.php

Spacing +113 added lines, -116 removed lines

@@ -43,7 +43,7 @@ 
     /**
      * @var int[]
      */
-    protected $li_of = [0,0];
+    protected $li_of = [0, 0];
     /**
      * @var array
      */
@@ -73,7 +73,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;
@@ -96,7 +96,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]);
             if (!$col) {
                 throw new DBException('Invalid column name in own table');
@@ -119,7 +119,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 {
@@ -128,15 +128,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)
     {
@@ -183,7 +183,7 @@ 
                 }
                 return $value;
             case 'int':
-                return (int)$value;
+                return (int) $value;
             default:
                 return $value;
         }
@@ -201,18 +201,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'])) {
@@ -223,8 +221,7 @@ 
                         $this->normalizeValue($column, $value['beg']),
                         $this->normalizeValue($column, $value['end'])
                     ]
-                ) :
-                $this->where(
+                ) : $this->where(
                     $name.' BETWEEN ? AND ?',
                     [
                         $this->normalizeValue($column, $value['beg']),
@@ -235,38 +232,38 @@ 
         if (isset($value['gt']) || isset($value['lt']) || isset($value['gte']) || isset($value['lte'])) {
             if (isset($value['gt'])) {
                 $this->where(
-                    $name. ' ' . ($negate ? '<=' : '>') . ' ?',
-                    [ $this->normalizeValue($column, $value['gt']) ]
+                    $name.' '.($negate ? '<=' : '>').' ?',
+                    [$this->normalizeValue($column, $value['gt'])]
                 );
             }
             if (isset($value['gte'])) {
                 $this->where(
-                    $name. ' ' . ($negate ? '<' : '>=') . ' ?',
-                    [ $this->normalizeValue($column, $value['gte']) ]
+                    $name.' '.($negate ? '<' : '>=').' ?',
+                    [$this->normalizeValue($column, $value['gte'])]
                 );
             }
             if (isset($value['lt'])) {
                 $this->where(
-                    $name. ' ' . ($negate ? '>=' : '<') . ' ?',
-                    [ $this->normalizeValue($column, $value['lt']) ]
+                    $name.' '.($negate ? '>=' : '<').' ?',
+                    [$this->normalizeValue($column, $value['lt'])]
                 );
             }
             if (isset($value['lte'])) {
                 $this->where(
-                    $name. ' ' . ($negate ? '>' : '<=') . ' ?',
-                    [ $this->normalizeValue($column, $value['lte']) ]
+                    $name.' '.($negate ? '>' : '<=').' ?',
+                    [$this->normalizeValue($column, $value['lte'])]
                 );
             }
             return $this;
         }
         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)]
             );
     }
     /**
@@ -277,7 +274,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)
@@ -287,7 +284,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'];
@@ -329,7 +326,7 @@ 
         $this->order = [];
         $this->having = [];
         $this->aliases = [];
-        $this->li_of = [0,0];
+        $this->li_of = [0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -342,7 +339,7 @@ 
     public function groupBy(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -355,7 +352,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');
@@ -364,7 +361,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;
     }
@@ -377,7 +374,7 @@ 
     public function where(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -389,7 +386,7 @@ 
     public function having(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -401,7 +398,7 @@ 
     public function order(string $sql, array $params = []) : TableQuery
     {
         $this->qiterator = null;
-        $this->order = [ $sql, $params ];
+        $this->order = [$sql, $params];
         return $this;
     }
     /**
@@ -413,7 +410,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;
     }
     /**
@@ -423,9 +420,9 @@ 
     public function count() : int
     {
         $aliases = [];
-        $getAlias = function ($name) use (&$aliases) {
+        $getAlias = function($name) use (&$aliases) {
             // to bypass use: return $name;
-            return $aliases[$name] = $aliases[$name] ?? 'alias' . static::SEP . count($aliases);
+            return $aliases[$name] = $aliases[$name] ?? 'alias'.static::SEP.count($aliases);
         };
         $table = $this->definition->getName();
         $sql = 'SELECT COUNT(DISTINCT '.$table.'.'.implode(', '.$table.'.', $this->pkey).') FROM '.$table.' ';
@@ -440,44 +437,44 @@ 
         $h = $this->having;
         $o = $this->order;
         $g = $this->group;
-        $j = array_map(function ($v) { return clone $v; }, $this->joins);
+        $j = array_map(function($v) { return clone $v; }, $this->joins);
         foreach ($this->definition->getRelations() as $k => $v) {
             foreach ($w as $kk => $vv) {
-                if (strpos($vv[0], $k . '.') !== false) {
-                    $relations[$k] = [ $v, $table ];
-                    $w[$kk][0] = str_replace($k . '.', $getAlias($k) . '.', $vv[0]);
+                if (strpos($vv[0], $k.'.') !== false) {
+                    $relations[$k] = [$v, $table];
+                    $w[$kk][0] = str_replace($k.'.', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($o[0]) && strpos($o[0], $k . '.') !== false) {
-                $relations[$k] = [ $v, $table ];
+            if (isset($o[0]) && strpos($o[0], $k.'.') !== false) {
+                $relations[$k] = [$v, $table];
             }
             foreach ($h as $kk => $vv) {
-                if (strpos($vv[0], $k . '.') !== false) {
-                    $relations[$k] = [ $relation, $table ];
-                    $h[$kk][0] = str_replace($k . '.', $getAlias($k) . '.', $vv[0]);
+                if (strpos($vv[0], $k.'.') !== false) {
+                    $relations[$k] = [$relation, $table];
+                    $h[$kk][0] = str_replace($k.'.', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($g[0]) && strpos($g[0], $k . '.') !== false) {
-                $relations[$k] = [ $relation, $table ];
-                $g[0] = str_replace($k . '.', $getAlias($k) . '.', $g[0]);
+            if (isset($g[0]) && strpos($g[0], $k.'.') !== false) {
+                $relations[$k] = [$relation, $table];
+                $g[0] = str_replace($k.'.', $getAlias($k).'.', $g[0]);
             }
             foreach ($j as $kk => $v) {
                 foreach ($v->keymap as $kkk => $vv) {
-                    if (strpos($vv, $k . '.') !== false) {
-                        $relations[$k] = [ $relation, $table ];
-                        $j[$k]->keymap[$kkk] = str_replace($k . '.', $getAlias($k) . '.', $vv);
+                    if (strpos($vv, $k.'.') !== false) {
+                        $relations[$k] = [$relation, $table];
+                        $j[$k]->keymap[$kkk] = str_replace($k.'.', $getAlias($k).'.', $vv);
                     }
                 }
             }
         }
 
         foreach ($j 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] !== $this->definition->getName() ? $getAlias($v[1]) : $v[1];
@@ -489,13 +486,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$alias.'.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$getAlias($k).' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $getAlias($k).'.'.$vv.' = '.$alias.'.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $alias = $getAlias($k);
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$alias.' ON ';
@@ -504,30 +501,30 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$alias.'.'.$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($w)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($w as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($g)) {
-            $sql .= 'GROUP BY ' . $g[0] . ' ';
+            $sql .= 'GROUP BY '.$g[0].' ';
             $par = array_merge($par, $g[1]);
         }
         if (count($h)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($h as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
@@ -561,7 +558,7 @@ 
                     $this->with(implode('.', $temp));
                     $table = array_reduce(
                         $temp,
-                        function ($carry, $item) use (&$table) {
+                        function($carry, $item) use (&$table) {
                             return $table->getRelation($item)->table;
                         }
                     );
@@ -570,7 +567,7 @@ 
                 }
                 unset($fields[$k]);
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
             }
         }
@@ -602,9 +599,9 @@ 
             return $this->qiterator;
         }
         $aliases = [];
-        $getAlias = function ($name) use (&$aliases) {
+        $getAlias = function($name) use (&$aliases) {
             // to bypass use: return $name;
-            return $aliases[$name] = $aliases[$name] ?? 'alias' . static::SEP . count($aliases);
+            return $aliases[$name] = $aliases[$name] ?? 'alias'.static::SEP.count($aliases);
         };
         $table = $this->definition->getName();
         if ($fields !== null) {
@@ -620,61 +617,61 @@ 
         $h = $this->having;
         $o = $this->order;
         $g = $this->group;
-        $j = array_map(function ($v) { return clone $v; }, $this->joins);
+        $j = array_map(function($v) { return clone $v; }, $this->joins);
         foreach ($this->definition->getRelations() as $k => $relation) {
             foreach ($f as $kk => $field) {
-                if (strpos($field, $k . '.') === 0) {
-                    $relations[$k] = [ $relation, $table ];
-                    $f[$kk] = str_replace($k . '.', $getAlias($k) . '.', $field);
+                if (strpos($field, $k.'.') === 0) {
+                    $relations[$k] = [$relation, $table];
+                    $f[$kk] = str_replace($k.'.', $getAlias($k).'.', $field);
                 }
             }
             foreach ($w as $kk => $v) {
-                if (strpos($v[0], $k . '.') !== false) {
-                    $relations[$k] = [ $relation, $table ];
-                    $w[$kk][0] = str_replace($k . '.', $getAlias($k) . '.', $v[0]);
+                if (strpos($v[0], $k.'.') !== false) {
+                    $relations[$k] = [$relation, $table];
+                    $w[$kk][0] = str_replace($k.'.', $getAlias($k).'.', $v[0]);
                 }
             }
             foreach ($h as $kk => $v) {
-                if (strpos($v[0], $k . '.') !== false) {
-                    $relations[$k] = [ $relation, $table ];
-                    $h[$kk][0] = str_replace($k . '.', $getAlias($k) . '.', $v[0]);
+                if (strpos($v[0], $k.'.') !== false) {
+                    $relations[$k] = [$relation, $table];
+                    $h[$kk][0] = str_replace($k.'.', $getAlias($k).'.', $v[0]);
                 }
             }
-            if (isset($o[0]) && strpos($o[0], $k . '.') !== false) {
-                $relations[$k] = [ $relation, $table ];
-                $o[0] = str_replace($k . '.', $getAlias($k) . '.', $o[0]);
+            if (isset($o[0]) && strpos($o[0], $k.'.') !== false) {
+                $relations[$k] = [$relation, $table];
+                $o[0] = str_replace($k.'.', $getAlias($k).'.', $o[0]);
             }
-            if (isset($g[0]) && strpos($g[0], $k . '.') !== false) {
-                $relations[$k] = [ $relation, $table ];
-                $g[0] = str_replace($k . '.', $getAlias($k) . '.', $g[0]);
+            if (isset($g[0]) && strpos($g[0], $k.'.') !== false) {
+                $relations[$k] = [$relation, $table];
+                $g[0] = str_replace($k.'.', $getAlias($k).'.', $g[0]);
             }
             foreach ($j as $kk => $v) {
                 foreach ($v->keymap as $kkk => $vv) {
-                    if (strpos($vv, $k . '.') !== false) {
-                        $relations[$k] = [ $relation, $table ];
-                        $j[$k]->keymap[$kkk] = str_replace($k . '.', $getAlias($k) . '.', $vv);
+                    if (strpos($vv, $k.'.') !== false) {
+                        $relations[$k] = [$relation, $table];
+                        $j[$k]->keymap[$kkk] = str_replace($k.'.', $getAlias($k).'.', $vv);
                     }
                 }
             }
         }
         $select = [];
         foreach ($f 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[] = $getAlias($name) . '.' . $column . ' ' . $getAlias($name . static::SEP . $column);
+                $select[] = $getAlias($name).'.'.$column.' '.$getAlias($name.static::SEP.$column);
             }
         }
         $sql = 'SELECT '.implode(', ', $select).' FROM '.$table.' ';
         $par = [];
         foreach ($j 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] !== $this->definition->getName() ? $getAlias($v[1]) : $v[1];
@@ -686,13 +683,13 @@ 
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $table.'.'.$kk.' = '.$alias.'.'.$vv.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
                 $sql .= 'LEFT JOIN '.$v->table->getName().' '.$getAlias($relation).' ON ';
                 $tmp = [];
                 foreach ($v->pivot_keymap as $kk => $vv) {
                     $tmp[] = $getAlias($relation).'.'.$vv.' = '.$alias.'.'.$kk.' ';
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             } else {
                 $alias = $getAlias($relation);
 
@@ -702,36 +699,36 @@ 
                     $tmp[] = $table.'.'.$kk.' = '.$alias.'.'.$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($w)) {
             $sql .= 'WHERE ';
             $tmp = [];
             foreach ($w as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($g)) {
-            $sql .= 'GROUP BY ' . $g[0] . ' ';
+            $sql .= 'GROUP BY '.$g[0].' ';
             $par = array_merge($par, $g[1]);
         }
         if (count($h)) {
             $sql .= 'HAVING ';
             $tmp = [];
             foreach ($h as $v) {
-                $tmp[] = '(' . $v[0] . ')';
+                $tmp[] = '('.$v[0].')';
                 $par = array_merge($par, $v[1]);
             }
             $sql .= implode(' AND ', $tmp).' ';
         }
         if (count($o)) {
-            $sql .= 'ORDER BY ' . $o[0] . ' ';
+            $sql .= 'ORDER BY '.$o[0].' ';
             $par = array_merge($par, $o[1]);
         }
         $porder = [];
@@ -739,30 +736,30 @@ 
             $porder[] = $this->getColumn($field)['name'];
         }
         if (count($porder)) {
-            $sql .= (count($o) ? ', ' : 'ORDER BY ') . implode(', ', $porder) . ' ';
+            $sql .= (count($o) ? ', ' : '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(
@@ -812,7 +809,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 {
@@ -844,7 +841,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 ';
@@ -853,7 +850,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];
@@ -877,7 +874,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];
@@ -897,13 +894,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;
             }