postgres fix for #48

studioespresso · Dec 16, 2024 · c0745d7 · c0745d7
1 parent eea7d1f
commit c0745d7
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/behaviors/EntryQueryBehavior.php b/src/behaviors/EntryQueryBehavior.php
@@ -110,7 +110,7 @@ public function onAfterPrepare()
             if ($field && $this->isFuture) {
                 $this->owner->subQuery
                     ->andWhere(Db::parseDateParam(
-                        '"field_' . $this->handle . $this->columnSuffix . '"::json->>\'start\'',
+                        $field->getValueSql('start'),
                         date('Y-m-d'),
                         $this->includeToday ? '>=' : '>'
                     ));
@@ -119,7 +119,7 @@ public function onAfterPrepare()
             if ($field && $this->isPast) {
                 $this->owner->subQuery
                     ->andWhere(Db::parseDateParam(
-                        '"field_' . $this->handle . $this->columnSuffix . '"::json->>\'end\'',
+                        $field->getValueSql('end'),
                         date('Y-m-d'),
                         $this->includeToday ? '<=' : '<'
                     ));
@@ -128,7 +128,7 @@ public function onAfterPrepare()
             if ($field && $this->isNotPast) {
                 $this->owner->subQuery
                     ->andWhere(Db::parseDateParam(
-                        '"field_' . $this->handle . $this->columnSuffix . '"::json->>\'end\'',
+                        $field->getValueSql('end'),
                         date('Y-m-d'),
                         $this->includeToday ? '>=' : '>'
                     ));
@@ -137,13 +137,13 @@ public function onAfterPrepare()
             if ($field && $this->isOnGoing) {
                 $this->owner->subQuery
                     ->andWhere(Db::parseDateParam(
-                        '"field_' . $this->handle . $this->columnSuffix . '"::json->>\'start\'',
+                        $field->getValueSql('start'),
                         date('Y-m-d'),
                         $this->includeToday ? '<=' : '<'
                     ));
                 $this->owner->subQuery
                     ->andWhere(Db::parseDateParam(
-                        '"field_' . $this->handle . $this->columnSuffix . '"::json->>\'end\'',
+                        $field->getValueSql('end'),
                         date('Y-m-d'),
                         $this->includeToday ? '>=' : '>'
                     ));