Merge pull request #3019 from fogs/date_add

Allow dynamic intervals in DATE_ADD & DATE_SUB for SQLite
doctrine · Mar 29, 2018 · a4015c8 · a4015c8
2 parents 792c5b5 + 968e6a5
commit a4015c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php b/lib/Doctrine/DBAL/Platforms/SqlitePlatform.php
@@ -150,6 +150,10 @@ protected function getDateArithmeticIntervalExpression($date, $operator, $interv
                         break;
                 }
 
+                if (! is_numeric($interval)) {
+                    $interval = "' || " . $interval . " || '";
+                }
+
                 return "DATE(" . $date . ",'" . $operator . $interval . " " . $unit . "')";
         }
     }

diff --git a/tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php b/tests/Doctrine/Tests/DBAL/Platforms/SqlitePlatformTest.php
@@ -749,4 +749,14 @@ public function testQuotesTableNameInListTableForeignKeysSQL()
     {
         self::assertContains("'Foo''Bar\\'", $this->_platform->getListTableForeignKeysSQL("Foo'Bar\\"), '', true);
     }
+
+    public function testDateAddStaticNumberOfDays()
+    {
+        self::assertSame("DATE(rentalBeginsOn,'+12 DAY')", $this->_platform->getDateAddDaysExpression('rentalBeginsOn', 12));
+    }
+
+    public function testDateAddNumberOfDaysFromColumn()
+    {
+        self::assertSame("DATE(rentalBeginsOn,'+' || duration || ' DAY')", $this->_platform->getDateAddDaysExpression('rentalBeginsOn', 'duration'));
+    }
 }