@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | * @param mixed $value |
39 | 39 | * |
40 | 40 | * @return string |
41 | - */ |
|
41 | + */ |
|
42 | 42 | // protected function editLink($value) |
43 | 43 | // { |
44 | 44 | // $link = ''; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @param array $types |
66 | 66 | * |
67 | 67 | * @return string |
68 | - */ |
|
68 | + */ |
|
69 | 69 | protected function values(array $row, array $blobs, array $types) |
70 | 70 | { |
71 | 71 | $values = []; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * @param int $limit |
93 | 93 | * |
94 | 94 | * @return string |
95 | - */ |
|
95 | + */ |
|
96 | 96 | private function message($statement, int $limit) |
97 | 97 | { |
98 | 98 | $numRows = $statement->rowCount(); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @param array $orgtables |
112 | 112 | * |
113 | 113 | * @return string |
114 | - */ |
|
114 | + */ |
|
115 | 115 | // protected function indexes($field, array $orgtables) |
116 | 116 | // { |
117 | 117 | // static $links = []; // colno => orgtable - create links from these columns |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | * @param int $limit |
149 | 149 | * |
150 | 150 | * @return array |
151 | - */ |
|
151 | + */ |
|
152 | 152 | protected function select($statement, $limit = 0) |
153 | 153 | { |
154 | 154 | $blobs = []; // colno => bool - display bytes for blobs |
@@ -208,9 +208,7 @@ discard block |
||
208 | 208 | |
209 | 209 | // TODO: Move this to driver implementations |
210 | 210 | $parse = '[\'"' . |
211 | - ($this->driver->jush() == "sql" ? '`#' : |
|
212 | - ($this->driver->jush() == "sqlite" ? '`[' : |
|
213 | - ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . |
|
211 | + ($this->driver->jush() == "sql" ? '`#' : ($this->driver->jush() == "sqlite" ? '`[' : ($this->driver->jush() == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . |
|
214 | 212 | ($this->driver->jush() == "pgsql" ? '|\$[^$]*\$' : ''); |
215 | 213 | // should always match |
216 | 214 | \preg_match('(' . \preg_quote($delimiter) . "\\s*|$parse)", $queries, $match, PREG_OFFSET_CAPTURE, $offset); |
@@ -223,8 +221,7 @@ discard block |
||
223 | 221 | |
224 | 222 | if (!empty($found) && \rtrim($found) != $delimiter) { |
225 | 223 | // find matching quote or comment end |
226 | - while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : |
|
227 | - (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) . "|\\\\."))) . '|$)s', |
|
224 | + while (\preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (\preg_match('~^-- |^#~', $found) ? "\n" : \preg_quote($found) . "|\\\\."))) . '|$)s', |
|
228 | 225 | $queries, $match, PREG_OFFSET_CAPTURE, $offset)) { |
229 | 226 | //! respect sql_mode NO_BACKSLASH_ESCAPES |
230 | 227 | $s = $match[0][0]; |
@@ -324,7 +321,7 @@ discard block |
||
324 | 321 | \ini_set('memory_limit', \max($this->util->iniBytes('memory_limit'), |
325 | 322 | 2 * \strlen($queries) + \memory_get_usage() + 8e6)); |
326 | 323 | } |
327 | - catch(\Exception $e) { |
|
324 | + catch (\Exception $e) { |
|
328 | 325 | // Do nothing if the option is not modified. |
329 | 326 | } |
330 | 327 | } |
@@ -380,7 +377,7 @@ discard block |
||
380 | 377 | if ($empty) { |
381 | 378 | $messages[] = $this->trans->lang('No commands to execute.'); |
382 | 379 | } elseif ($onlyErrors) { |
383 | - $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - $errors); |
|
380 | + $messages[] = $this->trans->lang('%d query(s) executed OK.', $commands - $errors); |
|
384 | 381 | // $timestamps[] = $this->trans->formatTime($total_start); |
385 | 382 | } |
386 | 383 |