Merge pull request doctrine#1314 from FabioBatSilva/date-add-second

Ocramius · Ocramius · commit a41e774bb1f8 · 2015-02-26T10:20:52.000Z
DATE_ADD - Support for seconds
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
@@ -45,6 +45,12 @@ class DateAddFunction extends FunctionNode
     public function getSql(SqlWalker $sqlWalker)
     {
         switch (strtolower($this->unit->value)) {
+            case 'second':
+                return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddSecondsExpression(
+                    $this->firstDateExpression->dispatch($sqlWalker),
+                    $this->intervalExpression->dispatch($sqlWalker)
+                );
+
             case 'hour':
                 return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddHourExpression(
                     $this->firstDateExpression->dispatch($sqlWalker),
@@ -64,7 +70,7 @@ public function getSql(SqlWalker $sqlWalker)
 
             default:
                 throw QueryException::semanticalError(
-                    'DATE_ADD() only supports units of type hour, day and month.'
+                    'DATE_ADD() only supports units of type second, hour, day and month.'
                 );
         }
     }
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -300,6 +300,23 @@ public function testDateAdd()
         $this->assertTrue(strtotime($arg[0]['add']) > 0);
     }
 
+    public function testDateAddSecond()
+    {
+        $dql     = "SELECT CURRENT_TIMESTAMP() now, DATE_ADD(CURRENT_TIMESTAMP(), 10, 'second') AS add FROM Doctrine\Tests\Models\Company\CompanyManager m";
+        $query   = $this->_em->createQuery($dql)->setMaxResults(1);
+        $result  = $query->getArrayResult();
+
+        $this->assertCount(1, $result);
+        $this->assertArrayHasKey('now', $result[0]);
+        $this->assertArrayHasKey('add', $result[0]);
+
+        $now  = strtotime($result[0]['now']);
+        $add  = strtotime($result[0]['add']);
+        $diff = $add - $now;
+
+        $this->assertSQLEquals(10, $diff);
+    }
+
     /**
      * @group DDC-1014
      */
