vakata / database

src/DB.php

Spacing +16 added lines, -18 removed lines

@@ -74,7 +74,7 @@ 
         $connection['pass'] = isset($temp['pass']) && strlen($temp['pass']) ? $temp['pass'] : null;
         $connection['host'] = isset($temp['host']) && strlen($temp['host']) ? $temp['host'] : null;
         $connection['name'] = isset($temp['path']) && strlen($temp['path']) ? trim($temp['path'], '/') : null;
-        $connection['port'] = isset($temp['port']) && (int)$temp['port'] ? (int)$temp['port'] : null;
+        $connection['port'] = isset($temp['port']) && (int) $temp['port'] ? (int) $temp['port'] : null;
         if (isset($temp['query']) && strlen($temp['query'])) {
             parse_str($temp['query'], $connection['opts']);
         }
@@ -117,7 +117,7 @@ 
         $new = '';
         $par = array_values($par);
         if (substr_count($sql, '?') === 2 && !is_array($par[0])) {
-            $par = [ $par ];
+            $par = [$par];
         }
         $parts = explode('??', $sql);
         $index = 0;
@@ -127,7 +127,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);
@@ -135,7 +135,7 @@ 
                 $new .= implode(',', array_fill(0, count($params), '?'));
             }
         }
-        return [ $new, $par ];
+        return [$new, $par];
     }
     /**
      * Run a query (prepare & execute).
@@ -184,7 +184,7 @@ 
     ): Collection {
         $coll = Collection::from($this->query($sql, $par, $buff));
         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;
@@ -193,18 +193,18 @@ 
             });
         }
         if ($key !== null) {
-            $coll->mapKey(function ($v) use ($key) {
+            $coll->mapKey(function($v) use ($key) {
                 return $v[$key];
             });
         }
         if ($skip) {
-            $coll->map(function ($v) use ($key) {
+            $coll->map(function($v) use ($key) {
                 unset($v[$key]);
                 return $v;
             });
         }
         if ($opti) {
-            $coll->map(function ($v) {
+            $coll->map(function($v) {
                 return count($v) === 1 ? current($v) : $v;
             });
         }
@@ -299,8 +299,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.
@@ -317,13 +316,13 @@ 
      */
     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(),
                 'schema' => $table->getSchema(),
                 'pkey' => $table->getPrimaryKey(),
                 'comment' => $table->getComment(),
-                'columns' => array_map(function ($column) {
+                'columns' => array_map(function($column) {
                     return [
                         'name' => $column->getName(),
                         'type' => $column->getType(),
@@ -334,9 +333,9 @@ 
                         'nullable' => $column->isNullable()
                     ];
                 }, $table->getFullColumns()),
-                'relations' => array_map(function ($rel) {
+                'relations' => array_map(function($rel) {
                     $relation = clone $rel;
-                    $relation = (array)$relation;
+                    $relation = (array) $relation;
                     $relation['table'] = $rel->table->getName();
                     if ($rel->pivot) {
                         $relation['pivot'] = $rel->pivot->getName();
@@ -393,8 +392,7 @@ 
     public function table(string $table, bool $mapped = false)
     {
         return $mapped ?
-            new TableQueryMapped($this, $this->definition($table)) :
-            new TableQuery($this, $this->definition($table));
+            new TableQueryMapped($this, $this->definition($table)) : new TableQuery($this, $this->definition($table));
     }
     public function __call($method, $args)
     {
@@ -428,12 +426,12 @@ 
                     $relations[$t] = $w;
                 }
                 if (!isset($schema[$name])) {
-                    $schema[$name] = [ 'edges' => [] ];
+                    $schema[$name] = ['edges' => []];
                 }
                 foreach ($relations as $t => $w) {
                     $schema[$name]['edges'][$t] = $w;
                     if (!isset($schema[$t])) {
-                        $schema[$t] = [ 'edges' => [] ];
+                        $schema[$t] = ['edges' => []];
                     }
                     $schema[$t]['edges'][$name] = $w;
                 }

src/schema/TableQuery.php

Spacing +234 added lines, -238 removed lines

@@ -45,7 +45,7 @@ 
     /**
      * @var int[]
      */
-    protected $li_of = [0,0,0];
+    protected $li_of = [0, 0, 0];
     /**
      * @var array
      */
@@ -75,7 +75,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;
@@ -98,7 +98,7 @@ 
     {
         $column = explode('.', $column);
         if (count($column) === 1) {
-            $column = [ $this->definition->getFullName(), $column[0] ];
+            $column = [$this->definition->getFullName(), $column[0]];
             $col = $this->definition->getColumn($column[1]);
             if (!$col) {
                 throw new DBException('Invalid column name in own table');
@@ -134,7 +134,7 @@ 
                     if (!$col) {
                         $path = $this->db->findRelation($this->definition->getName(), $column[0]);
                         if (!count($path)) {
-                            throw new DBException('Invalid foreign table / column name: ' . implode(',', $column));
+                            throw new DBException('Invalid foreign table / column name: '.implode(',', $column));
                         }
                         unset($path[0]);
                         $this->with(implode('.', $path), false);
@@ -147,26 +147,26 @@ 
             if ($this->definition->hasRelation(implode('.', $column))) {
                 $this->with(implode('.', $column), false);
                 $col = $this->definition->getRelation(implode('.', $column))->table->getColumn($name);
-                $column = [ implode('.', $column), $name ];
+                $column = [implode('.', $column), $name];
             } else {
                 $this->with(implode('.', $column), false);
                 $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;
         }
@@ -176,7 +176,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;
                     }
@@ -189,7 +189,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':
@@ -197,7 +197,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;
                     }
@@ -210,7 +210,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':
@@ -218,7 +218,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;
                     }
@@ -226,23 +226,23 @@ 
                 }
                 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':
                 $temp = preg_replace('([^+\-0-9]+)', '', $value);
-                return is_string($temp) ? (int)$temp : 0;
+                return is_string($temp) ? (int) $temp : 0;
             case 'float':
                 $temp = preg_replace('([^+\-0-9.]+)', '', str_replace(',', '.', $value));
-                return is_string($temp) ? (float)$temp : 0;
+                return is_string($temp) ? (float) $temp : 0;
             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());
                 }
@@ -264,35 +264,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 ?
@@ -302,8 +299,7 @@ 
                         $this->normalizeValue($column, $value['beg']),
                         $this->normalizeValue($column, $value['end'])
                     ]
-                ] :
-                [
+                ] : [
                     $name.' BETWEEN ? AND ?',
                     [
                         $this->normalizeValue($column, $value['beg']),
@@ -315,42 +311,42 @@ 
             $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
             ];
         }
 
-        $value = array_values(array_map(function ($v) use ($column) {
+        $value = array_values(array_map(function($v) use ($column) {
             return $this->normalizeValue($column, $v);
         }, $value));
         if ($this->db->driverName() === 'oracle') {
             $sql = [];
             $par = [];
             for ($i = 0; $i < count($value); $i += 500) {
-                $sql[] = $negate ? $name . ' NOT IN (??)' : $name . ' IN (??)';
+                $sql[] = $negate ? $name.' NOT IN (??)' : $name.' IN (??)';
                 $par[] = array_slice($value, $i, 500);
             }
-            $sql = '(' . implode($negate ? ' AND ' : ' OR ', $sql) . ')';
-            return [ $sql, [$par] ];
+            $sql = '('.implode($negate ? ' AND ' : ' OR ', $sql).')';
+            return [$sql, [$par]];
         }
         return [
-            $negate ? $name . ' NOT IN (??)' : $name . ' IN (??)',
+            $negate ? $name.' NOT IN (??)' : $name.' IN (??)',
             [$value]
         ];
     }
@@ -382,7 +378,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
@@ -400,7 +396,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
@@ -415,7 +411,7 @@ 
         } catch (DBException $e) {
             throw new DBException('Invalid sort column');
         }
-        return $this->order($column . ' ' . ($desc ? 'DESC' : 'ASC'));
+        return $this->order($column.' '.($desc ? 'DESC' : 'ASC'));
     }
     /**
      * Group by a column (or columns)
@@ -425,7 +421,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'];
@@ -467,7 +463,7 @@ 
         $this->order = [];
         $this->having = [];
         $this->aliases = [];
-        $this->li_of = [0,0,0];
+        $this->li_of = [0, 0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -480,7 +476,7 @@ 
     public function groupBy(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -493,7 +489,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');
@@ -502,7 +498,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;
     }
@@ -515,7 +511,7 @@ 
     public function where(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -527,7 +523,7 @@ 
     public function having(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -547,12 +543,12 @@ 
                     throw new \Exception();
                 }
                 $name = $this->getColumn(trim($name))['name'];
-                $sql = $name . ' ' . (strpos(strtolower($sql), ' desc') ? 'DESC' : 'ASC');
+                $sql = $name.' '.(strpos(strtolower($sql), ' desc') ? 'DESC' : 'ASC');
             } catch (\Exception $e) {
                 $name = null;
             }
         }
-        $this->order = [ $sql, $params, $name ];
+        $this->order = [$sql, $params, $name];
         return $this;
     }
     /**
@@ -564,7 +560,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;
     }
     /**
@@ -575,9 +571,9 @@ 
     {
         $aliases = [];
         $aliases_ext = [];
-        $getAlias = function ($name) use (&$aliases, &$aliases_ext) {
+        $getAlias = function($name) use (&$aliases, &$aliases_ext) {
             // to bypass use: return $name;
-            $aliases[$name] = $aliases[$name] ?? 'alias' . static::SEP . count($aliases);
+            $aliases[$name] = $aliases[$name] ?? 'alias'.static::SEP.count($aliases);
             $temp = explode(static::SEP, $name);
             $temp = $temp[count($temp) - 1];
             if (!isset($aliases[$temp])) {
@@ -597,7 +593,7 @@ 
         $h = $this->having;
         $o = $this->order;
         $g = $this->group;
-        $j = array_map(function ($v) {
+        $j = array_map(function($v) {
             return clone $v;
         }, $this->joins);
 
@@ -607,28 +603,28 @@ 
                 continue;
             }
             foreach ($w as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
                     $used_relations[] = $k;
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                    $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])) {
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
                     $used_relations[] = $k;
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $v[0]);
                 }
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
                 $used_relations[] = $k;
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $g[0]);
+                $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)) {
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
                         $used_relations[] = $k;
                         $j[$kk]->keymap[$kkk] = preg_replace(
-                            '(\b'.preg_quote($k . '.'). ')i',
-                            $getAlias($k) . '.',
+                            '(\b'.preg_quote($k.'.').')i',
+                            $getAlias($k).'.',
                             $vv
                         );
                     }
@@ -637,65 +633,65 @@ 
         }
         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 ];
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
                     $used_relations[] = $k;
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                    $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 ];
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $vv[0])) {
+                    $relations[$k] = [$v, $table];
                     $used_relations[] = $k;
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vv[0]);
+                    $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 ];
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $relations[$k] = [$v, $table];
                 $used_relations[] = $k;
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $g[0]);
+                $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 ];
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vvv)) {
+                        $relations[$k] = [$v, $table];
                         $used_relations[] = $k;
                         $j[$kk]->keymap[$kkk] =
-                            preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $vvv);
+                            preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vvv);
                     }
                 }
             }
         }
         foreach ($aliases_ext as $k => $alias) {
             foreach ($w as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $v[0]);
                     $used_relations[] = $k;
                 }
             }
             foreach ($h as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $v[0]);
                     $used_relations[] = $k;
                 }
             }
-            if (isset($o[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $o[0])) {
+            if (isset($o[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $o[0])) {
                 $used_relations[] = $k;
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $g[0]);
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $g[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $g[0]);
                 $used_relations[] = $k;
             }
             foreach ($j as $kk => $v) {
                 foreach ($v->keymap as $kkk => $vv) {
-                    if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv)) {
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
                         $used_relations[] = $k;
                         $j[$kk]->keymap[$kkk] = preg_replace(
-                            '(\b'.preg_quote($k . '.'). ')i',
-                            $alias . '.',
+                            '(\b'.preg_quote($k.'.').')i',
+                            $alias.'.',
                             $vv
                         );
                     }
@@ -713,13 +709,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->getFullName().' '.$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->getFullName().' '.$alias.' ON ';
@@ -728,19 +724,19 @@ 
                         $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).' ';
                 }
             }
             foreach ($j as $k => $v) {
-                $sql .= ($v->many ? 'LEFT ' : '' ) . 'JOIN '.$v->table->getFullName().' '.$k.' ON ';
+                $sql .= ($v->many ? 'LEFT ' : '').'JOIN '.$v->table->getFullName().' '.$k.' ON ';
                 $tmp = [];
                 foreach ($v->keymap as $kk => $vv) {
                     $tmp[] = $kk.' = '.$vv;
                 }
-                $sql .= implode(' AND ', $tmp) . ' ';
+                $sql .= implode(' AND ', $tmp).' ';
             }
         } else {
             $sql = str_replace('COUNT(DISTINCT ', 'COUNT(', $sql);
@@ -749,20 +745,20 @@ 
             $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).' ';
@@ -796,7 +792,7 @@ 
                     $this->with(implode('.', $temp));
                     $table = array_reduce(
                         $temp,
-                        function ($carry, $item) use (&$table) {
+                        function($carry, $item) use (&$table) {
                             return $table->getRelation($item)->table;
                         }
                     );
@@ -805,7 +801,7 @@ 
                 }
                 unset($fields[$k]);
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
             }
         }
@@ -840,9 +836,9 @@ 
         }
         $aliases = [];
         $aliases_ext = [];
-        $getAlias = function ($name) use (&$aliases, &$aliases_ext) {
+        $getAlias = function($name) use (&$aliases, &$aliases_ext) {
             // to bypass use: return $name;
-            $aliases[$name] = $aliases[$name] ?? 'alias' . static::SEP . count($aliases);
+            $aliases[$name] = $aliases[$name] ?? 'alias'.static::SEP.count($aliases);
             $temp = explode(static::SEP, $name);
             $temp = $temp[count($temp) - 1];
             if (!isset($aliases[$temp])) {
@@ -864,7 +860,7 @@ 
         $h = $this->having;
         $o = $this->order;
         $g = $this->group;
-        $j = array_map(function ($v) {
+        $j = array_map(function($v) {
             return clone $v;
         }, $this->joins);
 
@@ -878,32 +874,32 @@ 
                 continue;
             }
             foreach ($f as $kk => $field) {
-                if (strpos($field, $k . '.') === 0) {
-                    $f[$kk] = str_replace($k . '.', $getAlias($k) . '.', $field);
+                if (strpos($field, $k.'.') === 0) {
+                    $f[$kk] = str_replace($k.'.', $getAlias($k).'.', $field);
                 }
             }
             foreach ($w as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $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])) {
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $getAlias($k) . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $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])) {
-                $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])) {
+                $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])) {
-                $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])) {
+                $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)) {
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
                         $j[$kk]->keymap[$kkk] = preg_replace(
-                            '(\b'.preg_quote($k . '.'). ')i',
-                            $getAlias($k) . '.',
+                            '(\b'.preg_quote($k.'.').')i',
+                            $getAlias($k).'.',
                             $vv
                         );
                     }
@@ -912,38 +908,38 @@ 
         }
         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 ];
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
+                        $relations[$k] = [$relation, $table];
                         $j[$kk]->keymap[$kkk] = preg_replace(
-                            '(\b'.preg_quote($k . '.'). ')i',
-                            $getAlias($k) . '.',
+                            '(\b'.preg_quote($k.'.').')i',
+                            $getAlias($k).'.',
                             $vv
                         );
                     }
@@ -952,32 +948,32 @@ 
         }
         foreach ($aliases_ext as $k => $alias) {
             foreach ($f as $kk => $field) {
-                if (strpos($field, $k . '.') === 0) {
-                    $f[$kk] = str_replace($k . '.', $alias . '.', $field);
+                if (strpos($field, $k.'.') === 0) {
+                    $f[$kk] = str_replace($k.'.', $alias.'.', $field);
                 }
             }
             foreach ($w as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $w[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $v[0]);
                 }
             }
             foreach ($h as $kk => $v) {
-                if (preg_match('(\b'.preg_quote($k . '.'). ')i', $v[0])) {
-                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $v[0]);
+                if (preg_match('(\b'.preg_quote($k.'.').')i', $v[0])) {
+                    $h[$kk][0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $v[0]);
                 }
             }
-            if (isset($o[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $o[0])) {
-                $o[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $o[0]);
+            if (isset($o[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $o[0])) {
+                $o[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $o[0]);
             }
-            if (isset($g[0]) && preg_match('(\b'.preg_quote($k . '.'). ')i', $g[0])) {
-                $g[0] = preg_replace('(\b'.preg_quote($k . '.'). ')i', $alias . '.', $g[0]);
+            if (isset($g[0]) && preg_match('(\b'.preg_quote($k.'.').')i', $g[0])) {
+                $g[0] = preg_replace('(\b'.preg_quote($k.'.').')i', $alias.'.', $g[0]);
             }
             foreach ($j as $kk => $v) {
                 foreach ($v->keymap as $kkk => $vv) {
-                    if (preg_match('(\b'.preg_quote($k . '.'). ')i', $vv)) {
+                    if (preg_match('(\b'.preg_quote($k.'.').')i', $vv)) {
                         $j[$kk]->keymap[$kkk] = preg_replace(
-                            '(\b'.preg_quote($k . '.'). ')i',
-                            $alias . '.',
+                            '(\b'.preg_quote($k.'.').')i',
+                            $alias.'.',
                             $vv
                         );
                     }
@@ -986,12 +982,12 @@ 
         }
         $select = [];
         foreach ($f as $k => $field) {
-            $select[] = $field . (!is_numeric($k) ? ' ' . $k : '');
+            $select[] = $field.(!is_numeric($k) ? ' '.$k : '');
         }
         foreach ($this->withr as $name => $relation) {
             if ($relation[2]) {
                 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);
                 }
             }
         }
@@ -1011,13 +1007,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->getFullName().' '.$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);
 
@@ -1027,22 +1023,22 @@ 
                     $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).' ';
             }
         }
         foreach ($j as $k => $v) {
             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).' ';
         }
         if ($many && count($porder) && $this->li_of[2] === 1) {
             $ids = $this->ids();
@@ -1050,9 +1046,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) {
@@ -1064,60 +1060,60 @@ 
                         $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).' ';
         }
         $ordered = false;
         if (count($o)) {
-            $sql .= 'ORDER BY ' . $o[0] . ' ';
+            $sql .= 'ORDER BY '.$o[0].' ';
             $par = array_merge($par, $o[1]);
             $ordered = true;
         }
         if (!count($g) && count($porder)) {
             $pdir = (count($o) && strpos($o[0], 'DESC') !== false) ? 'DESC' : 'ASC';
-            $porder = array_map(function ($v) use ($pdir) {
-                return $v . ' ' . $pdir;
+            $porder = array_map(function($v) use ($pdir) {
+                return $v.' '.$pdir;
             }, $porder);
-            $sql .= ($ordered ? ', ' : 'ORDER BY ') . implode(', ', $porder) . ' ';
+            $sql .= ($ordered ? ', ' : 'ORDER BY ').implode(', ', $porder).' ';
             $ordered = true;
         }
         foreach ($this->withr as $k => $v) {
             if (isset($v[3])) {
-                $sql .= ($ordered ? ', ' : 'ORDER BY ') . $getAlias($k) . '.' . $v[3] . ' ' . ($v[4] ? 'DESC' : 'ASC');
+                $sql .= ($ordered ? ', ' : 'ORDER BY ').$getAlias($k).'.'.$v[3].' '.($v[4] ? 'DESC' : 'ASC');
                 $ordered = true;
             }
         }
         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];
@@ -1125,16 +1121,16 @@ 
                         $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(
@@ -1184,12 +1180,12 @@ 
                 $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;
         } elseif ($this->db->driverName() === 'postgre') {
-            $sql .= ' RETURNING ' . implode(',', $primary);
+            $sql .= ' RETURNING '.implode(',', $primary);
             return $this->db->one($sql, $par, false);
         } else {
             $ret = [];
@@ -1220,9 +1216,9 @@ 
         }
         $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 ';
@@ -1231,7 +1227,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];
@@ -1255,7 +1251,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];
@@ -1274,18 +1270,18 @@ 
         $table = $this->definition;
         if ($table->hasRelation($relation)) {
             $temp = $table->getRelation($relation);
-            $this->withr[$relation] = [ $temp, $table->getName(), $select || ($this->withr[$relation][2] ?? false), $order, $desc ];
+            $this->withr[$relation] = [$temp, $table->getName(), $select || ($this->withr[$relation][2] ?? false), $order, $desc];
         } else {
             $parts = explode('.', $relation);
             try {
                 $name = array_reduce(
                     $parts,
-                    function ($carry, $item) use (&$table, $select) {
+                    function($carry, $item) use (&$table, $select) {
                         if (!$table->hasRelation($item)) {
-                            throw new DBException('Invalid relation name: '.$table->getName().' -> ' . $item);
+                            throw new DBException('Invalid relation name: '.$table->getName().' -> '.$item);
                         }
                         $relation = $table->getRelation($item);
-                        $name = $carry ? $carry . static::SEP . $item : $item;
+                        $name = $carry ? $carry.static::SEP.$item : $item;
                         $this->withr[$name] = [
                             $relation,
                             $carry ?? $table->getName(),
@@ -1349,9 +1345,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();
@@ -1363,65 +1359,65 @@ 
         $h = $this->having;
         $o = $this->order;
         $g = $this->group;
-        $j = array_map(function ($v) {
+        $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 ];
+                    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);
+                            preg_replace('(\b'.preg_quote($k.'.').')i', $getAlias($k).'.', $vvv);
                     }
                 }
             }
         }
 
-        $key = array_map(function ($v) use ($table) {
-            return $table . '.' . $v;
+        $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 (count($o)) {
             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 '.$this->definition->getFullName().' ';
+        $sql = 'SELECT DISTINCT '.implode(', ', $dst).' FROM '.$this->definition->getFullName().' ';
         foreach ($relations as $k => $v) {
             $table = $v[1] !== $this->definition->getName() ? $getAlias($v[1]) : $v[1];
             $v = $v[0];
@@ -1432,13 +1428,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 ';
@@ -1447,37 +1443,37 @@ 
                     $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).' ';
             }
         }
         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).' ';
         }
         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).' ';
@@ -1485,38 +1481,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) {
+        return array_map(function($v) {
             if (array_key_exists('orderbyfix___', $v)) {
                 unset($v['orderbyfix___']);
             }