Inspection of "improved oracle relation detection" - vakata/database - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( de35d3...e5c5d6 )

by Ivan

created 2020-09-04 10:22 UTC

Status

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -29,19 +29,19 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
             ->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 @@  discard block
 block discarded – undo
                 ->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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
                  as $relation
             ) {
                 $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
-                $relations[$relation['CONSTRAINT_NAME']]['keymap'][strtoupper($primary[(int)$relation['POSITION']-1])] =
+                $relations[$relation['CONSTRAINT_NAME']]['keymap'][strtoupper($primary[(int) $relation['POSITION'] - 1])] =
                     strtoupper($relation['COLUMN_NAME']);
             }
             foreach ($relations as $data) {
@@ -157,9 +157,9 @@  discard block
 block discarded – undo
                                 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 @@  discard block
 block discarded – undo
                         ->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 @@  discard block
 block discarded – undo
                     $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 @@  discard block
 block discarded – undo
                     $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 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
                     ->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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
                 "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 @@  discard block
 block discarded – undo
                 return $new;
             })
             ->pluck('TABLE_NAME')
-            ->map(function ($v) {
+            ->map(function($v) {
                 return $this->table($v);
             })
             ->toArray();

Please login to merge, or discard this patch.

		@@ -124,7 +124,7 @@
		block discarded – undo
124	124	}
125	125	return $new;
126	126	})
127		- as $relation
	127	+ as $relation
128	128	) {
129	129	$relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
130	130	$relations[$relation['CONSTRAINT_NAME']]['keymap'][strtoupper($primary[(int)$relation['POSITION']-1])] =

		@@ -29,19 +29,19 @@ discard block
		block discarded – undo
29	29	$columns = Collection::from($this
30	30	->query(
31	31	"SELECT * FROM all_tab_cols WHERE table_name = ? AND owner = ?",
32		- [ strtoupper($table), $this->name() ]
	32	+ [strtoupper($table), $this->name()]
33	33	))
34		- ->map(function ($v) {
	34	+ ->map(function($v) {
35	35	$new = [];
36	36	foreach ($v as $kk => $vv) {
37	37	$new[strtoupper($kk)] = $vv;
38	38	}
39	39	return $new;
40	40	})
41		- ->mapKey(function ($v) {
	41	+ ->mapKey(function($v) {
42	42	return $v['COLUMN_NAME'];
43	43	})
44		- ->map(function ($v) {
	44	+ ->map(function($v) {
45	45	$v['length'] = null;
46	46	if (!isset($v['DATA_TYPE'])) {
47	47	return $v;
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	default:
54	54	if (strpos($type, 'char') !== false && strpos($type, '(') !== false) {
55	55	// extract length from varchar
56		- $v['length'] = (int)explode(')', (explode('(', $type)[1] ?? ''))[0];
	56	+ $v['length'] = (int) explode(')', (explode('(', $type)[1] ?? ''))[0];
57	57	$v['length'] = $v['length'] > 0 ? $v['length'] : null;
58	58	}
59	59	break;
		@@ -69,9 +69,9 @@ discard block
		block discarded – undo
69	69	->query(
70	70	"SELECT constraint_name FROM all_constraints
71	71	WHERE table_name = ? AND constraint_type = ? AND owner = ?",
72		- [ strtoupper($table), 'P', $owner ]
	72	+ [strtoupper($table), 'P', $owner]
73	73	))
74		- ->map(function ($v) {
	74	+ ->map(function($v) {
75	75	$new = [];
76	76	foreach ($v as $kk => $vv) {
77	77	$new[strtoupper($kk)] = $vv;
		@@ -86,9 +86,9 @@ discard block
		block discarded – undo
86	86	->query(
87	87	"SELECT column_name FROM all_cons_columns
88	88	WHERE table_name = ? AND constraint_name = ? AND owner = ?",
89		- [ strtoupper($table), $pkname, $owner ]
	89	+ [strtoupper($table), $pkname, $owner]
90	90	))
91		- ->map(function ($v) {
	91	+ ->map(function($v) {
92	92	$new = [];
93	93	foreach ($v as $kk => $vv) {
94	94	$new[strtoupper($kk)] = $vv;
		@@ -115,9 +115,9 @@ discard block
		block discarded – undo
115	115	LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
116	116	WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ?
117	117	ORDER BY cc.POSITION",
118		- [ $owner, $owner, $pkname, 'R' ]
	118	+ [$owner, $owner, $pkname, 'R']
119	119	))
120		- ->map(function ($v) {
	120	+ ->map(function($v) {
121	121	$new = [];
122	122	foreach ($v as $kk => $vv) {
123	123	$new[strtoupper($kk)] = $vv;
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	as $relation
128	128	) {
129	129	$relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME'];
130		- $relations[$relation['CONSTRAINT_NAME']]['keymap'][strtoupper($primary[(int)$relation['POSITION']-1])] =
	130	+ $relations[$relation['CONSTRAINT_NAME']]['keymap'][strtoupper($primary[(int) $relation['POSITION'] - 1])] =
131	131	strtoupper($relation['COLUMN_NAME']);
132	132	}
133	133	foreach ($relations as $data) {
		@@ -157,9 +157,9 @@ discard block
		block discarded – undo
157	157	ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND
158	158	cc.COLUMN_NAME IN (??)
159	159	ORDER BY POSITION",
160		- [ $owner, $owner, $data['table'], 'R', $columns ]
	160	+ [$owner, $owner, $data['table'], 'R', $columns]
161	161	))
162		- ->map(function ($v) {
	162	+ ->map(function($v) {
163	163	$new = [];
164	164	foreach ($v as $kk => $vv) {
165	165	$new[strtoupper($kk)] = $vv;
		@@ -179,9 +179,9 @@ discard block
		block discarded – undo
179	179	->query(
180	180	"SELECT COLUMN_NAME FROM all_cons_columns
181	181	WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
182		- [ $owner, current($foreign['keymap']) ]
	182	+ [$owner, current($foreign['keymap'])]
183	183	))
184		- ->map(function ($v) {
	184	+ ->map(function($v) {
185	185	$new = [];
186	186	foreach ($v as $kk => $vv) {
187	187	$new[strtoupper($kk)] = $vv;
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	$relname = $foreign['table'];
197	197	$cntr = 1;
198	198	while ($definition->hasRelation($relname) \|\| $definition->getName() == $relname) {
199		- $relname = $foreign['table'] . '_' . (++ $cntr);
	199	+ $relname = $foreign['table'].'_'.(++$cntr);
200	200	}
201	201	$definition->addRelation(
202	202	new TableRelation(
		@@ -212,7 +212,7 @@ discard block
		block discarded – undo
212	212	$relname = $data['table'];
213	213	$cntr = 1;
214	214	while ($definition->hasRelation($relname) \|\| $definition->getName() == $relname) {
215		- $relname = $data['table'] . '_' . (++ $cntr);
	215	+ $relname = $data['table'].'_'.(++$cntr);
216	216	}
217	217	$definition->addRelation(
218	218	new TableRelation(
		@@ -240,9 +240,9 @@ discard block
		block discarded – undo
240	240	LEFT JOIN all_cons_columns cc ON cc.OWNER = ac.OWNER AND cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME
241	241	WHERE ac.OWNER = ? AND ac.R_OWNER = ? AND ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ?
242	242	ORDER BY cc.POSITION",
243		- [ $owner, $owner, strtoupper($table), 'R' ]
	243	+ [$owner, $owner, strtoupper($table), 'R']
244	244	))
245		- ->map(function ($v) {
	245	+ ->map(function($v) {
246	246	$new = [];
247	247	foreach ($v as $kk => $vv) {
248	248	$new[strtoupper($kk)] = $vv;
		@@ -260,9 +260,9 @@ discard block
		block discarded – undo
260	260	->query(
261	261	"SELECT COLUMN_NAME FROM all_cons_columns
262	262	WHERE OWNER = ? AND CONSTRAINT_NAME = ? ORDER BY POSITION",
263		- [ $owner, current($data['keymap']) ]
	263	+ [$owner, current($data['keymap'])]
264	264	))
265		- ->map(function ($v) {
	265	+ ->map(function($v) {
266	266	$new = [];
267	267	foreach ($v as $kk => $vv) {
268	268	$new[strtoupper($kk)] = $vv;
		@@ -277,7 +277,7 @@ discard block
		block discarded – undo
277	277	$relname = $data['table'];
278	278	$cntr = 1;
279	279	while ($definition->hasRelation($relname) \|\| $definition->getName() == $relname) {
280		- $relname = $data['table'] . '_' . (++ $cntr);
	280	+ $relname = $data['table'].'_'.(++$cntr);
281	281	}
282	282	$definition->addRelation(
283	283	new TableRelation(
		@@ -298,7 +298,7 @@ discard block
		block discarded – undo
298	298	"SELECT TABLE_NAME FROM ALL_TABLES where OWNER = ?",
299	299	[$this->connection['name']]
300	300	))
301		- ->map(function ($v) {
	301	+ ->map(function($v) {
302	302	$new = [];
303	303	foreach ($v as $kk => $vv) {
304	304	$new[strtoupper($kk)] = $vv;
		@@ -306,7 +306,7 @@ discard block
		block discarded – undo
306	306	return $new;
307	307	})
308	308	->pluck('TABLE_NAME')
309		- ->map(function ($v) {
	309	+ ->map(function($v) {
310	310	return $this->table($v);
311	311	})
312	312	->toArray();

vakata / database

Push — master ( de35d3...e5c5d6 )

Status

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch