vakata / database

src/driver/oracle/Schema.php

Indentation +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
                     }
                     return $new;
                 })
-                 as $relation
+                    as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] =

Spacing +25 added lines, -25 removed lines

@@ -29,19 +29,19 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM all_tab_cols WHERE table_name = ? AND owner = ?",
-                [ strtoupper($table), $this->name() ]
+                [strtoupper($table), $this->name()]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['COLUMN_NAME'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -53,7 +53,7 @@ 
                     default:
                         if (strpos($type, 'char') !== false && strpos($type, '(') !== false) {
                             // extract length from varchar
-                            $v['length'] = (int)explode(')', (explode('(', $type)[1] ?? ''))[0];
+                            $v['length'] = (int) explode(')', (explode('(', $type)[1] ?? ''))[0];
                             $v['length'] = $v['length'] > 0 ? $v['length'] : null;
                         }
                         break;
@@ -69,9 +69,9 @@ 
             ->query(
                 "SELECT constraint_name FROM all_constraints
                 WHERE table_name = ? AND constraint_type = ? AND owner = ?",
-                [ strtoupper($table), 'P', $owner ]
+                [strtoupper($table), 'P', $owner]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -86,9 +86,9 @@ 
                 ->query(
                     "SELECT column_name FROM all_cons_columns
                     WHERE table_name = ? AND constraint_name = ? AND owner = ?",
-                    [ strtoupper($table), $pkname, $owner ]
+                    [strtoupper($table), $pkname, $owner]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -115,9 +115,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, $pkname, 'R' ]
+                    [$owner, $owner, $pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -127,7 +127,7 @@ 
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] =
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] =
                     $relation['COLUMN_NAME'];
             }
             foreach ($relations as $data) {
@@ -157,9 +157,9 @@ 
                                 ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                 cc.COLUMN_NAME IN (??)
                             ORDER BY POSITION",
-                            [ $owner, $owner, $data['table'], 'R', $columns ]
+                            [$owner, $owner, $data['table'], 'R', $columns]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -179,9 +179,9 @@ 
                         ->query(
                             "SELECT COLUMN_NAME FROM all_cons_columns
                              WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                            [ $owner, current($foreign['keymap']) ]
+                            [$owner, current($foreign['keymap'])]
                         ))
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -196,7 +196,7 @@ 
                     $relname = $foreign['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $foreign['table'] . '_' . (++ $cntr);
+                        $relname = $foreign['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -212,7 +212,7 @@ 
                     $relname = $data['table'];
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $data['table'] . '_' . (++ $cntr);
+                        $relname = $data['table'].'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -240,9 +240,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $owner, $owner, strtoupper($table), 'R' ]
+                    [$owner, $owner, strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -260,9 +260,9 @@ 
                     ->query(
                         "SELECT COLUMN_NAME FROM all_cons_columns
                          WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ $owner, current($data['keymap']) ]
+                        [$owner, current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -277,7 +277,7 @@ 
                 $relname = $data['table'];
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $data['table'] . '_' . (++ $cntr);
+                    $relname = $data['table'].'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -298,7 +298,7 @@ 
                 "SELECT TABLE_NAME FROM ALL_TABLES where OWNER = ?",
                 [$this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -306,7 +306,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/DB.php

Spacing +14 added lines, -16 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();
@@ -389,8 +388,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)
     {

src/driver/postgre/Schema.php

Spacing +25 added lines, -25 removed lines

@@ -29,8 +29,8 @@ 
             $table = $temp[1];
         }
 
-        if (isset($tables[$schema . '.' . $table])) {
-            return $tables[$schema . '.' . $table];
+        if (isset($tables[$schema.'.'.$table])) {
+            return $tables[$schema.'.'.$table];
         }
 
         static $relationsT = null;
@@ -61,7 +61,7 @@ 
                         (kc.table_schema = ? OR ct.table_schema = ?) AND
                         kc.table_name IS NOT NULL AND
                         kc.position_in_unique_constraint IS NOT NULL",
-                    [ $catalog, $main, $main ]
+                    [$catalog, $main, $main]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -71,8 +71,8 @@ 
                 if ($row['referenced_table_schema'] !== $main) {
                     $additional[] = $row['referenced_table_schema'];
                 }
-                $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row;
-                $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row;
+                $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row;
+                $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row;
             }
             foreach (array_filter(array_unique($additional)) as $s) {
                 $col = Collection::from(
@@ -97,12 +97,12 @@ 
                             (kc.table_schema = ? AND ct.table_schema = ?) AND
                             kc.table_name IS NOT NULL AND
                             kc.position_in_unique_constraint IS NOT NULL",
-                        [ $catalog, $s, $s ]
+                        [$catalog, $s, $s]
                     )
                 )->toArray();
                 foreach ($col as $row) {
-                    $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row;
-                    $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row;
+                    $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row;
+                    $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row;
                 }
             }
         }
@@ -110,12 +110,12 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM information_schema.columns WHERE table_name = ? AND table_schema = ? AND table_catalog = ?",
-                [ $table, $schema, $catalog ]
+                [$table, $schema, $catalog]
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['column_name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -123,7 +123,7 @@ 
                 switch ($v['data_type']) {
                     case 'character':
                     case 'character varying':
-                        $v['length'] = (int)$v['character_maximum_length'];
+                        $v['length'] = (int) $v['character_maximum_length'];
                         break;
                 }
                 return $v;
@@ -136,7 +136,7 @@ 
             ->query(
                 "SELECT constraint_name FROM information_schema.table_constraints
                 WHERE table_name = ? AND constraint_type = ? AND table_schema = ? AND table_catalog = ?",
-                [ $table, 'PRIMARY KEY', $schema, $catalog ]
+                [$table, 'PRIMARY KEY', $schema, $catalog]
             ))
             ->pluck('constraint_name')
             ->value();
@@ -146,12 +146,12 @@ 
                 ->query(
                     "SELECT column_name FROM information_schema.constraint_column_usage
                      WHERE table_name = ? AND constraint_name = ? AND table_schema = ? AND table_catalog = ?",
-                    [ $table, $pkname, $schema, $catalog ]
+                    [$table, $pkname, $schema, $catalog]
                 ))
                 ->pluck('column_name')
                 ->toArray();
         }
-        $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns($columns)
             ->setPrimaryKey($primary)
             ->setComment('');
@@ -162,7 +162,7 @@ 
             // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected)
             $relations = [];
             foreach ($relationsR[$table] ?? [] as $relation) {
-                $relations[$relation['constraint_name']]['table'] = $relation['table_schema'] . $relation['table_name'];
+                $relations[$relation['constraint_name']]['table'] = $relation['table_schema'].$relation['table_name'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['referenced_column_name']] =
                     $relation['column_name'];
             }
@@ -178,11 +178,11 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function ($v) use ($columns) {
+                        ->filter(function($v) use ($columns) {
                             return in_array($v['column_name'], $columns);
                         }) as $relation
                     ) {
-                        $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . $relation['referenced_table_name'];
+                        $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'.$relation['referenced_table_name'];
                         $foreign[$relation['constraint_name']]['keymap'][$relation['column_name']] =
                             $relation['referenced_column_name'];
                         $usedcol[] = $relation['column_name'];
@@ -198,7 +198,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -219,7 +219,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -235,8 +235,8 @@ 
             // assuming current table is linked to "one" record in the referenced table
             // resulting in a "belongsTo" relationship
             $relations = [];
-            foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) {
-                $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . $relation['referenced_table_name'];
+            foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'.$relation['referenced_table_name'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['column_name']] =
                     $relation['referenced_column_name'];
             }
@@ -249,7 +249,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -268,10 +268,10 @@ 
         return Collection::from($this
             ->query(
                 "SELECT table_name FROM information_schema.tables where table_schema = ? AND table_catalog = ?",
-                [ $this->connection['opts']['schema'] ?? 'public', $this->connection['name'] ]
+                [$this->connection['opts']['schema'] ?? 'public', $this->connection['name']]
             ))
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/driver/mysql/Schema.php

Spacing +28 added lines, -28 removed lines

@@ -28,8 +28,8 @@ 
             $table = $temp[1];
         }
 
-        if (isset($tables[$schema . '.' . $table])) {
-            return $tables[$schema . '.' . $table];
+        if (isset($tables[$schema.'.'.$table])) {
+            return $tables[$schema.'.'.$table];
         }
 
         static $comments = [];
@@ -37,10 +37,10 @@ 
             $comments[$schema] = Collection::from(
                 $this->query(
                     "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ?",
-                    [ $schema ]
+                    [$schema]
                 )
             )
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return $v['TABLE_NAME'];
             })
             ->pluck('TABLE_COMMENT')
@@ -60,7 +60,7 @@ 
                      WHERE
                         (TABLE_SCHEMA = ? OR REFERENCED_TABLE_SCHEMA = ?) AND
                         TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL",
-                    [ $main, $main ]
+                    [$main, $main]
                 )
             )->toArray();
             foreach ($col as $row) {
@@ -70,8 +70,8 @@ 
                 if ($row['REFERENCED_TABLE_SCHEMA'] !== $main) {
                     $additional[] = $row['REFERENCED_TABLE_SCHEMA'];
                 }
-                $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row;
-                $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row;
+                $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row;
+                $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row;
             }
             foreach (array_filter(array_unique($additional)) as $s) {
                 $col = Collection::from(
@@ -81,12 +81,12 @@ 
                         WHERE
                             TABLE_SCHEMA = ? AND REFERENCED_TABLE_SCHEMA = ? AND
                             TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL",
-                        [ $s, $s ]
+                        [$s, $s]
                     )
                 )->toArray();
                 foreach ($col as $row) {
-                    $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row;
-                    $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row;
+                    $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row;
+                    $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row;
                 }
             }
         }
@@ -95,14 +95,14 @@ 
         if (!count($columns)) {
             throw new DBException('Table not found by name');
         }
-        $tables[$schema . '.' . $table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns(
                 $columns
                     ->clone()
-                    ->mapKey(function ($v) {
+                    ->mapKey(function($v) {
                         return $v['Field'];
                     })
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $v['length'] = null;
                         if (!isset($v['Type'])) {
                             return $v;
@@ -124,7 +124,7 @@ 
                             default:
                                 if (strpos($type, 'char') !== false && strpos($type, '(') !== false) {
                                     // extract length from varchar
-                                    $v['length'] = (int)explode(')', explode('(', $type)[1])[0];
+                                    $v['length'] = (int) explode(')', explode('(', $type)[1])[0];
                                     $v['length'] = $v['length'] > 0 ? $v['length'] : null;
                                 }
                                 break;
@@ -136,7 +136,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function ($v) {
+                    ->filter(function($v) {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -149,8 +149,8 @@ 
             // assuming current table is on the "one" end having "many" records in the referencing table
             // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected)
             $relations = [];
-            foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'] . '.' . $relation['TABLE_NAME'];
+            foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'].'.'.$relation['TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['REFERENCED_COLUMN_NAME']] =
                     $relation['COLUMN_NAME'];
             }
@@ -166,10 +166,10 @@ 
                 $usedcol = [];
                 if (count($columns)) {
                     foreach (Collection::from($relationsT[$data['table']] ?? [])
-                        ->filter(function ($v) use ($columns) {
+                        ->filter(function($v) use ($columns) {
                             return in_array($v['COLUMN_NAME'], $columns);
                         })
-                        ->map(function ($v) {
+                        ->map(function($v) {
                             $new = [];
                             foreach ($v as $kk => $vv) {
                                 $new[strtoupper($kk)] = $vv;
@@ -177,7 +177,7 @@ 
                             return $new;
                         }) as $relation
                     ) {
-                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                        $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'.$relation['REFERENCED_TABLE_NAME'];
                         $foreign[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] =
                             $relation['REFERENCED_COLUMN_NAME'];
                         $usedcol[] = $relation['COLUMN_NAME'];
@@ -193,7 +193,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -214,7 +214,7 @@ 
                     $orig = $relname;
                     $cntr = 1;
                     while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -230,8 +230,8 @@ 
             // assuming current table is linked to "one" record in the referenced table
             // resulting in a "belongsTo" relationship
             $relations = [];
-            foreach (Collection::from($relationsT[$schema . '.' . $table] ?? [])
-                ->map(function ($v) {
+            foreach (Collection::from($relationsT[$schema.'.'.$table] ?? [])
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -239,7 +239,7 @@ 
                     return $new;
                 }) as $relation
             ) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME'];
+                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'.$relation['REFERENCED_TABLE_NAME'];
                 $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] =
                     $relation['REFERENCED_COLUMN_NAME'];
             }
@@ -252,7 +252,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -273,7 +273,7 @@ 
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
                 [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -281,7 +281,7 @@ 
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

src/schema/Mapper.php

Spacing +6 added lines, -7 removed lines

@@ -52,7 +52,7 @@ 
     public function collection(TableQueryIterator $iterator, Table $definition) : Collection
     {
         return Collection::from($iterator)
-            ->map(function ($v) use ($definition) {
+            ->map(function($v) use ($definition) {
                 return $this->entity($definition, $v);
             });
     }
@@ -127,7 +127,7 @@ 
         $definition = $entity->definition();
         foreach ($definition->getColumns() as $column) {
             if (!array_key_exists($column, $data)) {
-                $entity->__lazyProperty($column, function () use ($definition, $primary, $column) {
+                $entity->__lazyProperty($column, function() use ($definition, $primary, $column) {
                     $query = $this->db->table($definition->getFullName());
                     foreach ($primary as $k => $v) {
                         $query->filter($k, $v);
@@ -141,12 +141,12 @@ 
                 $name,
                 array_key_exists($name, $data) && isset($data[$name]) ?
                     ($relation->many ?
-                        array_map(function ($v) use ($relation) {
+                        array_map(function($v) use ($relation) {
                             return $this->entity($relation->table, $v);
                         }, $data[$name]) :
                         $this->entity($relation->table, $data[$name])
                     ) :
-                    function (array $columns = null) use ($entity, $definition, $relation, $data) {
+                    function(array $columns = null) use ($entity, $definition, $relation, $data) {
                         $query = $this->db->table($relation->table->getFullName(), true);
                         if ($columns !== null) {
                             $query->columns($columns);
@@ -172,7 +172,7 @@ 
                                 );
                             }
                             foreach ($definition->getPrimaryKey() as $v) {
-                                $query->filter($nm . '.' . $v, $data[$v] ?? null);
+                                $query->filter($nm.'.'.$v, $data[$v] ?? null);
                             }
                         } else {
                             foreach ($relation->keymap as $k => $v) {
@@ -180,8 +180,7 @@ 
                             }
                         }
                         return $relation->many ?
-                            $query->iterator() :
-                            $query[0];
+                            $query->iterator() : $query[0];
                     }
             );
         }

src/schema/Table.php

Spacing +3 added lines, -3 removed lines

@@ -82,7 +82,7 @@ 
     public function setPrimaryKey($column) : Table
     {
         if (!is_array($column)) {
-            $column = [ $column ];
+            $column = [$column];
         }
         $this->data['primary'] = $column;
         return $this;
@@ -109,7 +109,7 @@ 
      */
     public function getFullName()
     {
-        return ($this->data['schema'] ? $this->data['schema'] . '.' : '') . $this->data['name'];
+        return ($this->data['schema'] ? $this->data['schema'].'.' : '').$this->data['name'];
     }
     /**
      * Get a column definition
@@ -184,7 +184,7 @@ 
         }
 
         if (!isset($name)) {
-            $name = $toTable->getName() . '_' . implode('_', array_keys($keymap));
+            $name = $toTable->getName().'_'.implode('_', array_keys($keymap));
         }
         $this->addRelation(new TableRelation(
             $name,

src/schema/TableQuery.php

Spacing +188 added lines, -192 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->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');
@@ -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 {
@@ -128,26 +128,26 @@ 
             if ($this->definition->hasRelation(implode('.', $column))) {
                 $this->with(implode('.', $column));
                 $col = $this->definition->getRelation(implode('.', $column))->table->getColumn($name);
-                $column = [ implode('.', $column), $name ];
+                $column = [implode('.', $column), $name];
             } else {
                 $this->with(implode('.', $column));
                 $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;
         }
@@ -157,7 +157,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;
                     }
@@ -170,7 +170,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':
@@ -178,7 +178,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;
                     }
@@ -191,7 +191,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':
@@ -199,7 +199,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;
                     }
@@ -207,23 +207,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());
                 }
@@ -245,35 +245,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 ?
@@ -283,8 +280,7 @@ 
                         $this->normalizeValue($column, $value['beg']),
                         $this->normalizeValue($column, $value['end'])
                     ]
-                ] :
-                [
+                ] : [
                     $name.' BETWEEN ? AND ?',
                     [
                         $this->normalizeValue($column, $value['beg']),
@@ -296,38 +292,38 @@ 
             $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) {
+                $name.' NOT IN (??)',
+                [array_map(function($v) use ($column) {
                     return $this->normalizeValue($column, $v);
-                }, $value) ]
+                }, $value)]
             ] :
             [
-                $name . ' IN (??)',
-                [ array_map(function ($v) use ($column) {
+                $name.' IN (??)',
+                [array_map(function($v) use ($column) {
                     return $this->normalizeValue($column, $v);
-                }, $value) ]
+                }, $value)]
             ];
     }
     /**
@@ -358,7 +354,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
@@ -376,7 +372,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
@@ -386,7 +382,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)
@@ -396,7 +392,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'];
@@ -438,7 +434,7 @@ 
         $this->order = [];
         $this->having = [];
         $this->aliases = [];
-        $this->li_of = [0,0,0];
+        $this->li_of = [0, 0, 0];
         $this->qiterator = null;
         return $this;
     }
@@ -451,7 +447,7 @@ 
     public function groupBy(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->group = [ $sql, $params ];
+        $this->group = [$sql, $params];
         return $this;
     }
     /**
@@ -464,7 +460,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');
@@ -473,7 +469,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;
     }
@@ -486,7 +482,7 @@ 
     public function where(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->where[] = [ $sql, $params ];
+        $this->where[] = [$sql, $params];
         return $this;
     }
     /**
@@ -498,7 +494,7 @@ 
     public function having(string $sql, array $params = []) : self
     {
         $this->qiterator = null;
-        $this->having[] = [ $sql, $params ];
+        $this->having[] = [$sql, $params];
         return $this;
     }
     /**
@@ -522,7 +518,7 @@ 
                 $name = null;
             }
         }
-        $this->order = [ $sql, $params, $name ];
+        $this->order = [$sql, $params, $name];
         return $this;
     }
     /**
@@ -534,7 +530,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;
     }
     /**
@@ -544,9 +540,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->getFullName();
         $sql = 'SELECT COUNT(DISTINCT '.$table.'.'.implode(', '.$table.'.', $this->pkey).') FROM '.$table.' ';
@@ -560,35 +556,35 @@ 
         $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 ];
+            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 ];
+                    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);
                     }
                 }
             }
@@ -604,13 +600,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 ';
@@ -619,38 +615,38 @@ 
                     $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).' ';
         }
         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).' ';
@@ -684,7 +680,7 @@ 
                     $this->with(implode('.', $temp));
                     $table = array_reduce(
                         $temp,
-                        function ($carry, $item) use (&$table) {
+                        function($carry, $item) use (&$table) {
                             return $table->getRelation($item)->table;
                         }
                     );
@@ -693,7 +689,7 @@ 
                 }
                 unset($fields[$k]);
                 foreach ($cols as $col) {
-                    $fields[] = $table . '.' . $col;
+                    $fields[] = $table.'.'.$col;
                 }
             }
         }
@@ -727,9 +723,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) {
@@ -745,7 +741,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);
 
@@ -756,38 +752,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
                         );
                     }
@@ -796,11 +792,11 @@ 
         }
         $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 '.$this->definition->getFullName().' ';
@@ -819,13 +815,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);
 
@@ -835,22 +831,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();
@@ -858,9 +854,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) {
@@ -872,51 +868,51 @@ 
                         $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($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 .= (count($o) ? ', ' : 'ORDER BY ') . implode(', ', $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];
@@ -924,16 +920,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(
@@ -983,8 +979,8 @@ 
                 $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 {
@@ -1016,9 +1012,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 ';
@@ -1027,7 +1023,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];
@@ -1051,7 +1047,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];
@@ -1070,18 +1066,18 @@ 
         $table = $this->definition;
         if ($table->hasRelation($relation)) {
             $temp = $table->getRelation($relation);
-            $this->withr[$relation] = [ $temp, $table->getName() ];
+            $this->withr[$relation] = [$temp, $table->getName()];
         } else {
             $parts = explode('.', $relation);
             array_reduce(
                 $parts,
-                function ($carry, $item) use (&$table) {
+                function($carry, $item) use (&$table) {
                     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;
-                    $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;
                 }
@@ -1127,9 +1123,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();
@@ -1141,65 +1137,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];
@@ -1210,13 +1206,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 ';
@@ -1225,37 +1221,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).' ';
@@ -1263,38 +1259,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___']);
             }