Binary: Ignore expressions in case of postgres

src/Behavior/Binary.php

@@ -8,6 +8,7 @@
 use ipl\Orm\Exception\ValueConversionException;
 use ipl\Orm\Query;
 use ipl\Sql\Adapter\Pgsql;
+use ipl\Sql\Expression;
 use ipl\Stdlib\Filter\Condition;
 use UnexpectedValueException;
 
@@ -44,7 +45,7 @@
      */
     public function toDb($value, $key, $_)
     {
-        if (! $this->isPostgres) {
+        if (! $this->isPostgres || $value instanceof Expression) {
             return $value;
         }
 
@@ -77,11 +78,13 @@
          * {@see \ipl\Orm\Compat\FilterProcessor::requireAndResolveFilterColumns()}
          */
         $column = $condition->metaData()->get('columnName');
         if ($column !== null && isset($this->properties[$column])) {
             $value = $condition->metaData()->get('originalValue');
 
             if ($this->isPostgres && is_resource($value)) {
                 throw new UnexpectedValueException(sprintf('Unexpected resource for %s', $column));
+            } elseif ($value instanceof Expression) {
+                return;
             }
 
             // ctype_xdigit expects strings.

tests/Behavior/BinaryTest.php

@@ -6,6 +6,7 @@
 use ipl\Orm\Exception\ValueConversionException;
 use ipl\Orm\Query;
 use ipl\Sql\Connection;
+use ipl\Sql\Expression;
 use ipl\Stdlib\Filter\Equal;
 use UnexpectedValueException;
 
@@ -107,6 +108,27 @@ public function testRewriteConditionThrowsExceptionIfAdapterIsPostgreSQLAndValue
         $this->behavior(true)->rewriteCondition($this->condition(fopen('php://temp', 'r')));
     }
 
+    public function testPersistPropertyReturnsExpressionValuesAsIsIfAdapterIsPostgreSQL(): void
+    {
+        // Expression values (e.g. from relation filters) must not be hex-encoded but passed through as-is
+        $expression = new Expression('NOW()');
+
+        $this->assertSame(
+            $expression,
+            $this->behavior(true)->persistProperty($expression, static::TEST_COLUMN)
+        );
+    }
+
+    public function testRewriteConditionLeavesExpressionValuesUnchanged(): void
+    {
+        $expression = new Expression('other_column');
+        $condition = $this->condition($expression);
+
+        $this->behavior(true)->rewriteCondition($condition);
+
+        $this->assertSame($expression, $condition->getValue());
+    }
+
     protected function behavior(bool $postgres = false): Binary
     {
         return (new Binary([static::TEST_COLUMN]))