Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/Processor/Expression/FunctionEvaluator.php
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,7 @@ private static function sqlTimestampdiff(
* @param array<string, mixed> $row
* @param QueryResult $result
*
* @return int
* @return mixed|null
* @throws ProcessorException
*/
private static function sqlLeast(
Expand All @@ -1696,29 +1696,32 @@ private static function sqlLeast(
$evaluated_args = [];

foreach ($args as $arg) {
/** @var string|int|float|null $evaluated_arg */
$evaluated_arg = Evaluator::evaluate($conn, $scope, $arg, $row, $result);
if (is_null($evaluated_arg)) {
return null;
}

if (is_float($evaluated_arg)) {
$is_any_float = true;
$precision = max($precision, strlen(substr(strrchr(strval($evaluated_arg), "."), 1)));
$precision = max($precision, strlen(substr(strrchr((string) $evaluated_arg, "."), 1)));
}

$is_any_string = $is_any_string || is_string($evaluated_arg);
$evaluated_args[] = $evaluated_arg;
}

if ($is_any_string) {
$evaluated_str_args = array_map(fn($evaluated_arg) => strval($evaluated_arg), $evaluated_args);
return min(...$evaluated_str_args);
$evaluated_str_args = array_map(function($arg) {
return (string) $arg;
}, $evaluated_args);
return min($evaluated_str_args);
}

if ($is_any_float) {
return number_format(min(...$evaluated_args), $precision);
return number_format((float) min($evaluated_args), $precision);
}

return min(...$evaluated_args);
return min($evaluated_args);
}
}
7 changes: 5 additions & 2 deletions tests/EndToEndTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1447,8 +1447,11 @@ public function testLeast($args, $expected_value): void
$pdo = self::getPdo('mysql:host=localhost;dbname=testdb');
$pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);

$args_str = implode(', ', array_map(fn ($arg) => is_null($arg) ? 'null' : strval($arg), $args));
$query = $pdo->prepare(sprintf('SELECT LEAST(%s) as result', $args_str),);
$args_str = implode(', ', array_map(function ($arg) {
return is_null($arg) ? 'null' : (string) $arg;
}, $args));

$query = $pdo->prepare(sprintf('SELECT LEAST(%s) as result', $args_str));
$query->execute();

$result = $query->fetch(\PDO::FETCH_ASSOC);
Expand Down
Loading