@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | $table = $temp[1]; |
28 | 28 | } |
29 | 29 | |
30 | - if (isset($tables[$schema . '.' . $table])) { |
|
31 | - return $tables[$schema . '.' . $table]; |
|
30 | + if (isset($tables[$schema.'.'.$table])) { |
|
31 | + return $tables[$schema.'.'.$table]; |
|
32 | 32 | } |
33 | 33 | |
34 | 34 | static $comments = []; |
@@ -36,10 +36,10 @@ discard block |
||
36 | 36 | $comments[$schema] = Collection::from( |
37 | 37 | $this->query( |
38 | 38 | "SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = ?", |
39 | - [ $schema ] |
|
39 | + [$schema] |
|
40 | 40 | ) |
41 | 41 | ) |
42 | - ->mapKey(function (array $v): string { |
|
42 | + ->mapKey(function(array $v): string { |
|
43 | 43 | return $v['TABLE_NAME']; |
44 | 44 | }) |
45 | 45 | ->pluck('TABLE_COMMENT') |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | WHERE |
62 | 62 | (TABLE_SCHEMA = ? OR REFERENCED_TABLE_SCHEMA = ?) AND |
63 | 63 | TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL", |
64 | - [ $main, $main ] |
|
64 | + [$main, $main] |
|
65 | 65 | ) |
66 | 66 | )->toArray(); |
67 | 67 | foreach ($col as $row) { |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | if ($row['REFERENCED_TABLE_SCHEMA'] !== $main) { |
72 | 72 | $additional[] = $row['REFERENCED_TABLE_SCHEMA']; |
73 | 73 | } |
74 | - $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row; |
|
75 | - $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row; |
|
74 | + $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row; |
|
75 | + $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row; |
|
76 | 76 | } |
77 | 77 | foreach (array_filter(array_unique($additional)) as $s) { |
78 | 78 | $col = Collection::from( |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | WHERE |
85 | 85 | TABLE_SCHEMA = ? AND REFERENCED_TABLE_SCHEMA = ? AND |
86 | 86 | TABLE_NAME IS NOT NULL AND REFERENCED_TABLE_NAME IS NOT NULL", |
87 | - [ $s, $s ] |
|
87 | + [$s, $s] |
|
88 | 88 | ) |
89 | 89 | )->toArray(); |
90 | 90 | foreach ($col as $row) { |
91 | - $relationsT[$row['TABLE_SCHEMA'] . '.' . $row['TABLE_NAME']][] = $row; |
|
92 | - $relationsR[$row['REFERENCED_TABLE_SCHEMA'] . '.' . $row['REFERENCED_TABLE_NAME']][] = $row; |
|
91 | + $relationsT[$row['TABLE_SCHEMA'].'.'.$row['TABLE_NAME']][] = $row; |
|
92 | + $relationsR[$row['REFERENCED_TABLE_SCHEMA'].'.'.$row['REFERENCED_TABLE_NAME']][] = $row; |
|
93 | 93 | } |
94 | 94 | } |
95 | 95 | |
@@ -99,14 +99,14 @@ discard block |
||
99 | 99 | if (!count($columns)) { |
100 | 100 | throw new DBException('Table not found by name'); |
101 | 101 | } |
102 | - $tables[$schema . '.' . $table] = $definition = (new Table($table, $schema)) |
|
102 | + $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema)) |
|
103 | 103 | ->addColumns( |
104 | 104 | $columns |
105 | 105 | ->clone() |
106 | - ->mapKey(function (array $v): string { |
|
106 | + ->mapKey(function(array $v): string { |
|
107 | 107 | return $v['Field']; |
108 | 108 | }) |
109 | - ->map(function (array $v): array { |
|
109 | + ->map(function(array $v): array { |
|
110 | 110 | $v['length'] = null; |
111 | 111 | if (!isset($v['Type'])) { |
112 | 112 | return $v; |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | default: |
129 | 129 | if (strpos($type, 'char') !== false && strpos($type, '(') !== false) { |
130 | 130 | // extract length from varchar |
131 | - $v['length'] = (int)explode(')', explode('(', $type)[1])[0]; |
|
131 | + $v['length'] = (int) explode(')', explode('(', $type)[1])[0]; |
|
132 | 132 | $v['length'] = $v['length'] > 0 ? $v['length'] : null; |
133 | 133 | } |
134 | 134 | break; |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | ->setPrimaryKey( |
141 | 141 | $columns |
142 | 142 | ->clone() |
143 | - ->filter(function (array $v): bool { |
|
143 | + ->filter(function(array $v): bool { |
|
144 | 144 | return $v['Key'] === 'PRI'; |
145 | 145 | }) |
146 | 146 | ->pluck('Field') |
@@ -151,20 +151,20 @@ discard block |
||
151 | 151 | |
152 | 152 | if ($detectRelations) { |
153 | 153 | $duplicated = []; |
154 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
155 | - $t = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . $relation['REFERENCED_TABLE_NAME']; |
|
154 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
155 | + $t = $relation['REFERENCED_TABLE_SCHEMA'].'.'.$relation['REFERENCED_TABLE_NAME']; |
|
156 | 156 | $duplicated[$t] = isset($duplicated[$t]); |
157 | 157 | } |
158 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
159 | - $t = $relation['TABLE_SCHEMA'] . '.' . $relation['TABLE_NAME']; |
|
158 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
159 | + $t = $relation['TABLE_SCHEMA'].'.'.$relation['TABLE_NAME']; |
|
160 | 160 | $duplicated[$t] = isset($duplicated[$t]); |
161 | 161 | } |
162 | 162 | // pivot relations where the current table is referenced |
163 | 163 | // assuming current table is on the "one" end having "many" records in the referencing table |
164 | 164 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
165 | 165 | $relations = []; |
166 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
167 | - $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'] . '.' . |
|
166 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
167 | + $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'].'.'. |
|
168 | 168 | $relation['TABLE_NAME']; |
169 | 169 | $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['REFERENCED_COLUMN_NAME']] = |
170 | 170 | $relation['COLUMN_NAME']; |
@@ -181,10 +181,10 @@ discard block |
||
181 | 181 | $usedcol = []; |
182 | 182 | if (count($columns)) { |
183 | 183 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
184 | - ->filter(function (array $v) use ($columns): bool { |
|
184 | + ->filter(function(array $v) use ($columns): bool { |
|
185 | 185 | return in_array($v['COLUMN_NAME'], $columns); |
186 | 186 | }) |
187 | - ->map(function (array $v): array { |
|
187 | + ->map(function(array $v): array { |
|
188 | 188 | $new = []; |
189 | 189 | foreach ($v as $kk => $vv) { |
190 | 190 | $new[strtoupper($kk)] = $vv; |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | return $new; |
193 | 193 | }) as $relation |
194 | 194 | ) { |
195 | - $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . |
|
195 | + $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'. |
|
196 | 196 | $relation['REFERENCED_TABLE_NAME']; |
197 | 197 | $foreign[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] = |
198 | 198 | $relation['REFERENCED_COLUMN_NAME']; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $orig = $relname; |
210 | 210 | $cntr = 1; |
211 | 211 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
212 | - $relname = $orig . '_' . (++ $cntr); |
|
212 | + $relname = $orig.'_'.(++$cntr); |
|
213 | 213 | } |
214 | 214 | $definition->addRelation( |
215 | 215 | new TableRelation( |
@@ -231,8 +231,8 @@ discard block |
||
231 | 231 | // assuming current table is linked to "one" record in the referenced table |
232 | 232 | // resulting in a "belongsTo" relationship |
233 | 233 | $relations = []; |
234 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
235 | - $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . |
|
234 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
235 | + $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'. |
|
236 | 236 | $relation['REFERENCED_TABLE_NAME']; |
237 | 237 | $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] = |
238 | 238 | $relation['REFERENCED_COLUMN_NAME']; |
@@ -248,12 +248,12 @@ discard block |
||
248 | 248 | $definition->getName() == $relname || |
249 | 249 | $definition->getColumn($relname) |
250 | 250 | ) { |
251 | - $relname = array_keys($data['keymap'])[0] . '_' . $relname; |
|
251 | + $relname = array_keys($data['keymap'])[0].'_'.$relname; |
|
252 | 252 | } |
253 | 253 | $orig = $relname; |
254 | 254 | $cntr = 1; |
255 | 255 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
256 | - $relname = $orig . '_' . (++ $cntr); |
|
256 | + $relname = $orig.'_'.(++$cntr); |
|
257 | 257 | } |
258 | 258 | $definition->addRelation( |
259 | 259 | new TableRelation( |
@@ -269,8 +269,8 @@ discard block |
||
269 | 269 | // assuming current table is on the "one" end having "many" records in the referencing table |
270 | 270 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
271 | 271 | $relations = []; |
272 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
273 | - $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'] . '.' . |
|
272 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
273 | + $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_SCHEMA'].'.'. |
|
274 | 274 | $relation['TABLE_NAME']; |
275 | 275 | $relations[$relation['CONSTRAINT_NAME']]['keymap'][$relation['REFERENCED_COLUMN_NAME']] = |
276 | 276 | $relation['COLUMN_NAME']; |
@@ -287,10 +287,10 @@ discard block |
||
287 | 287 | $usedcol = []; |
288 | 288 | if (count($columns)) { |
289 | 289 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
290 | - ->filter(function (array $v) use ($columns): bool { |
|
290 | + ->filter(function(array $v) use ($columns): bool { |
|
291 | 291 | return in_array($v['COLUMN_NAME'], $columns); |
292 | 292 | }) |
293 | - ->map(function (array $v): array { |
|
293 | + ->map(function(array $v): array { |
|
294 | 294 | $new = []; |
295 | 295 | foreach ($v as $kk => $vv) { |
296 | 296 | $new[strtoupper($kk)] = $vv; |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | return $new; |
299 | 299 | }) as $relation |
300 | 300 | ) { |
301 | - $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'] . '.' . |
|
301 | + $foreign[$relation['CONSTRAINT_NAME']]['table'] = $relation['REFERENCED_TABLE_SCHEMA'].'.'. |
|
302 | 302 | $relation['REFERENCED_TABLE_NAME']; |
303 | 303 | $foreign[$relation['CONSTRAINT_NAME']]['keymap'][$relation['COLUMN_NAME']] = |
304 | 304 | $relation['REFERENCED_COLUMN_NAME']; |
@@ -316,12 +316,12 @@ discard block |
||
316 | 316 | $definition->getName() == $relname || |
317 | 317 | $definition->getColumn($relname) |
318 | 318 | ) { |
319 | - $relname .= '_' . array_values($data['keymap'])[0]; |
|
319 | + $relname .= '_'.array_values($data['keymap'])[0]; |
|
320 | 320 | } |
321 | 321 | $orig = $relname; |
322 | 322 | $cntr = 1; |
323 | 323 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
324 | - $relname = $orig . '_' . (++ $cntr); |
|
324 | + $relname = $orig.'_'.(++$cntr); |
|
325 | 325 | } |
326 | 326 | $definition->addRelation( |
327 | 327 | new TableRelation( |
@@ -349,23 +349,23 @@ discard block |
||
349 | 349 | "SELECT table_name FROM information_schema.tables where table_schema = ?", |
350 | 350 | [$this->connection['opts']['schema'] ?? $this->connection['name']] |
351 | 351 | )) |
352 | - ->map(function (array $v): array { |
|
352 | + ->map(function(array $v): array { |
|
353 | 353 | $new = []; |
354 | 354 | foreach ($v as $kk => $vv) { |
355 | 355 | $new[strtoupper($kk)] = $vv; |
356 | 356 | } |
357 | 357 | return $new; |
358 | 358 | }) |
359 | - ->mapKey(function (array $v): string { |
|
359 | + ->mapKey(function(array $v): string { |
|
360 | 360 | return strtolower($v['TABLE_NAME']); |
361 | 361 | }) |
362 | 362 | ->pluck('TABLE_NAME') |
363 | - ->map(function (string $v): Table { |
|
363 | + ->map(function(string $v): Table { |
|
364 | 364 | return $this->table($v)->toLowerCase(); |
365 | 365 | }) |
366 | 366 | ->toArray(); |
367 | 367 | foreach (array_keys($tables) as $k) { |
368 | - $tables[($this->connection['opts']['schema'] ?? $this->connection['name']) . '.' . $k] = &$tables[$k]; |
|
368 | + $tables[($this->connection['opts']['schema'] ?? $this->connection['name']).'.'.$k] = &$tables[$k]; |
|
369 | 369 | } |
370 | 370 | return $tables; |
371 | 371 | } |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | $table = $temp[1]; |
30 | 30 | } |
31 | 31 | |
32 | - if (isset($tables[$schema . '.' . $table])) { |
|
33 | - return $tables[$schema . '.' . $table]; |
|
32 | + if (isset($tables[$schema.'.'.$table])) { |
|
33 | + return $tables[$schema.'.'.$table]; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | static $relationsT = null; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | (kc.table_schema = ? OR ct.table_schema = ?) AND |
62 | 62 | kc.table_name IS NOT NULL AND |
63 | 63 | kc.position_in_unique_constraint IS NOT NULL", |
64 | - [ $catalog, $main, $main ] |
|
64 | + [$catalog, $main, $main] |
|
65 | 65 | ) |
66 | 66 | )->toArray(); |
67 | 67 | foreach ($col as $row) { |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | if ($row['referenced_table_schema'] !== $main) { |
72 | 72 | $additional[] = $row['referenced_table_schema']; |
73 | 73 | } |
74 | - $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row; |
|
75 | - $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row; |
|
74 | + $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row; |
|
75 | + $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row; |
|
76 | 76 | } |
77 | 77 | foreach (array_filter(array_unique($additional)) as $s) { |
78 | 78 | $col = Collection::from( |
@@ -97,12 +97,12 @@ discard block |
||
97 | 97 | (kc.table_schema = ? AND ct.table_schema = ?) AND |
98 | 98 | kc.table_name IS NOT NULL AND |
99 | 99 | kc.position_in_unique_constraint IS NOT NULL", |
100 | - [ $catalog, $s, $s ] |
|
100 | + [$catalog, $s, $s] |
|
101 | 101 | ) |
102 | 102 | )->toArray(); |
103 | 103 | foreach ($col as $row) { |
104 | - $relationsT[$row['table_schema'] . '.' . $row['table_name']][] = $row; |
|
105 | - $relationsR[$row['referenced_table_schema'] . '.' . $row['referenced_table_name']][] = $row; |
|
104 | + $relationsT[$row['table_schema'].'.'.$row['table_name']][] = $row; |
|
105 | + $relationsR[$row['referenced_table_schema'].'.'.$row['referenced_table_name']][] = $row; |
|
106 | 106 | } |
107 | 107 | } |
108 | 108 | } |
@@ -114,12 +114,12 @@ discard block |
||
114 | 114 | ->query( |
115 | 115 | "SELECT * FROM information_schema.columns |
116 | 116 | WHERE table_name = ? AND table_schema = ? AND table_catalog = ?", |
117 | - [ $table, $schema, $catalog ] |
|
117 | + [$table, $schema, $catalog] |
|
118 | 118 | )) |
119 | - ->mapKey(function ($v): string { |
|
119 | + ->mapKey(function($v): string { |
|
120 | 120 | return $v['column_name']; |
121 | 121 | }) |
122 | - ->map(function ($v) { |
|
122 | + ->map(function($v) { |
|
123 | 123 | $v['length'] = null; |
124 | 124 | if (!isset($v['data_type'])) { |
125 | 125 | return $v; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | switch ($v['data_type']) { |
128 | 128 | case 'character': |
129 | 129 | case 'character varying': |
130 | - $v['length'] = (int)$v['character_maximum_length']; |
|
130 | + $v['length'] = (int) $v['character_maximum_length']; |
|
131 | 131 | break; |
132 | 132 | } |
133 | 133 | $v['hidden'] = $v['is_identity'] !== 'YES' && $v['is_generated'] === 'ALWAYS'; |
@@ -135,13 +135,13 @@ discard block |
||
135 | 135 | }) |
136 | 136 | ->toArray(); |
137 | 137 | if (!count($columns)) { |
138 | - throw new DBException('Table not found by name: ' . implode('.', [$schema,$table])); |
|
138 | + throw new DBException('Table not found by name: '.implode('.', [$schema, $table])); |
|
139 | 139 | } |
140 | 140 | $pkname = Collection::from($this |
141 | 141 | ->query( |
142 | 142 | "SELECT constraint_name FROM information_schema.table_constraints |
143 | 143 | WHERE table_name = ? AND constraint_type = ? AND table_schema = ? AND table_catalog = ?", |
144 | - [ $table, 'PRIMARY KEY', $schema, $catalog ] |
|
144 | + [$table, 'PRIMARY KEY', $schema, $catalog] |
|
145 | 145 | )) |
146 | 146 | ->pluck('constraint_name') |
147 | 147 | ->value(); |
@@ -151,32 +151,32 @@ discard block |
||
151 | 151 | ->query( |
152 | 152 | "SELECT column_name FROM information_schema.constraint_column_usage |
153 | 153 | WHERE table_name = ? AND constraint_name = ? AND table_schema = ? AND table_catalog = ?", |
154 | - [ $table, $pkname, $schema, $catalog ] |
|
154 | + [$table, $pkname, $schema, $catalog] |
|
155 | 155 | )) |
156 | 156 | ->pluck('column_name') |
157 | 157 | ->toArray(); |
158 | 158 | } |
159 | - $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema)) |
|
159 | + $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema)) |
|
160 | 160 | ->addColumns($columns) |
161 | 161 | ->setPrimaryKey($primary) |
162 | 162 | ->setComment(''); |
163 | 163 | |
164 | 164 | if ($detectRelations) { |
165 | 165 | $duplicated = []; |
166 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
167 | - $t = $relation['referenced_table_schema'] . '.' . $relation['referenced_table_name']; |
|
166 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
167 | + $t = $relation['referenced_table_schema'].'.'.$relation['referenced_table_name']; |
|
168 | 168 | $duplicated[$t] = isset($duplicated[$t]); |
169 | 169 | } |
170 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
171 | - $t = $relation['table_schema'] . '.' . $relation['table_name']; |
|
170 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
171 | + $t = $relation['table_schema'].'.'.$relation['table_name']; |
|
172 | 172 | $duplicated[$t] = isset($duplicated[$t]); |
173 | 173 | } |
174 | 174 | // pivot relations where the current table is referenced |
175 | 175 | // assuming current table is on the "one" end having "many" records in the referencing table |
176 | 176 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
177 | 177 | $relations = []; |
178 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
179 | - $relations[$relation['constraint_name']]['table'] = $relation['table_schema'] . '.' . |
|
178 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
179 | + $relations[$relation['constraint_name']]['table'] = $relation['table_schema'].'.'. |
|
180 | 180 | $relation['table_name']; |
181 | 181 | $relations[$relation['constraint_name']]['keymap'][$relation['referenced_column_name']] = |
182 | 182 | $relation['column_name']; |
@@ -193,11 +193,11 @@ discard block |
||
193 | 193 | $usedcol = []; |
194 | 194 | if (count($columns)) { |
195 | 195 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
196 | - ->filter(function ($v) use ($columns) { |
|
196 | + ->filter(function($v) use ($columns) { |
|
197 | 197 | return in_array($v['column_name'], $columns); |
198 | 198 | }) as $relation |
199 | 199 | ) { |
200 | - $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . |
|
200 | + $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'. |
|
201 | 201 | $relation['referenced_table_name']; |
202 | 202 | $foreign[$relation['constraint_name']]['keymap'][$relation['column_name']] = |
203 | 203 | $relation['referenced_column_name']; |
@@ -217,7 +217,7 @@ discard block |
||
217 | 217 | $definition->getName() == $relname || |
218 | 218 | $definition->getColumn($relname) |
219 | 219 | ) { |
220 | - $relname = $orig . '_' . (++ $cntr); |
|
220 | + $relname = $orig.'_'.(++$cntr); |
|
221 | 221 | } |
222 | 222 | $definition->addRelation( |
223 | 223 | new TableRelation( |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | // assuming current table is linked to "one" record in the referenced table |
240 | 240 | // resulting in a "belongsTo" relationship |
241 | 241 | $relations = []; |
242 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
243 | - $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . |
|
242 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
243 | + $relations[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'. |
|
244 | 244 | $relation['referenced_table_name']; |
245 | 245 | $relations[$relation['constraint_name']]['keymap'][$relation['column_name']] = |
246 | 246 | $relation['referenced_column_name']; |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | $definition->getName() == $relname || |
257 | 257 | $definition->getColumn($relname) |
258 | 258 | ) { |
259 | - $relname = array_keys($data['keymap'])[0] . '_' . $relname; |
|
259 | + $relname = array_keys($data['keymap'])[0].'_'.$relname; |
|
260 | 260 | } |
261 | 261 | $orig = $relname; |
262 | 262 | $cntr = 1; |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $definition->getName() == $relname || |
265 | 265 | $definition->getColumn($relname) |
266 | 266 | ) { |
267 | - $relname = $orig . '_' . (++ $cntr); |
|
267 | + $relname = $orig.'_'.(++$cntr); |
|
268 | 268 | } |
269 | 269 | $definition->addRelation( |
270 | 270 | new TableRelation( |
@@ -280,8 +280,8 @@ discard block |
||
280 | 280 | // assuming current table is on the "one" end having "many" records in the referencing table |
281 | 281 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
282 | 282 | $relations = []; |
283 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
284 | - $relations[$relation['constraint_name']]['table'] = $relation['table_schema'] . '.' . |
|
283 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
284 | + $relations[$relation['constraint_name']]['table'] = $relation['table_schema'].'.'. |
|
285 | 285 | $relation['table_name']; |
286 | 286 | $relations[$relation['constraint_name']]['keymap'][$relation['referenced_column_name']] = |
287 | 287 | $relation['column_name']; |
@@ -298,11 +298,11 @@ discard block |
||
298 | 298 | $usedcol = []; |
299 | 299 | if (count($columns)) { |
300 | 300 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
301 | - ->filter(function ($v) use ($columns) { |
|
301 | + ->filter(function($v) use ($columns) { |
|
302 | 302 | return in_array($v['column_name'], $columns); |
303 | 303 | }) as $relation |
304 | 304 | ) { |
305 | - $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'] . '.' . |
|
305 | + $foreign[$relation['constraint_name']]['table'] = $relation['referenced_table_schema'].'.'. |
|
306 | 306 | $relation['referenced_table_name']; |
307 | 307 | $foreign[$relation['constraint_name']]['keymap'][$relation['column_name']] = |
308 | 308 | $relation['referenced_column_name']; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | $definition->getName() == $relname || |
321 | 321 | $definition->getColumn($relname) |
322 | 322 | ) { |
323 | - $relname .= '_' . array_values($data['keymap'])[0]; |
|
323 | + $relname .= '_'.array_values($data['keymap'])[0]; |
|
324 | 324 | } |
325 | 325 | $orig = $relname; |
326 | 326 | $cntr = 1; |
@@ -328,7 +328,7 @@ discard block |
||
328 | 328 | $definition->getName() == $relname || |
329 | 329 | $definition->getColumn($relname) |
330 | 330 | ) { |
331 | - $relname = $orig . '_' . (++ $cntr); |
|
331 | + $relname = $orig.'_'.(++$cntr); |
|
332 | 332 | } |
333 | 333 | $definition->addRelation( |
334 | 334 | new TableRelation( |
@@ -378,20 +378,20 @@ discard block |
||
378 | 378 | attr.attnum > 0 |
379 | 379 | order by |
380 | 380 | attr.attnum", |
381 | - [ $table, $schema ] |
|
381 | + [$table, $schema] |
|
382 | 382 | )) |
383 | - ->mapKey(function ($v): string { |
|
383 | + ->mapKey(function($v): string { |
|
384 | 384 | return $v['column_name']; |
385 | 385 | }) |
386 | - ->map(function ($v) { |
|
386 | + ->map(function($v) { |
|
387 | 387 | $v['length'] = null; |
388 | 388 | return $v; |
389 | 389 | }) |
390 | 390 | ->toArray(); |
391 | 391 | if (!count($columns)) { |
392 | - throw new DBException('View not found by name: ' . implode('.', [$schema,$table])); |
|
392 | + throw new DBException('View not found by name: '.implode('.', [$schema, $table])); |
|
393 | 393 | } |
394 | - $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema)) |
|
394 | + $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema)) |
|
395 | 395 | ->addColumns($columns) |
396 | 396 | ->setComment(''); |
397 | 397 | return $definition; |
@@ -401,13 +401,13 @@ discard block |
||
401 | 401 | $tables = Collection::from($this |
402 | 402 | ->query( |
403 | 403 | "SELECT table_name FROM information_schema.tables where table_schema = ? AND table_catalog = ?", |
404 | - [ $this->connection['opts']['schema'] ?? 'public', $this->connection['name'] ] |
|
404 | + [$this->connection['opts']['schema'] ?? 'public', $this->connection['name']] |
|
405 | 405 | )) |
406 | - ->mapKey(function ($v) { |
|
406 | + ->mapKey(function($v) { |
|
407 | 407 | return strtolower($v['table_name']); |
408 | 408 | }) |
409 | 409 | ->pluck('table_name') |
410 | - ->map(function ($v) { |
|
410 | + ->map(function($v) { |
|
411 | 411 | return $this->table($v)->toLowerCase(); |
412 | 412 | }) |
413 | 413 | ->toArray(); |
@@ -418,19 +418,19 @@ discard block |
||
418 | 418 | FROM pg_catalog.pg_class cls |
419 | 419 | join pg_catalog.pg_namespace as ns on ns.oid = cls.relnamespace |
420 | 420 | WHERE cls.relkind = 'm' and ns.nspname = ?", |
421 | - [ $this->connection['opts']['schema'] ?? 'public' ] |
|
421 | + [$this->connection['opts']['schema'] ?? 'public'] |
|
422 | 422 | )) |
423 | - ->mapKey(function ($v) { |
|
423 | + ->mapKey(function($v) { |
|
424 | 424 | return strtolower($v['table_name']); |
425 | 425 | }) |
426 | 426 | ->pluck('table_name') |
427 | - ->map(function ($v) { |
|
427 | + ->map(function($v) { |
|
428 | 428 | return $this->view($v)->toLowerCase(); |
429 | 429 | }) |
430 | 430 | ->toArray(); |
431 | 431 | $tables = array_merge($views, $tables); |
432 | 432 | foreach (array_keys($tables) as $k) { |
433 | - $tables[($this->connection['opts']['schema'] ?? 'public') . '.' . $k] = &$tables[$k]; |
|
433 | + $tables[($this->connection['opts']['schema'] ?? 'public').'.'.$k] = &$tables[$k]; |
|
434 | 434 | } |
435 | 435 | return $tables; |
436 | 436 | } |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | $table = $temp[1]; |
30 | 30 | } |
31 | 31 | |
32 | - if (isset($tables[$schema . '.' . $table])) { |
|
33 | - return $tables[$schema . '.' . $table]; |
|
32 | + if (isset($tables[$schema.'.'.$table])) { |
|
33 | + return $tables[$schema.'.'.$table]; |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | static $relationsT = null; |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | ] |
54 | 54 | ) |
55 | 55 | ); |
56 | - $relationsT['main.' . $row['table']][] = $row; |
|
57 | - $relationsR['main.' . $row['referenced_table']][] = $row; |
|
56 | + $relationsT['main.'.$row['table']][] = $row; |
|
57 | + $relationsR['main.'.$row['referenced_table']][] = $row; |
|
58 | 58 | } |
59 | 59 | } |
60 | 60 | } |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | */ |
65 | 65 | $columns = Collection::from($this |
66 | 66 | ->query("PRAGMA table_info(".$table.")")) |
67 | - ->mapKey(function ($v): string { |
|
67 | + ->mapKey(function($v): string { |
|
68 | 68 | return $v['name']; |
69 | 69 | }) |
70 | - ->map(function ($v) { |
|
70 | + ->map(function($v) { |
|
71 | 71 | $v['length'] = null; |
72 | 72 | if (!isset($v['type'])) { |
73 | 73 | return $v; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | default: |
78 | 78 | if (strpos($type, 'char') !== false && strpos($type, '(') !== false) { |
79 | 79 | // extract length from varchar |
80 | - $v['length'] = (int)explode(')', explode('(', $type)[1])[0]; |
|
80 | + $v['length'] = (int) explode(')', explode('(', $type)[1])[0]; |
|
81 | 81 | $v['length'] = $v['length'] > 0 ? $v['length'] : null; |
82 | 82 | } |
83 | 83 | break; |
@@ -86,35 +86,35 @@ discard block |
||
86 | 86 | }) |
87 | 87 | ->toArray(); |
88 | 88 | if (!count($columns)) { |
89 | - throw new DBException('Table not found by name: ' . implode('.', [$schema,$table])); |
|
89 | + throw new DBException('Table not found by name: '.implode('.', [$schema, $table])); |
|
90 | 90 | } |
91 | 91 | $primary = []; |
92 | 92 | foreach ($columns as $column) { |
93 | - if ((int)$column['pk']) { |
|
93 | + if ((int) $column['pk']) { |
|
94 | 94 | $primary[] = $column['name']; |
95 | 95 | } |
96 | 96 | } |
97 | - $tables[$schema . '.' .$table] = $definition = (new Table($table, $schema)) |
|
97 | + $tables[$schema.'.'.$table] = $definition = (new Table($table, $schema)) |
|
98 | 98 | ->addColumns($columns) |
99 | 99 | ->setPrimaryKey($primary) |
100 | 100 | ->setComment(''); |
101 | 101 | |
102 | 102 | if ($detectRelations) { |
103 | 103 | $duplicated = []; |
104 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
105 | - $t = 'main.' . $relation['referenced_table']; |
|
104 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
105 | + $t = 'main.'.$relation['referenced_table']; |
|
106 | 106 | $duplicated[$t] = isset($duplicated[$t]); |
107 | 107 | } |
108 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $relation) { |
|
109 | - $t = 'main.' . $relation['table']; |
|
108 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $relation) { |
|
109 | + $t = 'main.'.$relation['table']; |
|
110 | 110 | $duplicated[$t] = isset($duplicated[$t]); |
111 | 111 | } |
112 | 112 | // pivot relations where the current table is referenced |
113 | 113 | // assuming current table is on the "one" end having "many" records in the referencing table |
114 | 114 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
115 | 115 | $relations = []; |
116 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $k => $relation) { |
|
117 | - $relations[$relation['constraint_name']]['table'] = 'main.' . $relation['table']; |
|
116 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $k => $relation) { |
|
117 | + $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['table']; |
|
118 | 118 | $relations[$relation['constraint_name']]['keymap'][$relation['to']] = $relation['from']; |
119 | 119 | } |
120 | 120 | foreach ($relations as $data) { |
@@ -129,11 +129,11 @@ discard block |
||
129 | 129 | $usedcol = []; |
130 | 130 | if (count($columns)) { |
131 | 131 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
132 | - ->filter(function ($v) use ($columns) { |
|
132 | + ->filter(function($v) use ($columns) { |
|
133 | 133 | return in_array($v['from'], $columns); |
134 | 134 | }) as $relation |
135 | 135 | ) { |
136 | - $foreign[$relation['constraint_name']]['table'] = 'main.' . |
|
136 | + $foreign[$relation['constraint_name']]['table'] = 'main.'. |
|
137 | 137 | $relation['referenced_table']; |
138 | 138 | $foreign[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to']; |
139 | 139 | $usedcol[] = $relation['from']; |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | $definition->getName() == $relname || |
153 | 153 | $definition->getColumn($relname) |
154 | 154 | ) { |
155 | - $relname = $orig . '_' . (++ $cntr); |
|
155 | + $relname = $orig.'_'.(++$cntr); |
|
156 | 156 | } |
157 | 157 | $definition->addRelation( |
158 | 158 | new TableRelation( |
@@ -174,8 +174,8 @@ discard block |
||
174 | 174 | // assuming current table is linked to "one" record in the referenced table |
175 | 175 | // resulting in a "belongsTo" relationship |
176 | 176 | $relations = []; |
177 | - foreach ($relationsT[$schema . '.' . $table] ?? [] as $relation) { |
|
178 | - $relations[$relation['constraint_name']]['table'] = 'main.' . $relation['referenced_table']; |
|
177 | + foreach ($relationsT[$schema.'.'.$table] ?? [] as $relation) { |
|
178 | + $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['referenced_table']; |
|
179 | 179 | $relations[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to']; |
180 | 180 | } |
181 | 181 | foreach ($relations as $name => $data) { |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | $definition->getName() == $relname || |
190 | 190 | $definition->getColumn($relname) |
191 | 191 | ) { |
192 | - $relname = array_keys($data['keymap'])[0] . '_' . $relname; |
|
192 | + $relname = array_keys($data['keymap'])[0].'_'.$relname; |
|
193 | 193 | } |
194 | 194 | $orig = $relname; |
195 | 195 | $cntr = 1; |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | $definition->getName() == $relname || |
198 | 198 | $definition->getColumn($relname) |
199 | 199 | ) { |
200 | - $relname = $orig . '_' . (++ $cntr); |
|
200 | + $relname = $orig.'_'.(++$cntr); |
|
201 | 201 | } |
202 | 202 | $definition->addRelation( |
203 | 203 | new TableRelation( |
@@ -213,8 +213,8 @@ discard block |
||
213 | 213 | // assuming current table is on the "one" end having "many" records in the referencing table |
214 | 214 | // resulting in a "hasMany" or "manyToMany" relationship (if a pivot table is detected) |
215 | 215 | $relations = []; |
216 | - foreach ($relationsR[$schema . '.' . $table] ?? [] as $k => $relation) { |
|
217 | - $relations[$relation['constraint_name']]['table'] = 'main.' . $relation['table']; |
|
216 | + foreach ($relationsR[$schema.'.'.$table] ?? [] as $k => $relation) { |
|
217 | + $relations[$relation['constraint_name']]['table'] = 'main.'.$relation['table']; |
|
218 | 218 | $relations[$relation['constraint_name']]['keymap'][$relation['to']] = $relation['from']; |
219 | 219 | } |
220 | 220 | foreach ($relations as $data) { |
@@ -229,11 +229,11 @@ discard block |
||
229 | 229 | $usedcol = []; |
230 | 230 | if (count($columns)) { |
231 | 231 | foreach (Collection::from($relationsT[$data['table']] ?? []) |
232 | - ->filter(function ($v) use ($columns) { |
|
232 | + ->filter(function($v) use ($columns) { |
|
233 | 233 | return in_array($v['from'], $columns); |
234 | 234 | }) as $relation |
235 | 235 | ) { |
236 | - $foreign[$relation['constraint_name']]['table'] = 'main.' . |
|
236 | + $foreign[$relation['constraint_name']]['table'] = 'main.'. |
|
237 | 237 | $relation['referenced_table']; |
238 | 238 | $foreign[$relation['constraint_name']]['keymap'][$relation['from']] = $relation['to']; |
239 | 239 | $usedcol[] = $relation['from']; |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | $definition->getName() == $relname || |
251 | 251 | $definition->getColumn($relname) |
252 | 252 | ) { |
253 | - $relname .= '_' . array_values($data['keymap'])[0]; |
|
253 | + $relname .= '_'.array_values($data['keymap'])[0]; |
|
254 | 254 | } |
255 | 255 | $orig = $relname; |
256 | 256 | $cntr = 1; |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | $definition->getName() == $relname || |
259 | 259 | $definition->getColumn($relname) |
260 | 260 | ) { |
261 | - $relname = $orig . '_' . (++ $cntr); |
|
261 | + $relname = $orig.'_'.(++$cntr); |
|
262 | 262 | } |
263 | 263 | $definition->addRelation( |
264 | 264 | new TableRelation( |
@@ -286,9 +286,9 @@ discard block |
||
286 | 286 | "SELECT tbl_name |
287 | 287 | FROM sqlite_schema |
288 | 288 | WHERE (type = ? OR type = ?) AND tbl_name NOT LIKE 'sqlite_%';", |
289 | - [ 'table', 'view' ] |
|
289 | + ['table', 'view'] |
|
290 | 290 | )) |
291 | - ->mapKey(function ($v) { |
|
291 | + ->mapKey(function($v) { |
|
292 | 292 | return strtolower($v['tbl_name']); |
293 | 293 | }) |
294 | 294 | ->pluck('tbl_name') |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | $tables[$k] = $this->table($v, true, array_keys($tables))->toLowerCase(); |
298 | 298 | } |
299 | 299 | foreach (array_keys($tables) as $k) { |
300 | - $tables[($this->connection['opts']['schema'] ?? 'main') . '.' . $k] = &$tables[$k]; |
|
300 | + $tables[($this->connection['opts']['schema'] ?? 'main').'.'.$k] = &$tables[$k]; |
|
301 | 301 | } |
302 | 302 | return $tables; |
303 | 303 | } |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | $columns = Collection::from($this |
33 | 33 | ->query( |
34 | 34 | "SELECT * FROM user_tab_cols WHERE UPPER(table_name) = ?", |
35 | - [ strtoupper($table) ] |
|
35 | + [strtoupper($table)] |
|
36 | 36 | )) |
37 | - ->map(function ($v) { |
|
37 | + ->map(function($v) { |
|
38 | 38 | $new = []; |
39 | 39 | foreach ($v as $kk => $vv) { |
40 | 40 | $new[strtoupper($kk)] = $vv; |
41 | 41 | } |
42 | 42 | return $new; |
43 | 43 | }) |
44 | - ->mapKey(function ($v): string { |
|
44 | + ->mapKey(function($v): string { |
|
45 | 45 | return $v['COLUMN_NAME']; |
46 | 46 | }) |
47 | - ->map(function ($v) { |
|
47 | + ->map(function($v) { |
|
48 | 48 | $v['length'] = null; |
49 | 49 | if (!isset($v['DATA_TYPE'])) { |
50 | 50 | return $v; |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | default: |
57 | 57 | if (strpos($type, 'char') !== false && strpos($type, '(') !== false) { |
58 | 58 | // extract length from varchar |
59 | - $v['length'] = (int)explode(')', (explode('(', $type)[1] ?? ''))[0]; |
|
59 | + $v['length'] = (int) explode(')', (explode('(', $type)[1] ?? ''))[0]; |
|
60 | 60 | $v['length'] = $v['length'] > 0 ? $v['length'] : null; |
61 | 61 | } |
62 | 62 | break; |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | ->query( |
74 | 74 | "SELECT constraint_name FROM user_constraints |
75 | 75 | WHERE table_name = ? AND constraint_type = ?", |
76 | - [ strtoupper($table), 'P' ] |
|
76 | + [strtoupper($table), 'P'] |
|
77 | 77 | )) |
78 | - ->map(function ($v) { |
|
78 | + ->map(function($v) { |
|
79 | 79 | $new = []; |
80 | 80 | foreach ($v as $kk => $vv) { |
81 | 81 | $new[strtoupper($kk)] = $vv; |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | ->query( |
91 | 91 | "SELECT column_name FROM user_cons_columns |
92 | 92 | WHERE table_name = ? AND constraint_name = ?", |
93 | - [ strtoupper($table), $pkname ] |
|
93 | + [strtoupper($table), $pkname] |
|
94 | 94 | )) |
95 | - ->map(function ($v) { |
|
95 | + ->map(function($v) { |
|
96 | 96 | $new = []; |
97 | 97 | foreach ($v as $kk => $vv) { |
98 | 98 | $new[strtoupper($kk)] = $vv; |
@@ -120,9 +120,9 @@ discard block |
||
120 | 120 | LEFT JOIN user_cons_columns cc ON cc.CONSTRAINT_NAME = ac.CONSTRAINT_NAME |
121 | 121 | WHERE ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? |
122 | 122 | ORDER BY cc.POSITION", |
123 | - [ strtoupper($table), 'R' ] |
|
123 | + [strtoupper($table), 'R'] |
|
124 | 124 | )) |
125 | - ->map(function ($v) { |
|
125 | + ->map(function($v) { |
|
126 | 126 | $new = []; |
127 | 127 | foreach ($v as $kk => $vv) { |
128 | 128 | $new[strtoupper($kk)] = $vv; |
@@ -138,9 +138,9 @@ discard block |
||
138 | 138 | WHERE |
139 | 139 | ac.R_CONSTRAINT_NAME = ? AND ac.CONSTRAINT_TYPE = ? |
140 | 140 | ORDER BY cc.POSITION", |
141 | - [ $pkname, 'R' ] |
|
141 | + [$pkname, 'R'] |
|
142 | 142 | )) |
143 | - ->map(function ($v) { |
|
143 | + ->map(function($v) { |
|
144 | 144 | $new = []; |
145 | 145 | foreach ($v as $kk => $vv) { |
146 | 146 | $new[strtoupper($kk)] = $vv; |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $relations = []; |
164 | 164 | foreach ($relationsR as $relation) { |
165 | 165 | $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME']; |
166 | - $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] = |
|
166 | + $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] = |
|
167 | 167 | $relation['COLUMN_NAME']; |
168 | 168 | } |
169 | 169 | foreach ($relations as $data) { |
@@ -193,9 +193,9 @@ discard block |
||
193 | 193 | ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND |
194 | 194 | cc.COLUMN_NAME IN (??) |
195 | 195 | ORDER BY POSITION", |
196 | - [ $data['table'], 'R', $columns ] |
|
196 | + [$data['table'], 'R', $columns] |
|
197 | 197 | )) |
198 | - ->map(function ($v) { |
|
198 | + ->map(function($v) { |
|
199 | 199 | $new = []; |
200 | 200 | foreach ($v as $kk => $vv) { |
201 | 201 | $new[strtoupper($kk)] = $vv; |
@@ -215,9 +215,9 @@ discard block |
||
215 | 215 | ->query( |
216 | 216 | "SELECT COLUMN_NAME FROM user_cons_columns |
217 | 217 | WHERE CONSTRAINT_NAME = ? ORDER BY POSITION", |
218 | - [ current($foreign['keymap']) ] |
|
218 | + [current($foreign['keymap'])] |
|
219 | 219 | )) |
220 | - ->map(function ($v) { |
|
220 | + ->map(function($v) { |
|
221 | 221 | $new = []; |
222 | 222 | foreach ($v as $kk => $vv) { |
223 | 223 | $new[strtoupper($kk)] = $vv; |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | $relname = $foreign['table']; |
233 | 233 | $cntr = 1; |
234 | 234 | while ($definition->hasRelation($relname) || $definition->getName() == $relname) { |
235 | - $relname = $foreign['table'] . '_' . (++ $cntr); |
|
235 | + $relname = $foreign['table'].'_'.(++$cntr); |
|
236 | 236 | } |
237 | 237 | $definition->addRelation( |
238 | 238 | new TableRelation( |
@@ -264,9 +264,9 @@ discard block |
||
264 | 264 | ->query( |
265 | 265 | "SELECT COLUMN_NAME FROM user_cons_columns |
266 | 266 | WHERE CONSTRAINT_NAME = ? ORDER BY POSITION", |
267 | - [ current($data['keymap']) ] |
|
267 | + [current($data['keymap'])] |
|
268 | 268 | )) |
269 | - ->map(function ($v) { |
|
269 | + ->map(function($v) { |
|
270 | 270 | $new = []; |
271 | 271 | foreach ($v as $kk => $vv) { |
272 | 272 | $new[strtoupper($kk)] = $vv; |
@@ -284,7 +284,7 @@ discard block |
||
284 | 284 | $definition->getName() == $relname || |
285 | 285 | $definition->getColumn($relname) |
286 | 286 | ) { |
287 | - $relname = array_keys($data['keymap'])[0] . '_' . $relname; |
|
287 | + $relname = array_keys($data['keymap'])[0].'_'.$relname; |
|
288 | 288 | } |
289 | 289 | $orig = $relname; |
290 | 290 | $cntr = 1; |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | $definition->getName() == $relname || |
294 | 294 | $definition->getColumn($relname) |
295 | 295 | ) { |
296 | - $relname = $orig . '_' . (++ $cntr); |
|
296 | + $relname = $orig.'_'.(++$cntr); |
|
297 | 297 | } |
298 | 298 | $definition->addRelation( |
299 | 299 | new TableRelation( |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | $relations = []; |
312 | 312 | foreach ($relationsR as $relation) { |
313 | 313 | $relations[$relation['CONSTRAINT_NAME']]['table'] = $relation['TABLE_NAME']; |
314 | - $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int)$relation['POSITION']-1]] = |
|
314 | + $relations[$relation['CONSTRAINT_NAME']]['keymap'][$primary[(int) $relation['POSITION'] - 1]] = |
|
315 | 315 | $relation['COLUMN_NAME']; |
316 | 316 | } |
317 | 317 | foreach ($relations as $data) { |
@@ -341,9 +341,9 @@ discard block |
||
341 | 341 | ac.TABLE_NAME = ? AND ac.CONSTRAINT_TYPE = ? AND |
342 | 342 | cc.COLUMN_NAME IN (??) |
343 | 343 | ORDER BY POSITION", |
344 | - [ $data['table'], 'R', $columns ] |
|
344 | + [$data['table'], 'R', $columns] |
|
345 | 345 | )) |
346 | - ->map(function ($v) { |
|
346 | + ->map(function($v) { |
|
347 | 347 | $new = []; |
348 | 348 | foreach ($v as $kk => $vv) { |
349 | 349 | $new[strtoupper($kk)] = $vv; |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | $definition->getName() == $relname || |
365 | 365 | $definition->getColumn($relname) |
366 | 366 | ) { |
367 | - $relname .= '_' . array_values($data['keymap'])[0]; |
|
367 | + $relname .= '_'.array_values($data['keymap'])[0]; |
|
368 | 368 | } |
369 | 369 | $orig = $relname; |
370 | 370 | $cntr = 1; |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | $definition->getName() == $relname || |
374 | 374 | $definition->getColumn($relname) |
375 | 375 | ) { |
376 | - $relname = $orig . '_' . (++ $cntr); |
|
376 | + $relname = $orig.'_'.(++$cntr); |
|
377 | 377 | } |
378 | 378 | $definition->addRelation( |
379 | 379 | new TableRelation( |
@@ -403,18 +403,18 @@ discard block |
||
403 | 403 | SELECT VIEW_NAME AS TABLE_NAME FROM USER_VIEWS", |
404 | 404 | [] |
405 | 405 | )) |
406 | - ->map(function ($v) { |
|
406 | + ->map(function($v) { |
|
407 | 407 | $new = []; |
408 | 408 | foreach ($v as $kk => $vv) { |
409 | 409 | $new[strtoupper($kk)] = $vv; |
410 | 410 | } |
411 | 411 | return $new; |
412 | 412 | }) |
413 | - ->mapKey(function ($v) { |
|
413 | + ->mapKey(function($v) { |
|
414 | 414 | return strtolower($v['TABLE_NAME']); |
415 | 415 | }) |
416 | 416 | ->pluck('TABLE_NAME') |
417 | - ->map(function ($v) { |
|
417 | + ->map(function($v) { |
|
418 | 418 | return $this->table($v)->toLowerCase(); |
419 | 419 | }) |
420 | 420 | ->toArray(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | if ($temp) { |
33 | 33 | $temp = $temp->fetch_fields(); |
34 | 34 | if ($temp) { |
35 | - $columns = array_map(function ($v) { |
|
35 | + $columns = array_map(function($v) { |
|
36 | 36 | return $v->name; |
37 | 37 | }, $temp); |
38 | 38 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | } |
52 | 52 | public function affected() : int |
53 | 53 | { |
54 | - return (int)$this->statement->affected_rows; |
|
54 | + return (int) $this->statement->affected_rows; |
|
55 | 55 | } |
56 | 56 | public function insertID(?string $sequence = null): mixed |
57 | 57 | { |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | } |
74 | 74 | public function current(): mixed |
75 | 75 | { |
76 | - return $this->nativeDriver ? $this->last : array_map(function ($v) { |
|
76 | + return $this->nativeDriver ? $this->last : array_map(function($v) { |
|
77 | 77 | return $v; |
78 | 78 | }, $this->row); |
79 | 79 | } |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | } |
93 | 93 | public function next(): void |
94 | 94 | { |
95 | - $this->fetched ++; |
|
96 | - $this->last = $this->nativeDriver ? ($this->result->fetch_assoc()?:null) : $this->statement->fetch(); |
|
95 | + $this->fetched++; |
|
96 | + $this->last = $this->nativeDriver ? ($this->result->fetch_assoc() ?: null) : $this->statement->fetch(); |
|
97 | 97 | } |
98 | 98 | public function valid(): bool |
99 | 99 | { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | public function affected() : int |
26 | 26 | { |
27 | - return (int)\oci_num_rows($this->statement); |
|
27 | + return (int) \oci_num_rows($this->statement); |
|
28 | 28 | } |
29 | 29 | public function insertID(?string $sequence = null): mixed |
30 | 30 | { |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public function count(): int |
39 | 39 | { |
40 | - return (int)\oci_num_rows($this->statement); |
|
40 | + return (int) \oci_num_rows($this->statement); |
|
41 | 41 | } |
42 | 42 | |
43 | 43 | public function key(): mixed |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | } |
66 | 66 | public function next(): void |
67 | 67 | { |
68 | - $this->fetched ++; |
|
69 | - $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC + \OCI_RETURN_NULLS + \OCI_RETURN_LOBS)?:null; |
|
68 | + $this->fetched++; |
|
69 | + $this->last = \oci_fetch_array($this->statement, \OCI_ASSOC +\OCI_RETURN_NULLS +\OCI_RETURN_LOBS) ?: null; |
|
70 | 70 | if (is_array($this->last)) { |
71 | 71 | $this->cast(); |
72 | 72 | } |
@@ -78,23 +78,23 @@ discard block |
||
78 | 78 | protected function cast(): void |
79 | 79 | { |
80 | 80 | if (!count($this->types)) { |
81 | - foreach (array_keys($this->last??[]) as $k => $v) { |
|
81 | + foreach (array_keys($this->last ?? []) as $k => $v) { |
|
82 | 82 | $this->types[$v] = \oci_field_type($this->statement, $k + 1); |
83 | 83 | if ($this->types[$v] === 'NUMBER') { |
84 | 84 | $scale = \oci_field_scale($this->statement, $k + 1); |
85 | 85 | $precision = \oci_field_precision($this->statement, $k + 1); |
86 | 86 | // true float |
87 | - if ((int)$scale === -127 && (int)$precision !== 0) { |
|
87 | + if ((int) $scale === -127 && (int) $precision !== 0) { |
|
88 | 88 | $this->types[$v] = 'FLOAT'; |
89 | 89 | } |
90 | 90 | // TODO: decimal |
91 | - if ((int)$scale > 0) { |
|
91 | + if ((int) $scale > 0) { |
|
92 | 92 | $this->types[$v] = 'DECIMAL'; |
93 | 93 | } |
94 | 94 | } |
95 | 95 | } |
96 | 96 | } |
97 | - foreach ($this->last??[] as $k => $v) { |
|
97 | + foreach ($this->last ?? [] as $k => $v) { |
|
98 | 98 | if (!isset($this->types[$k])) { |
99 | 99 | continue; |
100 | 100 | } |
@@ -109,10 +109,10 @@ discard block |
||
109 | 109 | } |
110 | 110 | switch ($this->types[$k]) { |
111 | 111 | case 'NUMBER': |
112 | - $this->last[$k] = (int)$v; |
|
112 | + $this->last[$k] = (int) $v; |
|
113 | 113 | break; |
114 | 114 | case 'FLOAT': |
115 | - $this->last[$k] = (float)$v; |
|
115 | + $this->last[$k] = (float) $v; |
|
116 | 116 | break; |
117 | 117 | } |
118 | 118 | } |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | * @param array|string $column either a single column name or an array of column names |
85 | 85 | * @return static |
86 | 86 | */ |
87 | - public function setPrimaryKey(array|string $column): static |
|
87 | + public function setPrimaryKey(array | string $column): static |
|
88 | 88 | { |
89 | 89 | if (!is_array($column)) { |
90 | - $column = [ $column ]; |
|
90 | + $column = [$column]; |
|
91 | 91 | } |
92 | 92 | $this->data['primary'] = array_values($column); |
93 | 93 | return $this; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | public function getFullName(): string |
116 | 116 | { |
117 | - return ($this->data['schema'] ? $this->data['schema'] . '.' : '') . $this->data['name']; |
|
117 | + return ($this->data['schema'] ? $this->data['schema'].'.' : '').$this->data['name']; |
|
118 | 118 | } |
119 | 119 | /** |
120 | 120 | * Get a column definition |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | public function hasOne( |
172 | 172 | Table $toTable, |
173 | 173 | ?string $name = null, |
174 | - string|array|null $toTableColumn = null, |
|
174 | + string | array | null $toTableColumn = null, |
|
175 | 175 | ?string $sql = null, |
176 | 176 | array $par = [] |
177 | 177 | ) : static { |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | } |
200 | 200 | |
201 | 201 | if (!isset($name)) { |
202 | - $name = $toTable->getName() . '_' . implode('_', array_keys($keymap)); |
|
202 | + $name = $toTable->getName().'_'.implode('_', array_keys($keymap)); |
|
203 | 203 | } |
204 | 204 | $this->addRelation(new TableRelation( |
205 | 205 | $this, |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | public function hasMany( |
227 | 227 | Table $toTable, |
228 | 228 | ?string $name = null, |
229 | - string|array|null $toTableColumn = null, |
|
229 | + string | array | null $toTableColumn = null, |
|
230 | 230 | ?string $sql = null, |
231 | 231 | array $par = [] |
232 | 232 | ): static { |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | public function belongsTo( |
282 | 282 | Table $toTable, |
283 | 283 | ?string $name = null, |
284 | - string|array|null $localColumn = null, |
|
284 | + string | array | null $localColumn = null, |
|
285 | 285 | ?string $sql = null, |
286 | 286 | array $par = [] |
287 | 287 | ): static { |
@@ -337,8 +337,8 @@ discard block |
||
337 | 337 | Table $toTable, |
338 | 338 | Table $pivot, |
339 | 339 | ?string $name = null, |
340 | - string|array|null $toTableColumn = null, |
|
341 | - string|array|null $localColumn = null |
|
340 | + string | array | null $toTableColumn = null, |
|
341 | + string | array | null $localColumn = null |
|
342 | 342 | ): static { |
343 | 343 | $pivotColumns = $pivot->getColumns(); |
344 | 344 |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | |
20 | 20 | public function __construct( |
21 | 21 | DBInterface $db, |
22 | - Table|string $table, |
|
22 | + Table | string $table, |
|
23 | 23 | bool $findRelations = false, |
24 | 24 | ?MapperInterface $mapper = null |
25 | 25 | ) { |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | public function iterator(?array $fields = null, ?array $collectionKey = null): Collection |
35 | 35 | { |
36 | 36 | return Collection::from(parent::iterator($fields, $collectionKey)) |
37 | - ->map(function ($v) { |
|
37 | + ->map(function($v) { |
|
38 | 38 | return $this->mapper->entity($v); |
39 | 39 | }) |
40 | 40 | ->values(); |
@@ -74,19 +74,19 @@ discard block |
||
74 | 74 | ]; |
75 | 75 | } |
76 | 76 | } |
77 | - $connection['type'] = isset($temp['scheme']) && strlen((string)$temp['scheme']) ? $temp['scheme'] : null; |
|
78 | - $connection['user'] = isset($temp['user']) && strlen((string)$temp['user']) ? $temp['user'] : null; |
|
79 | - $connection['pass'] = isset($temp['pass']) && strlen((string)$temp['pass']) ? $temp['pass'] : null; |
|
80 | - $connection['host'] = isset($temp['host']) && strlen((string)$temp['host']) ? $temp['host'] : null; |
|
81 | - $connection['name'] = isset($temp['path']) && strlen((string)$temp['path']) ? |
|
82 | - trim((string)$temp['path'], '/') : null; |
|
83 | - $connection['port'] = isset($temp['port']) && (int)$temp['port'] ? (int)$temp['port'] : null; |
|
84 | - if (isset($temp['query']) && strlen((string)$temp['query'])) { |
|
85 | - parse_str((string)$temp['query'], $connection['opts']); |
|
77 | + $connection['type'] = isset($temp['scheme']) && strlen((string) $temp['scheme']) ? $temp['scheme'] : null; |
|
78 | + $connection['user'] = isset($temp['user']) && strlen((string) $temp['user']) ? $temp['user'] : null; |
|
79 | + $connection['pass'] = isset($temp['pass']) && strlen((string) $temp['pass']) ? $temp['pass'] : null; |
|
80 | + $connection['host'] = isset($temp['host']) && strlen((string) $temp['host']) ? $temp['host'] : null; |
|
81 | + $connection['name'] = isset($temp['path']) && strlen((string) $temp['path']) ? |
|
82 | + trim((string) $temp['path'], '/') : null; |
|
83 | + $connection['port'] = isset($temp['port']) && (int) $temp['port'] ? (int) $temp['port'] : null; |
|
84 | + if (isset($temp['query']) && strlen((string) $temp['query'])) { |
|
85 | + parse_str((string) $temp['query'], $connection['opts']); |
|
86 | 86 | } |
87 | 87 | // create the driver |
88 | 88 | $connection['type'] = $aliases[$connection['type']] ?? $connection['type']; |
89 | - $tmp = '\\vakata\\database\\driver\\'.strtolower((string)$connection['type']).'\\Driver'; |
|
89 | + $tmp = '\\vakata\\database\\driver\\'.strtolower((string) $connection['type']).'\\Driver'; |
|
90 | 90 | if (!class_exists($tmp)) { |
91 | 91 | throw new DBException('Unknown DB backend'); |
92 | 92 | } |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | $map = []; |
131 | 131 | $sql = preg_replace_callback( |
132 | 132 | '(\:[a-z_][a-z0-9_]+)i', |
133 | - function ($matches) use (&$map, $par) { |
|
133 | + function($matches) use (&$map, $par) { |
|
134 | 134 | $key = substr($matches[0], 1); |
135 | 135 | $map[] = $key; |
136 | 136 | return isset($par) && isset($par[$key]) && is_array($par[$key]) ? '??' : '?'; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $new = ''; |
148 | 148 | $par = array_values($par); |
149 | 149 | if (substr_count($sql, '?') === 2 && !is_array($par[0])) { |
150 | - $par = [ $par ]; |
|
150 | + $par = [$par]; |
|
151 | 151 | } |
152 | 152 | $parts = explode('??', $sql); |
153 | 153 | $index = 0; |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | $index += count($tmp) - 1; |
158 | 158 | if (isset($par[$index])) { |
159 | 159 | if (!is_array($par[$index])) { |
160 | - $par[$index] = [ $par[$index] ]; |
|
160 | + $par[$index] = [$par[$index]]; |
|
161 | 161 | } |
162 | 162 | $params = $par[$index]; |
163 | 163 | array_splice($par, $index, 1, $params); |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $new .= implode(',', array_fill(0, count($params), '?')); |
166 | 166 | } |
167 | 167 | } |
168 | - return [ $new, $par ]; |
|
168 | + return [$new, $par]; |
|
169 | 169 | } |
170 | 170 | /** |
171 | 171 | * Run a query (prepare & execute). |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $sql = $tmp['sql']; |
183 | 183 | $ord = []; |
184 | 184 | foreach ($tmp['map'] as $key) { |
185 | - $ord[] = $par[$key] ?? throw new DBException('Missing param ' . $key); |
|
185 | + $ord[] = $par[$key] ?? throw new DBException('Missing param '.$key); |
|
186 | 186 | } |
187 | 187 | $par = $ord; |
188 | 188 | } |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | ): Collection { |
224 | 224 | $coll = Collection::from($this->query($sql, $par, $buff)); |
225 | 225 | if (($keys = $this->driver->option('mode')) && in_array($keys, ['strtoupper', 'strtolower'])) { |
226 | - $coll->map(function ($v) use ($keys) { |
|
226 | + $coll->map(function($v) use ($keys) { |
|
227 | 227 | $new = []; |
228 | 228 | foreach ($v as $k => $vv) { |
229 | 229 | $new[call_user_func($keys, $k)] = $vv; |
@@ -232,18 +232,18 @@ discard block |
||
232 | 232 | }); |
233 | 233 | } |
234 | 234 | if ($key !== null) { |
235 | - $coll->mapKey(function ($v) use ($key): int|string { |
|
235 | + $coll->mapKey(function($v) use ($key): int | string { |
|
236 | 236 | return $v[$key]; |
237 | 237 | }); |
238 | 238 | } |
239 | 239 | if ($skip) { |
240 | - $coll->map(function ($v) use ($key) { |
|
240 | + $coll->map(function($v) use ($key) { |
|
241 | 241 | unset($v[$key]); |
242 | 242 | return $v; |
243 | 243 | }); |
244 | 244 | } |
245 | 245 | if ($opti) { |
246 | - $coll->map(function ($v) { |
|
246 | + $coll->map(function($v) { |
|
247 | 247 | return count($v) === 1 ? current($v) : $v; |
248 | 248 | }); |
249 | 249 | } |
@@ -360,8 +360,7 @@ discard block |
||
360 | 360 | public function definition(string $table, bool $detectRelations = true) : Table |
361 | 361 | { |
362 | 362 | return isset($this->schema) ? |
363 | - $this->schema->getTable($table) : |
|
364 | - $this->driver->table($table, $detectRelations); |
|
363 | + $this->schema->getTable($table) : $this->driver->table($table, $detectRelations); |
|
365 | 364 | } |
366 | 365 | |
367 | 366 | public function hasSchema(): bool |
@@ -471,11 +470,11 @@ discard block |
||
471 | 470 | * @param class-string<T>|Table|string $table |
472 | 471 | * @return ($table is class-string ? MapperInterface<T> : MapperInterface<Entity>) |
473 | 472 | */ |
474 | - public function getMapper(Table|string $table): MapperInterface |
|
473 | + public function getMapper(Table | string $table): MapperInterface |
|
475 | 474 | { |
476 | 475 | if (is_string($table)) { |
477 | - if (isset($this->mappers['::' . $table])) { |
|
478 | - return $this->mappers['::' . $table]; |
|
476 | + if (isset($this->mappers['::'.$table])) { |
|
477 | + return $this->mappers['::'.$table]; |
|
479 | 478 | } |
480 | 479 | $table = $this->definition($table); |
481 | 480 | } |
@@ -484,14 +483,14 @@ discard block |
||
484 | 483 | } |
485 | 484 | return $this->mappers[$table->getFullName()] = new Mapper($this, $table); |
486 | 485 | } |
487 | - public function setMapper(Table|string $table, MapperInterface $mapper, ?string $class = null): static |
|
486 | + public function setMapper(Table | string $table, MapperInterface $mapper, ?string $class = null): static |
|
488 | 487 | { |
489 | 488 | if (is_string($table)) { |
490 | 489 | $table = $this->definition($table); |
491 | 490 | } |
492 | 491 | $this->mappers[$table->getFullName()] = $mapper; |
493 | 492 | if (isset($class)) { |
494 | - $this->mappers['::' . $class] = $mapper; |
|
493 | + $this->mappers['::'.$class] = $mapper; |
|
495 | 494 | } |
496 | 495 | return $this; |
497 | 496 | } |
@@ -502,11 +501,10 @@ discard block |
||
502 | 501 | ): TableQueryMapped { |
503 | 502 | return new TableQueryMapped($this, $this->definition($table), $findRelations, $mapper); |
504 | 503 | } |
505 | - public function __call(string $method, array $args): TableQuery|TableQueryMapped |
|
504 | + public function __call(string $method, array $args): TableQuery | TableQueryMapped |
|
506 | 505 | { |
507 | 506 | return ($args[0] ?? false) ? |
508 | - $this->tableMapped($method, $args[1] ?? false, $args[2] ?? null) : |
|
509 | - $this->table($method, $args[1] ?? false); |
|
507 | + $this->tableMapped($method, $args[1] ?? false, $args[2] ?? null) : $this->table($method, $args[1] ?? false); |
|
510 | 508 | } |
511 | 509 | public function findRelation(string $start, string $end): array |
512 | 510 | { |
@@ -542,12 +540,12 @@ discard block |
||
542 | 540 | $relations[$t] = $w; |
543 | 541 | } |
544 | 542 | if (!isset($schema[$name])) { |
545 | - $schema[$name] = [ 'edges' => [] ]; |
|
543 | + $schema[$name] = ['edges' => []]; |
|
546 | 544 | } |
547 | 545 | foreach ($relations as $t => $w) { |
548 | 546 | $schema[$name]['edges'][$t] = $w; |
549 | 547 | if (!isset($schema[$t])) { |
550 | - $schema[$t] = [ 'edges' => [] ]; |
|
548 | + $schema[$t] = ['edges' => []]; |
|
551 | 549 | } |
552 | 550 | $schema[$t]['edges'][$name] = $w; |
553 | 551 | } |