@@ -96,8 +96,7 @@ discard block |
||
96 | 96 | if ($rowCount > 0) { |
97 | 97 | $numRows = $statement->rowCount(); |
98 | 98 | $message = ($numRows ? ($limit && $numRows > $limit ? |
99 | - $this->trans->lang('%d / ', $limit) : |
|
100 | - "") . $this->trans->lang('%d row(s)', $numRows) : ""); |
|
99 | + $this->trans->lang('%d / ', $limit) : "") . $this->trans->lang('%d row(s)', $numRows) : ""); |
|
101 | 100 | } |
102 | 101 | |
103 | 102 | // Table header |
@@ -179,9 +178,7 @@ discard block |
||
179 | 178 | $timestamps = []; |
180 | 179 | // TODO: Move this to driver implementations |
181 | 180 | $parse = '[\'"' . |
182 | - ($this->driver->jush() == "sql" ? '`#' : |
|
183 | - ($this->driver->jush() == "sqlite" ? '`[' : |
|
184 | - ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . |
|
181 | + ($this->driver->jush() == "sql" ? '`#' : ($this->driver->jush() == "sqlite" ? '`[' : ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . |
|
185 | 182 | ($this->driver->jush() == "pgsql" ? '|\$[^$]*\$' : ''); |
186 | 183 | // $total_start = \microtime(true); |
187 | 184 | // \parse_str($_COOKIE["adminer_export"], $adminer_export); |
@@ -207,8 +204,7 @@ discard block |
||
207 | 204 | |
208 | 205 | if ($found && \rtrim($found) != $delimiter) { |
209 | 206 | // find matching quote or comment end |
210 | - while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : |
|
211 | - (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) . |
|
207 | + while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) . |
|
212 | 208 | "|\\\\."))) . '|$)s', $queries, $match, PREG_OFFSET_CAPTURE, $offset)) { |
213 | 209 | //! respect sql_mode NO_BACKSLASH_ESCAPES |
214 | 210 | $s = $match[0][0]; |
@@ -303,7 +299,7 @@ discard block |
||
303 | 299 | if ($empty) { |
304 | 300 | $messages[] = $this->trans->lang('No commands to execute.'); |
305 | 301 | } elseif ($onlyErrors) { |
306 | - $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors)); |
|
302 | + $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - \count($errors)); |
|
307 | 303 | // $timestamps[] = $this->trans->formatTime($total_start); |
308 | 304 | } |
309 | 305 | // elseif($errors && $commands > 1) |