Merge pull request #21 from dmitr1y/bugfix/round-single-argument

Fix: MySQL function ROUND() can take 1 or 2 arguments.

Author: muglug

src/Processor/Expression/FunctionEvaluator.php

@@ -2,10 +2,11 @@
 namespace Vimeo\MysqlEngine\Processor\Expression;
 
 use Vimeo\MysqlEngine\FakePdoInterface;
+use Vimeo\MysqlEngine\Processor\ProcessorException;
 use Vimeo\MysqlEngine\Processor\QueryResult;
 use Vimeo\MysqlEngine\Processor\Scope;
-use Vimeo\MysqlEngine\Processor\ProcessorException;
 use Vimeo\MysqlEngine\Query\Expression\ColumnExpression;
+use Vimeo\MysqlEngine\Query\Expression\ConstantExpression;
 use Vimeo\MysqlEngine\Query\Expression\Expression;
 use Vimeo\MysqlEngine\Query\Expression\FunctionExpression;
 use Vimeo\MysqlEngine\Query\Expression\IntervalOperatorExpression;
@@ -235,6 +236,19 @@ public static function getColumnSchema(
                 return Evaluator::getColumnSchema($expr->args[0], $scope, $columns);
 
             case 'ROUND':
+                $precision = 0;
+
+                if (isset($expr->args[1])) {
+                    /** @var ConstantExpression $arg */
+                    $arg = $expr->args[1];
+
+                    $precision = (int)$arg->value;
+                }
+
+                if ($precision === 0) {
+                    return new Column\IntColumn(false, 10);
+                }
+
                 return Evaluator::getColumnSchema($expr->args[0], $scope, $columns);
 
             case 'DATEDIFF':
@@ -1239,24 +1253,31 @@ private static function sqlDay(
 
     /**
      * @param array<string, mixed> $row
+     *
+     * @return float|int
      */
     private static function sqlRound(
         FakePdoInterface $conn,
         Scope $scope,
         FunctionExpression $expr,
         array $row,
         QueryResult $result
-    ) : float {
+    ) {
         $args = $expr->args;
 
-        if (\count($args) !== 2) {
-            throw new ProcessorException("MySQL ROUND() function must be called with one arguments");
+        if (\count($args) !== 1 && \count($args) !== 2) {
+            throw new ProcessorException("MySQL ROUND() function must be called with one or two arguments");
+        }
+
+        $number = (float)Evaluator::evaluate($conn, $scope, $args[0], $row, $result);
+
+        if (!isset($args[1])) {
+            return \round($number);
         }
 
-        $first = Evaluator::evaluate($conn, $scope, $args[0], $row, $result);
-        $second = Evaluator::evaluate($conn, $scope, $args[1], $row, $result);
+        $precision = (int)Evaluator::evaluate($conn, $scope, $args[1], $row, $result);
 
-        return \round($first, $second);
+        return \round($number, $precision);
     }
 
     private static function getPhpIntervalFromExpression(

tests/EndToEndTest.php

@@ -542,6 +542,26 @@ public function testDecimalArithhmetic()
         );
     }
 
+    public function testRound()
+    {
+        $pdo = self::getPdo('mysql:foo');
+        $pdo->setAttribute(\PDO::ATTR_EMULATE_PREPARES, false);
+
+        $query = $pdo->prepare('SELECT ROUND(3.141592) AS a, ROUND(3.141592, 2) AS b');
+
+        $query->execute();
+
+        $this->assertSame(
+            [
+                [
+                    'a' => 3,
+                    'b' => 3.14,
+                ],
+            ],
+            $query->fetchAll(\PDO::FETCH_ASSOC)
+        );
+    }
+
     public function testIsInFullSubquery()
     {
         $pdo = self::getConnectionToFullDB(false);