vakata / database

src/driver/mysql/Schema.php

Spacing +31 added lines, -31 removed lines

@@ -27,8 +27,8 @@ 
             $table = $temp[1];
         }
 
-        if (isset($tables[$schema . '.' . $table])) {
-            return $tables[$schema . '.' . $table];
+        if (isset($tables[$schema.'.'.$table])) {
+            return $tables[$schema.'.'.$table];
         }
 
         static $comments = [];
@@ -36,10 +36,10 @@ 
             $comments[$schema] = Collection::from(
                 $this->query(
                     "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ?",
-                    [ $schema ]
+                    [$schema]
                 )
             )
-            ->mapKey(function (array $v): string {
+            ->mapKey(function(array $v): string {
                 return $v['TABLE_NAME'];
             })
             ->pluck('TABLE_COMMENT')
@@ -61,7 +61,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) {
@@ -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(
@@ -84,12 +84,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;
                 }
             }
         }
@@ -98,14 +98,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 (array $v): string {
+                    ->mapKey(function(array $v): string {
                         return $v['Field'];
                     })
-                    ->map(function (array $v): array {
+                    ->map(function(array $v): array {
                         $v['length'] = null;
                         if (!isset($v['Type'])) {
                             return $v;
@@ -127,7 +127,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;
@@ -139,7 +139,7 @@ 
             ->setPrimaryKey(
                 $columns
                     ->clone()
-                    ->filter(function (array $v): bool {
+                    ->filter(function(array $v): bool {
                         return $v['Key'] === 'PRI';
                     })
                     ->pluck('Field')
@@ -153,8 +153,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 (array $v): array {
+            foreach (Collection::from($relationsT[$schema.'.'.$table] ?? [])
+                ->map(function(array $v): array {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -162,7 +162,7 @@ 
                     return $new;
                 }) as $relation
             ) {
-                $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' .
+                $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'];
@@ -176,7 +176,7 @@ 
                 $orig = $relname;
                 $cntr = 1;
                 while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -192,13 +192,13 @@ 
             // 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'] . '.' .
+            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'];
             }
-            foreach ([ true, false ] as $pivot) {
+            foreach ([true, false] as $pivot) {
                 foreach ($relations as $data) {
                     $rtable = $this->table($data['table'], true);
                     $columns = [];
@@ -211,10 +211,10 @@ 
                     $usedcol = [];
                     if (count($columns)) {
                         foreach (Collection::from($relationsT[$data['table']] ?? [])
-                            ->filter(function (array $v) use ($columns): bool {
+                            ->filter(function(array $v) use ($columns): bool {
                                 return in_array($v['COLUMN_NAME'], $columns);
                             })
-                            ->map(function (array $v): array {
+                            ->map(function(array $v): array {
                                 $new = [];
                                 foreach ($v as $kk => $vv) {
                                     $new[strtoupper($kk)] = $vv;
@@ -222,7 +222,7 @@ 
                                 return $new;
                             }) as $relation
                         ) {
-                            $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' .
+                            $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'];
@@ -239,7 +239,7 @@ 
                         $orig = $relname;
                         $cntr = 1;
                         while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -265,7 +265,7 @@ 
                         $orig = $relname;
                         $cntr = 1;
                         while ($definition->hasRelation($relname) || $definition->getName() == $relname) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -294,23 +294,23 @@ 
                 "SELECT table_name FROM information_schema.tables where table_schema = ?",
                 [$this->connection['opts']['schema'] ?? $this->connection['name']]
             ))
-            ->map(function (array $v): array {
+            ->map(function(array $v): array {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function (array $v): string {
+            ->mapKey(function(array $v): string {
                 return strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function (string $v): Table {
+            ->map(function(string $v): Table {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? $this->connection['name']) . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? $this->connection['name']).'.'.$k] = &$tables[$k];
         }
         return $tables;
     }

src/driver/postgre/Schema.php

Spacing +38 added lines, -38 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;
                 }
             }
         }
@@ -114,12 +114,12 @@ 
             ->query(
                 "SELECT * FROM information_schema.columns
                  WHERE table_name = ? AND table_schema = ? AND table_catalog = ?",
-                [ $table, $schema, $catalog ]
+                [$table, $schema, $catalog]
             ))
-            ->mapKey(function ($v): string {
+            ->mapKey(function($v): string {
                 return $v['column_name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['data_type'])) {
                     return $v;
@@ -127,7 +127,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;
                 }
                 $v['hidden'] = $v['is_identity'] !== 'YES' && $v['is_generated'] === 'ALWAYS';
@@ -135,13 +135,13 @@ 
             })
             ->toArray();
         if (!count($columns)) {
-            throw new DBException('Table not found by name: ' . implode('.', [$schema,$table]));
+            throw new DBException('Table not found by name: '.implode('.', [$schema, $table]));
         }
         $pkname = Collection::from($this
             ->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();
@@ -151,12 +151,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('');
@@ -166,8 +166,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'] . '.' .
+            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'];
@@ -184,7 +184,7 @@ 
                     $definition->getName() == $relname ||
                     $definition->getColumn($relname)
                 ) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -200,13 +200,13 @@ 
             // 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'] . '.' .
+            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'];
             }
-            foreach ([ true, false ] as $pivot) {
+            foreach ([true, false] as $pivot) {
                 foreach ($relations as $data) {
                     $rtable = $this->table($data['table'], true);
                     $columns = [];
@@ -219,11 +219,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'] . '.' .
+                            $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'];
@@ -243,7 +243,7 @@ 
                             $definition->getName() == $relname ||
                             $definition->getColumn($relname)
                         ) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -272,7 +272,7 @@ 
                             $definition->getName() == $relname ||
                             $definition->getColumn($relname)
                         ) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -323,20 +323,20 @@ 
                     attr.attnum > 0
                  order by
                     attr.attnum",
-                [ $table, $schema ]
+                [$table, $schema]
             ))
-            ->mapKey(function ($v): string {
+            ->mapKey(function($v): string {
                 return $v['column_name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 return $v;
             })
             ->toArray();
         if (!count($columns)) {
-            throw new DBException('View not found by name: ' . implode('.', [$schema,$table]));
+            throw new DBException('View not found by name: '.implode('.', [$schema, $table]));
         }
-        $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns($columns)
             ->setComment('');
         return $definition;
@@ -346,13 +346,13 @@ 
         $tables = 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']]
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['table_name']);
             })
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();
@@ -363,19 +363,19 @@ 
                  FROM pg_catalog.pg_class cls
                  join pg_catalog.pg_namespace as ns on ns.oid = cls.relnamespace
                  WHERE cls.relkind = 'm' and ns.nspname = ?",
-                [ $this->connection['opts']['schema'] ?? 'public' ]
+                [$this->connection['opts']['schema'] ?? 'public']
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['table_name']);
             })
             ->pluck('table_name')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->view($v)->toLowerCase();
             })
             ->toArray();
         $tables = array_merge($views, $tables);
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? 'public') . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? 'public').'.'.$k] = &$tables[$k];
         }
         return $tables;
     }

src/driver/sqlite/Schema.php

Spacing +23 added lines, -23 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;
@@ -53,8 +53,8 @@ 
                             ]
                         )
                     );
-                    $relationsT['main.' . $row['table']][] = $row;
-                    $relationsR['main.' . $row['referenced_table']][] = $row;
+                    $relationsT['main.'.$row['table']][] = $row;
+                    $relationsR['main.'.$row['referenced_table']][] = $row;
                 }
             }
         }
@@ -64,10 +64,10 @@ 
          */
         $columns = Collection::from($this
             ->query("PRAGMA table_info(".$table.")"))
-            ->mapKey(function ($v): string {
+            ->mapKey(function($v): string {
                 return $v['name'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['type'])) {
                     return $v;
@@ -77,7 +77,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;
@@ -86,15 +86,15 @@ 
             })
             ->toArray();
         if (!count($columns)) {
-            throw new DBException('Table not found by name: ' . implode('.', [$schema,$table]));
+            throw new DBException('Table not found by name: '.implode('.', [$schema, $table]));
         }
         $primary = [];
         foreach ($columns as $column) {
-            if ((int)$column['pk']) {
+            if ((int) $column['pk']) {
                 $primary[] = $column['name'];
             }
         }
-        $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema))
+        $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema))
             ->addColumns($columns)
             ->setPrimaryKey($primary)
             ->setComment('');
@@ -104,8 +104,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'] = 'main.' . $relation['referenced_table'];
+            foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) {
+                $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['referenced_table'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to'];
             }
             foreach ($relations as $name => $data) {
@@ -120,7 +120,7 @@ 
                     $definition->getName() == $relname ||
                     $definition->getColumn($relname)
                 ) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -136,11 +136,11 @@ 
             // 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 $k => $relation) {
-                $relations[$relation['constraint_name']]['table'] = 'main.' . $relation['table'];
+            foreach ($relationsR[$schema.'.'.$table] ?? [] as $k => $relation) {
+                $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['table'];
                 $relations[$relation['constraint_name']]['keymap'][$relation['to']] = $relation['from'];
             }
-            foreach ([ true, false ] as $pivot) {
+            foreach ([true, false] as $pivot) {
                 foreach ($relations as $data) {
                     $rtable = $this->table($data['table'], true);
                     $columns = [];
@@ -153,11 +153,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['from'], $columns);
                             }) as $relation
                         ) {
-                            $foreign[$relation['constraint_name']]['table'] = 'main.' .
+                            $foreign[$relation['constraint_name']]['table'] = 'main.'.
                                 $relation['referenced_table'];
                             $foreign[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to'];
                             $usedcol[] = $relation['from'];
@@ -176,7 +176,7 @@ 
                             $definition->getName() == $relname ||
                             $definition->getColumn($relname)
                         ) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -205,7 +205,7 @@ 
                             $definition->getName() == $relname ||
                             $definition->getColumn($relname)
                         ) {
-                            $relname = $orig . '_' . (++ $cntr);
+                            $relname = $orig.'_'.(++$cntr);
                         }
                         $definition->addRelation(
                             new TableRelation(
@@ -234,9 +234,9 @@ 
                 "SELECT tbl_name
                  FROM sqlite_schema
                  WHERE (type = ? OR type = ?) AND tbl_name NOT LIKE 'sqlite_%';",
-                [ 'table', 'view' ]
+                ['table', 'view']
             ))
-            ->mapKey(function ($v) {
+            ->mapKey(function($v) {
                 return strtolower($v['tbl_name']);
             })
             ->pluck('tbl_name')
@@ -245,7 +245,7 @@ 
             $tables[$k] = $this->table($v, true, array_keys($tables))->toLowerCase();
         }
         foreach (array_keys($tables) as $k) {
-            $tables[($this->connection['opts']['schema'] ?? 'main') . '.' . $k] = &$tables[$k];
+            $tables[($this->connection['opts']['schema'] ?? 'main').'.'.$k] = &$tables[$k];
         }
         return $tables;
     }

src/driver/oracle/Schema.php

Spacing +27 added lines, -27 removed lines

@@ -32,19 +32,19 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM user_tab_cols WHERE UPPER(table_name) = ?",
-                [ strtoupper($table) ]
+                [strtoupper($table)]
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
                 }
                 return $new;
             })
-            ->mapKey(function ($v): string {
+            ->mapKey(function($v): string {
                 return $v['COLUMN_NAME'];
             })
-            ->map(function ($v) {
+            ->map(function($v) {
                 $v['length'] = null;
                 if (!isset($v['DATA_TYPE'])) {
                     return $v;
@@ -56,7 +56,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;
@@ -73,9 +73,9 @@ 
             ->query(
                 "SELECT constraint_name FROM user_constraints
                 WHERE table_name = ? AND constraint_type = ?",
-                [ strtoupper($table), 'P' ]
+                [strtoupper($table), 'P']
             ))
-            ->map(function ($v) {
+            ->map(function($v) {
                 $new = [];
                 foreach ($v as $kk => $vv) {
                     $new[strtoupper($kk)] = $vv;
@@ -90,9 +90,9 @@ 
                 ->query(
                     "SELECT column_name FROM user_cons_columns
                     WHERE table_name = ? AND constraint_name = ?",
-                    [ strtoupper($table), $pkname ]
+                    [strtoupper($table), $pkname]
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -124,9 +124,9 @@ 
                     LEFT JOIN user_cons_columns cc ON cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ strtoupper($table), 'R' ]
+                    [strtoupper($table), 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -144,9 +144,9 @@ 
                     ->query(
                         "SELECT COLUMN_NAME FROM user_cons_columns
                          WHERE CONSTRAINT_NAME = ? ORDER BY POSITION",
-                        [ current($data['keymap']) ]
+                        [current($data['keymap'])]
                     ))
-                    ->map(function ($v) {
+                    ->map(function($v) {
                         $new = [];
                         foreach ($v as $kk => $vv) {
                             $new[strtoupper($kk)] = $vv;
@@ -161,7 +161,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(
@@ -185,9 +185,9 @@ 
                     WHERE
                         ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
                     ORDER BY cc.POSITION",
-                    [ $pkname, 'R' ]
+                    [$pkname, 'R']
                 ))
-                ->map(function ($v) {
+                ->map(function($v) {
                     $new = [];
                     foreach ($v as $kk => $vv) {
                         $new[strtoupper($kk)] = $vv;
@@ -197,10 +197,10 @@ 
                  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 ([ true, false ] as $pivot) {
+            foreach ([true, false] as $pivot) {
                 foreach ($relations as $data) {
                     $rtable = $this->table($data['table'], true);
                     $columns = [];
@@ -228,9 +228,9 @@ 
                                     ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
                                     cc.COLUMN_NAME IN (??)
                                 ORDER BY POSITION",
-                                [ $data['table'], 'R', $columns ]
+                                [$data['table'], 'R', $columns]
                             ))
-                            ->map(function ($v) {
+                            ->map(function($v) {
                                 $new = [];
                                 foreach ($v as $kk => $vv) {
                                     $new[strtoupper($kk)] = $vv;
@@ -250,9 +250,9 @@ 
                             ->query(
                                 "SELECT COLUMN_NAME FROM user_cons_columns
                                 WHERE CONSTRAINT_NAME = ? ORDER BY POSITION",
-                                [ current($foreign['keymap']) ]
+                                [current($foreign['keymap'])]
                             ))
-                            ->map(function ($v) {
+                            ->map(function($v) {
                                 $new = [];
                                 foreach ($v as $kk => $vv) {
                                     $new[strtoupper($kk)] = $vv;
@@ -267,7 +267,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(
@@ -288,7 +288,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(
@@ -319,18 +319,18 @@ 
                  SELECT VIEW_NAME AS TABLE_NAME FROM USER_VIEWS",
                 []
             ))
-            ->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 strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();