@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | private function fkFields(ForeignKeyEntity $foreignKey) |
94 | 94 | { |
95 | - $escape = function ($idf) { return $this->escapeId($idf); }; |
|
95 | + $escape = function($idf) { return $this->escapeId($idf); }; |
|
96 | 96 | return [ |
97 | 97 | implode(', ', array_map($escape, $foreignKey->source)), |
98 | 98 | implode(', ', array_map($escape, $foreignKey->target)), |
@@ -186,8 +186,7 @@ discard block |
||
186 | 186 | $query .= ' WHERE ' . implode(' AND ', $where); |
187 | 187 | } |
188 | 188 | return ($isGroup && ($this->driver->jush() == 'sql' || count($groups) == 1) ? |
189 | - 'SELECT COUNT(DISTINCT ' . implode(', ', $groups) . ")$query" : |
|
190 | - 'SELECT COUNT(*)' . ($isGroup ? " FROM (SELECT 1$query GROUP BY " . |
|
189 | + 'SELECT COUNT(DISTINCT ' . implode(', ', $groups) . ")$query" : 'SELECT COUNT(*)' . ($isGroup ? " FROM (SELECT 1$query GROUP BY " . |
|
191 | 190 | implode(', ', $groups) . ') x' : $query) |
192 | 191 | ); |
193 | 192 | } |
@@ -234,8 +233,7 @@ discard block |
||
234 | 233 | */ |
235 | 234 | private function notQuery(QueryEntity $queryEntity, string $found, array &$match) |
236 | 235 | { |
237 | - return preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : |
|
238 | - (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', |
|
236 | + return preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', |
|
239 | 237 | $queryEntity->queries, $match, PREG_OFFSET_CAPTURE, $queryEntity->offset) > 0; |
240 | 238 | } |
241 | 239 |