Merge pull request vimeo#20 from dmitr1y/feature/curdate-weekday

Add functions CURDATE and WEEKDAY

Author: muglug

src/Processor/Expression/FunctionEvaluator.php

@@ -94,6 +94,11 @@ public static function evaluate(
                 return self::sqlDay($conn, $scope, $expr, $row, $result);
             case 'LAST_DAY':
                 return self::sqlLastDay($conn, $scope, $expr, $row, $result);
+            case 'CURDATE':
+            case 'CURRENT_DATE':
+                return self::sqlCurDate($expr);
+            case 'WEEKDAY':
+                return self::sqlWeekDay($conn, $scope, $expr, $row, $result);
         }
 
         throw new ProcessorException("Function " . $expr->functionName . " not implemented yet");
@@ -203,6 +208,10 @@ public static function getColumnSchema(
             case 'NOW':
                 return new Column\DateTime();
 
+            case 'CURDATE':
+            case 'CURRENT_DATE':
+                return new Column\Date();
+
             case 'DATE':
             case 'LAST_DAY':
                 $arg = Evaluator::getColumnSchema($expr->args[0], $scope, $columns);
@@ -230,6 +239,7 @@ public static function getColumnSchema(
 
             case 'DATEDIFF':
             case 'DAY':
+            case 'WEEKDAY':
                 return new Column\IntColumn(false, 10);
         }
 
@@ -1007,6 +1017,49 @@ private static function sqlLastDay(
         return (new \DateTimeImmutable($subject))->format('Y-m-t');
     }
 
+    /**
+     * @param array<string, mixed> $row
+     */
+    private static function sqlCurDate(FunctionExpression $expr): string
+    {
+        $args = $expr->args;
+
+        if (\count($args) !== 0) {
+            throw new ProcessorException("MySQL CURDATE() function takes no arguments.");
+        }
+
+        return (new \DateTimeImmutable())->format('Y-m-d');
+    }
+
+    /**
+     * @param array<string, mixed> $row
+     */
+    private static function sqlWeekDay(
+        FakePdoInterface $conn,
+        Scope $scope,
+        FunctionExpression $expr,
+        array $row,
+        QueryResult $result
+    ) : ?int {
+        $args = $expr->args;
+
+        if (\count($args) !== 1) {
+            throw new ProcessorException("MySQL WEEKDAY() function must be called with one argument");
+        }
+
+        $subject = Evaluator::evaluate($conn, $scope, $args[0], $row, $result);
+
+        if (!is_string($subject)) {
+            throw new \TypeError('Failed assertion');
+        }
+
+        if (!$subject || \strpos($subject, '0000-00-00') === 0) {
+            return null;
+        }
+
+        return (int)(new \DateTimeImmutable($subject))->format('N');
+    }
+
     /**
      * @param array<string, mixed> $row
      *

tests/EndToEndTest.php

@@ -441,7 +441,8 @@ public function testDateArithhmetic()
                     DATE_ADD(\'2020-02-29 12:31:00\', INTERVAL 1 YEAR) as `g`,
                     DATE_ADD(\'2020-02-29 12:31:00\', INTERVAL 4 YEAR) as `h`,
                     DATE_SUB(\'2020-03-30\', INTERVAL 1 MONTH) As `i`,
-                    DATE_SUB(\'2020-03-01\', INTERVAL 1 MONTH) As `j`'
+                    DATE_SUB(\'2020-03-01\', INTERVAL 1 MONTH) As `j`,
+                    WEEKDAY(\'2021-04-29\') AS `k`'
         );
 
         $query->execute();
@@ -458,6 +459,25 @@ public function testDateArithhmetic()
                 'h' => '2024-02-29 12:31:00',
                 'i' => '2020-02-29',
                 'j' => '2020-02-01',
+                'k' => 4,
+            ]],
+            $query->fetchAll(\PDO::FETCH_ASSOC)
+        );
+    }
+
+    public function testCurDateFunction()
+    {
+        $pdo = self::getPdo('mysql:foo');
+
+        $query = $pdo->prepare('SELECT CURDATE() AS date, CURRENT_DATE() AS date1');
+
+        $query->execute();
+        $current_date = date('Y-m-d');
+
+        $this->assertSame(
+            [[
+                'date' => $current_date,
+                'date1' => $current_date,
             ]],
             $query->fetchAll(\PDO::FETCH_ASSOC)
         );