]> git.basschouten.com Git - openhab-addons.git/commitdiff
Fix date filter to be inclusive (PostgreSQL) (#13843)
authorJacob Laursen <jacob-github@vindvejr.dk>
Sun, 4 Dec 2022 23:27:54 +0000 (00:27 +0100)
committerGitHub <noreply@github.com>
Sun, 4 Dec 2022 23:27:54 +0000 (00:27 +0100)
Fixes #9906

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
bundles/org.openhab.persistence.jdbc/src/main/java/org/openhab/persistence/jdbc/internal/db/JdbcPostgresqlDAO.java

index e26a069a2d5c8410399e5a538fc27c8edf22ca3e..7d9baf96b71ddc761029ed8d61d1176652c822ce 100644 (file)
@@ -199,12 +199,12 @@ public class JdbcPostgresqlDAO extends JdbcBaseDAO {
         String filterString = "";
         if (filter.getBeginDate() != null) {
             filterString += filterString.isEmpty() ? " WHERE" : " AND";
-            filterString += " TIME>'" + JDBC_DATE_FORMAT.format(filter.getBeginDate().withZoneSameInstant(timeZone))
+            filterString += " TIME>='" + JDBC_DATE_FORMAT.format(filter.getBeginDate().withZoneSameInstant(timeZone))
                     + "'";
         }
         if (filter.getEndDate() != null) {
             filterString += filterString.isEmpty() ? " WHERE" : " AND";
-            filterString += " TIME<'" + JDBC_DATE_FORMAT.format(filter.getEndDate().withZoneSameInstant(timeZone))
+            filterString += " TIME<='" + JDBC_DATE_FORMAT.format(filter.getEndDate().withZoneSameInstant(timeZone))
                     + "'";
         }
         filterString += (filter.getOrdering() == Ordering.ASCENDING) ? " ORDER BY time ASC" : " ORDER BY time DESC";