Skip to content

EspoCRM – Open Source CRM Application

fix pgsql interval

Yuri Kuznetsov98eb30490397
diff --git a/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php b/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
index c87852d2e0..375f9c002a 100644
--- a/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
@@ -196,10 +196,10 @@ class PostgresqlQueryComposer extends BaseQueryComposer
$minutes = (int) (floatval($offsetHoursString) * 60);
$minutesString = (string) $minutes;
- return "$argumentPartList[0] + INTERVAL 'MINUTE $minutesString'";
+ return "$argumentPartList[0] + INTERVAL '$minutesString MINUTE'";
}
- return "$argumentPartList[0] + INTERVAL 'HOUR $offsetHoursString'";
+ return "$argumentPartList[0] + INTERVAL '$offsetHoursString HOUR'";
}
if ($function === 'POSITION_IN_LIST') {
diff --git a/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php b/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
index 247b718783..ec4f7bf837 100644
--- a/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
+++ b/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
@@ -296,7 +296,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
- 'SELECT "comment"."created_at" + INTERVAL \'MINUTE 330\' AS "createdAt" ' .
+ 'SELECT "comment"."created_at" + INTERVAL \'330 MINUTE\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);
@@ -319,7 +319,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
- 'SELECT "comment"."created_at" + INTERVAL \'MINUTE -330\' AS "createdAt" ' .
+ 'SELECT "comment"."created_at" + INTERVAL \'-330 MINUTE\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);
@@ -342,7 +342,7 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$sql = $this->queryComposer->composeSelect($query);
$expectedSql =
- 'SELECT "comment"."created_at" + INTERVAL \'HOUR 5\' AS "createdAt" ' .
+ 'SELECT "comment"."created_at" + INTERVAL \'5 HOUR\' AS "createdAt" ' .
'FROM "comment"';
$this->assertEquals($expectedSql, $sql);