Merge d8fcdc0 into 97762d2

doctrine · Aug 6, 2013 · 1d37685 · 1d37685
2 parents 97762d2 + d8fcdc0
commit 1d37685
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
@@ -45,6 +45,11 @@ class DateAddFunction extends FunctionNode
     public function getSql(SqlWalker $sqlWalker)
     {
         switch (strtolower($this->unit->value)) {
+            case 'hour':
+                return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddHourExpression(
+                    $this->firstDateExpression->dispatch($sqlWalker),
+                    $this->intervalExpression->dispatch($sqlWalker)
+                );
             case 'day':
                 return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddDaysExpression(
                     $this->firstDateExpression->dispatch($sqlWalker),
@@ -59,7 +64,7 @@ public function getSql(SqlWalker $sqlWalker)
 
             default:
                 throw QueryException::semanticalError(
-                    'DATE_ADD() only supports units of type day and month.'
+                    'DATE_ADD() only supports units of type hour, day and month.'
                 );
         }
     }

diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
@@ -39,6 +39,11 @@ class DateSubFunction extends DateAddFunction
     public function getSql(SqlWalker $sqlWalker)
     {
         switch (strtolower($this->unit->value)) {
+            case 'hour':
+                return $sqlWalker->getConnection()->getDatabasePlatform()->getDateSubHourExpression(
+                    $this->firstDateExpression->dispatch($sqlWalker),
+                    $this->intervalExpression->dispatch($sqlWalker)
+                );
             case 'day':
                 return $sqlWalker->getConnection()->getDatabasePlatform()->getDateSubDaysExpression(
                     $this->firstDateExpression->dispatch($sqlWalker),
@@ -53,7 +58,7 @@ public function getSql(SqlWalker $sqlWalker)
 
             default:
                 throw QueryException::semanticalError(
-                    'DATE_SUB() only supports units of type day and month.'
+                    'DATE_SUB() only supports units of type hour, day and month.'
                 );
         }
     }