Skip to content

EspoCRM – Open Source CRM Application

pgsql TZ fix

Yuri Kuznetsov1ee853890c5b
diff --git a/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php b/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
index 3760e52263..9a1d71cf5b 100644
--- a/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/PostgresqlQueryComposer.php
@@ -192,6 +192,13 @@ class PostgresqlQueryComposer extends BaseQueryComposer
$offsetHoursString = substr($offsetHoursString, 1, -1);
}
+ if (str_contains($offsetHoursString, '.')) {
+ $minutes = (int) (floatval($offsetHoursString) * 60);
+ $minutesString = (string) $minutes;
+
+ return "$argumentPartList[0] + INTERVAL 'MINUTE $minutesString'";
+ }
+
return "$argumentPartList[0] + INTERVAL 'HOUR $offsetHoursString'";
}
diff --git a/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php b/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
index f44833b021..6f9bf7f2e9 100644
--- a/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
+++ b/tests/unit/Espo/ORM/PostgresqlQueryComposerTest.php
@@ -278,4 +278,73 @@ class PostgresqlQueryComposerTest extends \PHPUnit\Framework\TestCase
$this->assertEquals($expectedSql, $sql);
}
+
+ public function testSelectFunctionTz1()
+ {
+ $query = SelectBuilder::create()
+ ->from('Comment')
+ ->select(
+ Expression::convertTimezone(
+ Expression::column('createdAt'),
+ 5.5
+ ),
+ 'createdAt'
+ )
+ ->withDeleted()
+ ->build();
+
+ $sql = $this->queryComposer->composeSelect($query);
+
+ $expectedSql =
+ 'SELECT "comment"."created_at" + INTERVAL \'MINUTE 330\' AS "createdAt" ' .
+ 'FROM "comment"';
+
+ $this->assertEquals($expectedSql, $sql);
+ }
+
+ public function testSelectFunctionTz2()
+ {
+ $query = SelectBuilder::create()
+ ->from('Comment')
+ ->select(
+ Expression::convertTimezone(
+ Expression::column('createdAt'),
+ -5.5
+ ),
+ 'createdAt'
+ )
+ ->withDeleted()
+ ->build();
+
+ $sql = $this->queryComposer->composeSelect($query);
+
+ $expectedSql =
+ 'SELECT "comment"."created_at" + INTERVAL \'MINUTE -330\' AS "createdAt" ' .
+ 'FROM "comment"';
+
+ $this->assertEquals($expectedSql, $sql);
+ }
+
+ public function testSelectFunctionTz3()
+ {
+ $query = SelectBuilder::create()
+ ->from('Comment')
+ ->select(
+ Expression::convertTimezone(
+ Expression::column('createdAt'),
+ 5
+ ),
+ 'createdAt'
+ )
+ ->withDeleted()
+ ->build();
+
+ $sql = $this->queryComposer->composeSelect($query);
+
+ $expectedSql =
+ 'SELECT "comment"."created_at" + INTERVAL \'HOUR 5\' AS "createdAt" ' .
+ 'FROM "comment"';
+
+ $this->assertEquals($expectedSql, $sql);
+ }
}