@@ -228,11 +228,9 @@ discard block |
||
228 | 228 | $bUseSqlLike = $this->driver->jush() === 'sql' && is_numeric($value) && preg_match('~\.~', $value); |
229 | 229 | return $column . ($bUseSqlLike ? |
230 | 230 | // LIKE because of floats but slow with ints |
231 | - " LIKE " . $this->driver->quote($value) : |
|
232 | - ($this->driver->jush() === 'mssql' ? |
|
231 | + " LIKE " . $this->driver->quote($value) : ($this->driver->jush() === 'mssql' ? |
|
233 | 232 | // LIKE because of text |
234 | - " LIKE " . $this->driver->quote(preg_replace('~[_%[]~', '[\0]', $value)) : |
|
235 | - //! enum and set |
|
233 | + " LIKE " . $this->driver->quote(preg_replace('~[_%[]~', '[\0]', $value)) : //! enum and set |
|
236 | 234 | " = " . $this->driver->unconvertField($field, $this->driver->quote($value)))); |
237 | 235 | } |
238 | 236 | |
@@ -247,8 +245,7 @@ discard block |
||
247 | 245 | { |
248 | 246 | $bCollate = $this->driver->jush() === 'sql' && |
249 | 247 | preg_match('~char|text~', $field->type) && preg_match("~[^ -@]~", $value); |
250 | - return !$bCollate ? '' : |
|
251 | - // not just [a-z] to catch non-ASCII characters |
|
248 | + return !$bCollate ? '' : // not just [a-z] to catch non-ASCII characters |
|
252 | 249 | "$column = " . $this->driver->quote($value) . " COLLATE " . $this->driver->charset() . "_bin"; |
253 | 250 | } |
254 | 251 | |
@@ -264,7 +261,7 @@ discard block |
||
264 | 261 | { |
265 | 262 | $clauses = []; |
266 | 263 | $wheres = $where["where"] ?? []; |
267 | - foreach ((array) $wheres as $key => $value) { |
|
264 | + foreach ((array)$wheres as $key => $value) { |
|
268 | 265 | $key = $this->driver->bracketEscape($key, 1); // 1 - back |
269 | 266 | $column = $this->driver->escapeKey($key); |
270 | 267 | $clauses[] = $this->getWhereColumnClause($fields[$key], $column, $value); |
@@ -273,7 +270,7 @@ discard block |
||
273 | 270 | } |
274 | 271 | } |
275 | 272 | $nulls = $where["null"] ?? []; |
276 | - foreach ((array) $nulls as $key) { |
|
273 | + foreach ((array)$nulls as $key) { |
|
277 | 274 | $clauses[] = $this->driver->escapeKey($key) . " IS NULL"; |
278 | 275 | } |
279 | 276 | return implode(" AND ", $clauses); |
@@ -258,7 +258,7 @@ |
||
258 | 258 | public function applyQueries(string $query, array $tables, $escape = null) |
259 | 259 | { |
260 | 260 | if (!$escape) { |
261 | - $escape = function ($table) { |
|
261 | + $escape = function($table) { |
|
262 | 262 | return $this->escapeTableName($table); |
263 | 263 | }; |
264 | 264 | } |