@@ -114,7 +114,7 @@ |
||
114 | 114 | * |
115 | 115 | * @return array |
116 | 116 | */ |
117 | - public function userTypes() ; |
|
117 | + public function userTypes(); |
|
118 | 118 | |
119 | 119 | /** |
120 | 120 | * Get existing schemas |
@@ -495,7 +495,7 @@ |
||
495 | 495 | public function applyQueries(string $query, array $tables, $escape = null) |
496 | 496 | { |
497 | 497 | if (!$escape) { |
498 | - $escape = function ($table) { |
|
498 | + $escape = function($table) { |
|
499 | 499 | return $this->table($table); |
500 | 500 | }; |
501 | 501 | } |
@@ -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 |
@@ -49,10 +49,10 @@ |
||
49 | 49 | */ |
50 | 50 | public function html($string): string |
51 | 51 | { |
52 | - if(!$string) { |
|
52 | + if (!$string) { |
|
53 | 53 | return ''; |
54 | 54 | } |
55 | - $string = str_replace("\n", '<br>', $string); |
|
55 | + $string = str_replace("\n", '<br>', $string); |
|
56 | 56 | return str_replace("\0", '�', htmlspecialchars($string, ENT_QUOTES, 'utf-8')); |
57 | 57 | } |
58 | 58 |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * |
66 | 66 | * @return boolean |
67 | 67 | */ |
68 | - public function createDatabase(string $database, string $collation) ; |
|
68 | + public function createDatabase(string $database, string $collation); |
|
69 | 69 | |
70 | 70 | /** |
71 | 71 | * Drop a database |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | * |
92 | 92 | * @return array |
93 | 93 | */ |
94 | - public function routineLanguages() ; |
|
94 | + public function routineLanguages(); |
|
95 | 95 | |
96 | 96 | /** |
97 | 97 | * Get server variables |
@@ -236,11 +236,9 @@ discard block |
||
236 | 236 | $bUseSqlLike = $this->driver->jush() === 'sql' && is_numeric($value) && preg_match('~\.~', $value); |
237 | 237 | return $column . ($bUseSqlLike ? |
238 | 238 | // LIKE because of floats but slow with ints |
239 | - " LIKE " . $this->driver->quote($value) : |
|
240 | - ($this->driver->jush() === 'mssql' ? |
|
239 | + " LIKE " . $this->driver->quote($value) : ($this->driver->jush() === 'mssql' ? |
|
241 | 240 | // LIKE because of text |
242 | - " LIKE " . $this->driver->quote(preg_replace('~[_%[]~', '[\0]', $value)) : |
|
243 | - //! enum and set |
|
241 | + " LIKE " . $this->driver->quote(preg_replace('~[_%[]~', '[\0]', $value)) : //! enum and set |
|
244 | 242 | " = " . $this->driver->unconvertField($field, $this->driver->quote($value)))); |
245 | 243 | } |
246 | 244 | |
@@ -255,8 +253,7 @@ discard block |
||
255 | 253 | { |
256 | 254 | $bCollate = $this->driver->jush() === 'sql' && |
257 | 255 | preg_match('~char|text~', $field->type) && preg_match("~[^ -@]~", $value); |
258 | - return !$bCollate ? '' : |
|
259 | - // not just [a-z] to catch non-ASCII characters |
|
256 | + return !$bCollate ? '' : // not just [a-z] to catch non-ASCII characters |
|
260 | 257 | "$column = " . $this->driver->quote($value) . " COLLATE " . $this->driver->charset() . "_bin"; |
261 | 258 | } |
262 | 259 | |
@@ -272,7 +269,7 @@ discard block |
||
272 | 269 | { |
273 | 270 | $clauses = []; |
274 | 271 | $wheres = $where["where"] ?? []; |
275 | - foreach ((array) $wheres as $key => $value) { |
|
272 | + foreach ((array)$wheres as $key => $value) { |
|
276 | 273 | $key = $this->util->bracketEscape($key, 1); // 1 - back |
277 | 274 | $column = $this->util->escapeKey($key); |
278 | 275 | $clauses[] = $this->getWhereColumnClause($fields[$key], $column, $value); |
@@ -281,7 +278,7 @@ discard block |
||
281 | 278 | } |
282 | 279 | } |
283 | 280 | $nulls = $where["null"] ?? []; |
284 | - foreach ((array) $nulls as $key) { |
|
281 | + foreach ((array)$nulls as $key) { |
|
285 | 282 | $clauses[] = $this->util->escapeKey($key) . " IS NULL"; |
286 | 283 | } |
287 | 284 | return implode(" AND ", $clauses); |