diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
new file mode 100644
index 000000000..1d840cc49
--- /dev/null
+++ b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php
@@ -0,0 +1,71 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Query\AST\Functions;
+
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\QueryException;
+
+/**
+ * "DATE_ADD(date1, interval, unit)"
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link www.doctrine-project.org
+ * @since 2.0
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
+ */
+class DateAddFunction extends FunctionNode
+{
+ public $firstDateExpression = null;
+ public $intervalExpression = null;
+ public $unit = null;
+
+ public function getSql(SqlWalker $sqlWalker)
+ {
+ $unit = strtolower($this->unit);
+ if ($unit == "day") {
+ return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddDaysExpression(
+ $this->firstDateExpression->dispatch($sqlWalker),
+ $this->intervalExpression->dispatch($sqlWalker)
+ );
+ } else if ($unit == "month") {
+ return $sqlWalker->getConnection()->getDatabasePlatform()->getDateAddMonthExpression(
+ $this->firstDateExpression->dispatch($sqlWalker),
+ $this->intervalExpression->dispatch($sqlWalker)
+ );
+ } else {
+ throw QueryException::semanticalError('DATE_ADD() only supports units of type day and month.');
+ }
+ }
+
+ public function parse(Parser $parser)
+ {
+ $parser->match(Lexer::T_IDENTIFIER);
+ $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+ $this->firstDateExpression = $parser->ArithmeticPrimary();
+ $parser->match(Lexer::T_COMMA);
+ $this->intervalExpression = $parser->ArithmeticPrimary();
+ $parser->match(Lexer::T_COMMA);
+ $this->unit = $parser->StringPrimary();
+ $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+ }
+}
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php
new file mode 100644
index 000000000..4de5411bd
--- /dev/null
+++ b/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Query\AST\Functions;
+
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\Parser;
+
+/**
+ * "DATE_DIFF(date1, date2)"
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link www.doctrine-project.org
+ * @since 2.0
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
+ */
+class DateDiffFunction extends FunctionNode
+{
+ public $date1;
+ public $date2;
+
+ public function getSql(SqlWalker $sqlWalker)
+ {
+ return $sqlWalker->getConnection()->getDatabasePlatform()->getDateDiffExpression(
+ $this->date1->dispatch($sqlWalker),
+ $this->date2->dispatch($sqlWalker)
+ );
+ }
+
+ public function parse(Parser $parser)
+ {
+ $parser->match(Lexer::T_IDENTIFIER);
+ $parser->match(Lexer::T_OPEN_PARENTHESIS);
+
+ $this->date1 = $parser->ArithmeticPrimary();
+ $parser->match(Lexer::T_COMMA);
+ $this->date2 = $parser->ArithmeticPrimary();
+
+ $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+ }
+}
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
new file mode 100644
index 000000000..a608d49d4
--- /dev/null
+++ b/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\ORM\Query\AST\Functions;
+
+use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\QueryException;
+
+/**
+ * "DATE_ADD(date1, interval, unit)"
+ *
+ * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link www.doctrine-project.org
+ * @since 2.0
+ * @author Benjamin Eberlei <kontakt@beberlei.de>
+ */
+class DateSubFunction extends DateAddFunction
+{
+ public $firstDateExpression = null;
+ public $intervalExpression = null;
+ public $unit = null;
+
+ public function getSql(SqlWalker $sqlWalker)
+ {
+ $unit = strtolower($this->unit);
+ if ($unit == "day") {
+ return $sqlWalker->getConnection()->getDatabasePlatform()->getDateSubDaysExpression(
+ $this->firstDateExpression->dispatch($sqlWalker),
+ $this->intervalExpression->dispatch($sqlWalker)
+ );
+ } else if ($unit == "month") {
+ return $sqlWalker->getConnection()->getDatabasePlatform()->getDateSubMonthExpression(
+ $this->firstDateExpression->dispatch($sqlWalker),
+ $this->intervalExpression->dispatch($sqlWalker)
+ );
+ } else {
+ throw QueryException::semanticalError('DATE_SUB() only supports units of type day and month.');
+ }
+ }
+}
\ No newline at end of file
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
index a5e1fa1ab..6cd0bdad6 100644
--- a/lib/Doctrine/ORM/Query/Parser.php
+++ b/lib/Doctrine/ORM/Query/Parser.php
@@ -45,19 +45,22 @@ class Parser
/** READ-ONLY: Maps BUILT-IN numeric function names to AST class names. */
private static $_NUMERIC_FUNCTIONS = array(
- 'length' => 'Doctrine\ORM\Query\AST\Functions\LengthFunction',
- 'locate' => 'Doctrine\ORM\Query\AST\Functions\LocateFunction',
- 'abs' => 'Doctrine\ORM\Query\AST\Functions\AbsFunction',
- 'sqrt' => 'Doctrine\ORM\Query\AST\Functions\SqrtFunction',
- 'mod' => 'Doctrine\ORM\Query\AST\Functions\ModFunction',
- 'size' => 'Doctrine\ORM\Query\AST\Functions\SizeFunction'
+ 'length' => 'Doctrine\ORM\Query\AST\Functions\LengthFunction',
+ 'locate' => 'Doctrine\ORM\Query\AST\Functions\LocateFunction',
+ 'abs' => 'Doctrine\ORM\Query\AST\Functions\AbsFunction',
+ 'sqrt' => 'Doctrine\ORM\Query\AST\Functions\SqrtFunction',
+ 'mod' => 'Doctrine\ORM\Query\AST\Functions\ModFunction',
+ 'size' => 'Doctrine\ORM\Query\AST\Functions\SizeFunction',
+ 'date_diff' => 'Doctrine\ORM\Query\AST\Functions\DateDiffFunction',
);
/** READ-ONLY: Maps BUILT-IN datetime function names to AST class names. */
private static $_DATETIME_FUNCTIONS = array(
'current_date' => 'Doctrine\ORM\Query\AST\Functions\CurrentDateFunction',
'current_time' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimeFunction',
- 'current_timestamp' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimestampFunction'
+ 'current_timestamp' => 'Doctrine\ORM\Query\AST\Functions\CurrentTimestampFunction',
+ 'date_add' => 'Doctrine\ORM\Query\AST\Functions\DateAddFunction',
+ 'date_sub' => 'Doctrine\ORM\Query\AST\Functions\DateSubFunction',
);
/**
diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal
index b21fc4263..0a9943872 160000
--- a/lib/vendor/doctrine-dbal
+++ b/lib/vendor/doctrine-dbal
@@ -1 +1 @@
-Subproject commit b21fc4263d69a8b969c2d127a7db858646418247
+Subproject commit 0a99438729e59bcb5262b22c06c782de4dfacbb0
diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
index 09ddaf0a3..42971e6b0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php
@@ -268,7 +268,49 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->assertEquals('Guilherme B.Complaint Department', $arg[2]['namedep']);
$this->assertEquals('Benjamin E.HR', $arg[3]['namedep']);
}
-
+
+ /**
+ * @group DDC-1014
+ */
+ public function testDateDiff()
+ {
+ $arg = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), '2011-01-01') AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m")
+ ->getARrayResult();
+
+ $this->assertTrue($arg[0]['diff'] > 0);
+ }
+
+ /**
+ * @group DDC-1014
+ */
+ public function testDateAdd()
+ {
+ $arg = $this->_em->createQuery("SELECT DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day') AS add FROM Doctrine\Tests\Models\Company\CompanyManager m")
+ ->getArrayResult();
+
+ $this->assertTrue(strtotime($arg[0]['add']) > 0);
+
+ $arg = $this->_em->createQuery("SELECT DATE_ADD(CURRENT_TIMESTAMP(), 10, 'month') AS add FROM Doctrine\Tests\Models\Company\CompanyManager m")
+ ->getArrayResult();
+
+ $this->assertTrue(strtotime($arg[0]['add']) > 0);
+ }
+
+ /**
+ * @group DDC-1014
+ */
+ public function testDateSub()
+ {
+ $arg = $this->_em->createQuery("SELECT DATE_SUB(CURRENT_TIMESTAMP(), 10, 'day') AS add FROM Doctrine\Tests\Models\Company\CompanyManager m")
+ ->getArrayResult();
+
+ $this->assertTrue(strtotime($arg[0]['add']) > 0);
+
+ $arg = $this->_em->createQuery("SELECT DATE_SUB(CURRENT_TIMESTAMP(), 10, 'month') AS add FROM Doctrine\Tests\Models\Company\CompanyManager m")
+ ->getArrayResult();
+
+ $this->assertTrue(strtotime($arg[0]['add']) > 0);
+ }
protected function generateFixture()
{