vakata / database

src/driver/postgre/Schema.php

Spacing +29 added lines, -29 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 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'];
@@ -184,11 +184,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'];
@@ -208,7 +208,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -233,7 +233,7 @@ 
                         $definition->getName() == $relname ||
                         $definition->getColumn($relname)
                     ) {
-                        $relname = $orig . '_' . (++ $cntr);
+                        $relname = $orig.'_'.(++$cntr);
                     }
                     $definition->addRelation(
                         new TableRelation(
@@ -250,8 +250,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'];
@@ -268,7 +268,7 @@ 
                     $definition->getName() == $relname ||
                     $definition->getColumn($relname)
                 ) {
-                    $relname = $orig . '_' . (++ $cntr);
+                    $relname = $orig.'_'.(++$cntr);
                 }
                 $definition->addRelation(
                     new TableRelation(
@@ -288,19 +288,19 @@ 
         $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();
 
         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/oracle/Schema.php

Spacing +26 added lines, -26 removed lines

@@ -32,19 +32,19 @@ 
         $columns = Collection::from($this
             ->query(
                 "SELECT * FROM all_tab_cols WHERE UPPER(table_name) = ? AND UPPER(owner) = ?",
-                [ strtoupper($table), strtoupper($this->name()) ]
+                [strtoupper($table), strtoupper($this->name())]
             ))
-            ->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 all_constraints
                 WHERE table_name = ? AND constraint_type = ? AND UPPER(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;
@@ -90,9 +90,9 @@ 
                 ->query(
                     "SELECT column_name FROM all_cons_columns
                     WHERE table_name = ? AND constraint_name = ? AND UPPER(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;
@@ -121,9 +121,9 @@ 
                         UPPER(ac.OWNER) = ? AND UPPER(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;
@@ -133,7 +133,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) {
@@ -164,9 +164,9 @@ 
                                 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;
@@ -186,9 +186,9 @@ 
                         ->query(
                             "SELECT COLUMN_NAME FROM all_cons_columns
                              WHERE UPPER(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;
@@ -203,7 +203,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(
@@ -220,7 +220,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(
@@ -249,9 +249,9 @@ 
                     LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
                     WHERE UPPER(ac.OWNER) = ? AND UPPER(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;
@@ -269,9 +269,9 @@ 
                     ->query(
                         "SELECT COLUMN_NAME FROM all_cons_columns
                          WHERE UPPER(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;
@@ -286,7 +286,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(
@@ -310,18 +310,18 @@ 
                  SELECT VIEW_NAME AS TABLE_NAME FROM ALL_VIEWS where UPPER(OWNER) = ?",
                 [strtoupper($this->connection['name']), strtoupper($this->connection['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 strtolower($v['TABLE_NAME']);
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v)->toLowerCase();
             })
             ->toArray();