vakata / database

src/schema/TableQuery.php

Spacing +177 added lines, -181 removed lines

@@ -44,7 +44,7 @@ 
     /**
      * @var int[]
      */
-    protected $li_of = [0,0,0];
+    protected $li_of = [0, 0, 0];
     /**
      * @var array
      */
@@ -74,7 +74,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;
@@ -97,7 +97,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');
@@ -120,7 +120,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 {
@@ -129,19 +129,19 @@ 
             $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)
     {
-        $strict = (int)$this->db->driverOption('strict', 0) > 0;
+        $strict = (int) $this->db->driverOption('strict', 0) > 0;
         if ($value === null && $col->isNullable()) {
             return null;
         }
@@ -151,7 +151,7 @@ 
                     $temp = strtotime($value);
                     if (!$temp) {
                         if ($strict) {
-                            throw new DBException('Invalid value for date column ' . $col->getName());
+                            throw new DBException('Invalid value for date column '.$col->getName());
                         }
                         return null;
                     }
@@ -164,7 +164,7 @@ 
                     return $value->format('Y-m-d');
                 }
                 if ($strict) {
-                    throw new DBException('Invalid value (unknown data type) for date column ' . $col->getName());
+                    throw new DBException('Invalid value (unknown data type) for date column '.$col->getName());
                 }
                 return $value;
             case 'datetime':
@@ -172,7 +172,7 @@ 
                     $temp = strtotime($value);
                     if (!$temp) {
                         if ($strict) {
-                            throw new DBException('Invalid value for datetime column ' . $col->getName());
+                            throw new DBException('Invalid value for datetime column '.$col->getName());
                         }
                         return null;
                     }
@@ -185,7 +185,7 @@ 
                     return $value->format('Y-m-d H:i:s');
                 }
                 if ($strict) {
-                    throw new DBException('Invalid value (unknown data type) for datetime column ' . $col->getName());
+                    throw new DBException('Invalid value (unknown data type) for datetime column '.$col->getName());
                 }
                 return $value;
             case 'enum':
@@ -193,7 +193,7 @@ 
                 if (is_int($value)) {
                     if (!isset($values[$value])) {
                         if ($strict) {
-                            throw new DBException('Invalid value (using integer) for enum ' . $col->getName());
+                            throw new DBException('Invalid value (using integer) for enum '.$col->getName());
                         }
                         return $value;
                     }
@@ -201,21 +201,21 @@ 
                 }
                 if (!in_array($value, $col->getValues())) {
                     if ($strict) {
-                        throw new DBException('Invalid value for enum ' . $col->getName());
+                        throw new DBException('Invalid value for enum '.$col->getName());
                     }
                     return 0;
                 }
                 return $value;
             case 'int':
-                return (int)preg_replace('([^+\-0-9]+)', '', $value);
+                return (int) preg_replace('([^+\-0-9]+)', '', $value);
             case 'float':
-                return (float)preg_replace('([^+\-0-9.]+)', '', str_replace(',', '.', $value));
+                return (float) preg_replace('([^+\-0-9.]+)', '', str_replace(',', '.', $value));
             case 'text':
                 // check using strlen first, in order to avoid hitting mb_ functions which might be polyfilled
                 // because the polyfill is quite slow
                 if ($col->hasLength() && strlen($value) > $col->getLength() && mb_strlen($value) > $col->getLength()) {
                     if ($strict) {
-                        throw new DBException('Invalid value for text column ' . $col->getName());
+                        throw new DBException('Invalid value for text column '.$col->getName());
                     }
                     return mb_substr($value, 0, $col->getLength());
                 }
@@ -237,35 +237,32 @@ 
             // str_replace(['%', '_'], ['\\%','\\_'], $q)
             return $negate ?
                 [
-                    $name . ' NOT LIKE ?',
-                    [ $this->normalizeValue($column, $value) ]
-                ] :
-                [
-                    $name . ' LIKE ?',
-                    [ $this->normalizeValue($column, $value) ]
+                    $name.' NOT LIKE ?',
+                    [$this->normalizeValue($column, $value)]
+                ] : [
+                    $name.' LIKE ?',
+                    [$this->normalizeValue($column, $value)]
                 ];
         }
         if (is_null($value)) {
             return $negate ?
-                [ $name . ' IS NOT NULL', [] ]:
-                [ $name . ' IS NULL', [] ];
+                [$name.' IS NOT NULL', []] : [$name.' IS NULL', []];
         }
         if (!is_array($value)) {
             return $negate ?
                 [
-                    $name . ' <> ?',
-                    [ $this->normalizeValue($column, $value) ]
-                ] :
-                [
-                    $name . ' = ?',
-                    [ $this->normalizeValue($column, $value) ]
+                    $name.' <> ?',
+                    [$this->normalizeValue($column, $value)]
+                ] : [
+                    $name.' = ?',
+                    [$this->normalizeValue($column, $value)]
                 ];
         }
         if (isset($value['beg']) && strlen($value['beg']) && (!isset($value['end']) || !strlen($value['end']))) {
-            $value = [ 'gte' => $value['beg'] ];
+            $value = ['gte' => $value['beg']];
         }
         if (isset($value['end']) && strlen($value['end']) && (!isset($value['beg']) || !strlen($value['beg']))) {
-            $value = [ 'lte' => $value['end'] ];
+            $value = ['lte' => $value['end']];
         }
         if (isset($value['beg']) && isset($value['end'])) {
             return $negate ?
@@ -275,8 +272,7 @@ 
                         $this->normalizeValue($column, $value['beg']),
                         $this->normalizeValue($column, $value['end'])
                     ]
-                ] :
-                [
+                ] : [
                     $name.' BETWEEN ? AND ?',
                     [
                         $this->normalizeValue($column, $value['beg']),
@@ -288,34 +284,34 @@ 
             $sql = [];
             $par = [];
             if (isset($value['gt'])) {
-                $sql[] = $name. ' ' . ($negate ? '<=' : '>') . ' ?';
+                $sql[] = $name.' '.($negate ? '<=' : '>').' ?';
                 $par[] = $this->normalizeValue($column, $value['gt']);
             }
             if (isset($value['gte'])) {
-                $sql[] = $name. ' ' . ($negate ? '<' : '>=') . ' ?';
+                $sql[] = $name.' '.($negate ? '<' : '>=').' ?';
                 $par[] = $this->normalizeValue($column, $value['gte']);
             }
             if (isset($value['lt'])) {
-                $sql[] = $name. ' ' . ($negate ? '>=' : '<') . ' ?';
+                $sql[] = $name.' '.($negate ? '>=' : '<').' ?';
                 $par[] = $this->normalizeValue($column, $value['lt']);
             }
             if (isset($value['lte'])) {
-                $sql[] = $name. ' ' . ($negate ? '>' : '<=') . ' ?';
+                $sql[] = $name.' '.($negate ? '>' : '<=').' ?';
                 $par[] = $this->normalizeValue($column, $value['lte']);
             }
             return [
-                '(' . implode(' AND ', $sql) . ')',
+                '('.implode(' AND ', $sql).')',
                 $par
             ];
         }
         return $negate ?
             [
-                $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)]
             ] :
             [
-                $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)]
             ];
     }
     /**
@@ -346,7 +342,7 @@ 
                 $par = array_merge($par, $temp[1]);
             }
         }
-        return $this->where('(' . implode(' OR ', $sql) . ')', $par);
+        return $this->where('('.implode(' OR ', $sql).')', $par);
     }
     /**
      * Filter the results matching all of the criteria
@@ -364,7 +360,7 @@ 
                 $par = array_merge($par, $temp[1]);
             }
         }
-        return $this->where('(' . implode(' AND ', $sql) . ')', $par);
+        return $this->where('('.implode(' AND ', $sql).')', $par);
     }
     /**
      * Sort by a column
@@ -374,7 +370,7 @@ 
      */
     public function sort(string $column, bool $desc = false) : self
     {
-        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)
@@ -384,7 +380,7 @@ 
     public function group($column) : self
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         foreach ($column as $k => $v) {
             $column[$k] = $this->getColumn($v)['name'];
@@ -426,7 +422,7 @@ 
         $this->order = [];
         $this->having = [];
         $this->aliases = [];
-        $this->li_of = [0,0,0];
+        $this->li_of = [0, 0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -439,7 +435,7 @@ 
     public function groupBy(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -452,7 +448,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');
@@ -461,7 +457,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;
     }
@@ -474,7 +470,7 @@ 
     public function where(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -486,7 +482,7 @@ 
     public function having(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -507,7 +503,7 @@ 
                 $name = null;
             }
         }
-        $this->order = [ $sql, $params, $name ];
+        $this->order = [$sql, $params, $name];
         return $this;
     }
     /**
@@ -519,7 +515,7 @@ 
     public function limit(int $limit, int $offset = 0, bool $limitOnMainTable = false) : self
     {
         $this->qiterator = null;
-        $this->li_of = [ $limit, $offset, $limitOnMainTable ? 1 : 0 ];
+        $this->li_of = [$limit, $offset, $limitOnMainTable ? 1 : 0];
         return $this;
     }
     /**
@@ -529,9 +525,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.' ';
@@ -545,44 +541,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 (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv[0])) {
-                    $relations[$k] = [ $v, $table ];
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
+                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($o[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $o[0])) {
-                $relations[$k] = [ $v, $table ];
+            if (isset($o[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $o[0])) {
+                $relations[$k] = [$v, $table];
             }
             foreach ($h as $kk => $vv) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv[0])) {
-                    $relations[$k] = [ $v, $table ];
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
-                $relations[$k] = [ $v, $table ];
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $g[0]);
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $relations[$k] = [$v, $table];
+                $g[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $g[0]);
             }
             foreach ($j as $kk => $vv) {
                 foreach ($vv->keymap as $kkk => $vvv) {
-                    if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vvv)) {
-                        $relations[$k] = [ $v, $table ];
-                        $j[$kk]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vvv);
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vvv)) {
+                        $relations[$k] = [$v, $table];
+                        $j[$kk]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vvv);
                     }
                 }
             }
         }
 
         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];
@@ -594,13 +590,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 ';
@@ -609,30 +605,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).' ';
@@ -666,7 +662,7 @@ 
                     $this->with(implode('.', $temp));
                     $table = array_reduce(
                         $temp,
-                        function ($carry, $item) use (&$table) {
+                        function($carry, $item) use (&$table) {
                             return $table->getRelation($item)->table;
                         }
                     );
@@ -675,7 +671,7 @@ 
                 }
                 unset($fields[$k]);
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
             }
         }
@@ -707,9 +703,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) {
@@ -725,7 +721,7 @@ 
         $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);
 
         $porder = [];
         foreach ($this->definition->getPrimaryKey() as $field) {
@@ -734,47 +730,47 @@ 
 
         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 (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $relations[$k] = [ $relation, $table ];
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $relations[$k] = [$relation, $table];
+                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $v[0]);
                 }
             }
             foreach ($h as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $relations[$k] = [ $relation, $table ];
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $relations[$k] = [$relation, $table];
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $v[0]);
                 }
             }
-            if (isset($o[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $o[0])) {
-                $relations[$k] = [ $relation, $table ];
-                $o[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $o[0]);
+            if (isset($o[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $o[0])) {
+                $relations[$k] = [$relation, $table];
+                $o[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $o[0]);
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
-                $relations[$k] = [ $relation, $table ];
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $g[0]);
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $relations[$k] = [$relation, $table];
+                $g[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $g[0]);
             }
             foreach ($j as $kk => $v) {
                 foreach ($v->keymap as $kkk => $vv) {
-                    if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv)) {
-                        $relations[$k] = [ $relation, $table ];
-                        $j[$k]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv);
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
+                        $relations[$k] = [$relation, $table];
+                        $j[$k]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k.'.').')i', $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.' ';
@@ -784,12 +780,12 @@ 
             if ($v->many) {
                 $many = true;
             }
-            $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];
@@ -804,13 +800,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);
 
@@ -820,10 +816,10 @@ 
                     $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).' ';
             }
         }
 
@@ -833,9 +829,9 @@ 
                 if (count($porder) > 1) {
                     $pkw = [];
                     foreach ($porder as $name) {
-                        $pkw[] = $name . ' = ?';
+                        $pkw[] = $name.' = ?';
                     }
-                    $pkw = '(' . implode(' AND ', $pkw) . ')';
+                    $pkw = '('.implode(' AND ', $pkw).')';
                     $pkp = [];
                     foreach ($ids as $id) {
                         foreach ($id as $p) {
@@ -847,64 +843,64 @@ 
                         $pkp
                     ];
                 } else {
-                    $w[] = [ $porder[0] . ' IN ('.implode(',', array_fill(0, count($ids), '?')).')', $ids ];
+                    $w[] = [$porder[0].' IN ('.implode(',', array_fill(0, count($ids), '?')).')', $ids];
                 }
             } else {
-                $w[] = [ '1=0', [] ];
+                $w[] = ['1=0', []];
             }
         }
         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]);
         }
         if (count($porder)) {
             $pdir = (count($o) && strpos($o[0], 'DESC') !== false) ? 'DESC' : 'ASC';
-            $porder = array_map(function ($v) use ($pdir) { return $v . ' ' . $pdir; }, $porder);
-            $sql .= (count($o) ? ', ' : 'ORDER BY ') . implode(', ', $porder) . ' ';
+            $porder = array_map(function($v) use ($pdir) { return $v.' '.$pdir; }, $porder);
+            $sql .= (count($o) ? ', ' : 'ORDER BY ').implode(', ', $porder).' ';
         }
         if ((!$many || $this->li_of[2] === 0 || !count($porder)) && $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(
@@ -954,7 +950,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 {
@@ -986,7 +982,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 ';
@@ -995,7 +991,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];
@@ -1019,7 +1015,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];
@@ -1039,13 +1035,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;
             }
@@ -1090,9 +1086,9 @@ 
         }
 
         $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();
@@ -1104,65 +1100,65 @@ 
         $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 (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv[0])) {
-                    $relations[$k] = [ $v, $table ];
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
+                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($o[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $o[0])) {
-                $relations[$k] = [ $v, $table ];
-                $o[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $o[0]);
-                $o[2] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $o[2]);
+            if (isset($o[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $o[0])) {
+                $relations[$k] = [$v, $table];
+                $o[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $o[0]);
+                $o[2] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $o[2]);
             }
             foreach ($h as $kk => $vv) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv[0])) {
-                    $relations[$k] = [ $v, $table ];
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vv[0]);
                 }
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
-                $relations[$k] = [ $v, $table ];
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $g[0]);
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $relations[$k] = [$v, $table];
+                $g[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $g[0]);
             }
             foreach ($j as $kk => $vv) {
                 foreach ($vv->keymap as $kkk => $vvv) {
-                    if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vvv)) {
-                        $relations[$k] = [ $v, $table ];
-                        $j[$kk]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vvv);
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vvv)) {
+                        $relations[$k] = [$v, $table];
+                        $j[$kk]->keymap[$kkk] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vvv);
                     }
                 }
             }
         }
 
-        $key = array_map(function ($v) use ($table) { return $table . '.' . $v; }, $this->pkey);
+        $key = array_map(function($v) use ($table) { return $table.'.'.$v; }, $this->pkey);
         $own = false;
         $dir = 'ASC';
         if (count($o)) {
             $dir = strpos($o[0], ' DESC') ? 'DESC' : 'ASC';
-            $own = strpos($o[2], $table . '.') === 0;
+            $own = strpos($o[2], $table.'.') === 0;
         }
 
         $dst = $key;
         if ($own) {
             // if using own table - do not use max/min in order - that will prevent index usage
-            $dst[] = $o[2] . ' orderbyfix___';
+            $dst[] = $o[2].' orderbyfix___';
         } else {
-            $dst[] = 'MAX(' . $o[2] . ') orderbyfix___';
+            $dst[] = 'MAX('.$o[2].') orderbyfix___';
         }
         $dst = array_unique($dst);
 
         $par = [];
-        $sql  = 'SELECT DISTINCT '.implode(', ', $dst).' FROM '.$table.' ';
+        $sql = 'SELECT DISTINCT '.implode(', ', $dst).' FROM '.$table.' ';
         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];
@@ -1174,13 +1170,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 ';
@@ -1189,29 +1185,29 @@ 
                     $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 (!$own) {
-            $sql .= 'GROUP BY ' . implode(', ', $key) . ' ';
+            $sql .= 'GROUP BY '.implode(', ', $key).' ';
         }
         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).' ';
@@ -1219,38 +1215,38 @@ 
         if (count($o)) {
             $sql .= 'ORDER BY ';
             if ($own) {
-                $sql .= $o[2] . ' ' . $dir;
+                $sql .= $o[2].' '.$dir;
             } else {
-                $sql .= 'MAX('.$o[2].') ' . $dir;
+                $sql .= 'MAX('.$o[2].') '.$dir;
             }
         }
         $porder = [];
         $pdir = (count($o) && strpos($o[0], 'DESC') !== false) ? 'DESC' : 'ASC';
         foreach ($this->definition->getPrimaryKey() as $field) {
-            $porder[] = $this->getColumn($field)['name'] . ' ' . $pdir;
+            $porder[] = $this->getColumn($field)['name'].' '.$pdir;
         }
         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 {
-                    $sql = "SELECT " . implode(', ', $dst) . " 
+                    $sql = "SELECT ".implode(', ', $dst)." 
                             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 array_map(function ($v) use ($own) {
+        return array_map(function($v) use ($own) {
             if (isset($v['orderbyfix___'])) {
                 unset($v['orderbyfix___']);
             }