Fixed last errors related to identifier quoting in postgres

src/Database/IdentifierQuoter.php

@@ -19,6 +19,7 @@
 use Cake\Database\Expression\Comparison;
 use Cake\Database\Expression\IdentifierExpression;
 use Cake\Database\Expression\OrderByExpression;
+use Cake\Database\ExpressionInterface;
 
 /**
  * Contains all the logic related to quoting identifiers in a Query object
@@ -59,25 +60,32 @@ public function quote(Query $query) {
 			$this->_quoteParts($query);
 		}
 
-		$query->traverseExpressions(function($expression) {
-			if ($expression instanceof Comparison) {
-				$this->_quoteComparison($expression);
-				return;
-			}
+		$query->traverseExpressions([$this, 'quoteExpression']);
+		$query->valueBinder($binder);
+		return $query;
+	}
 
-			if ($expression instanceof OrderByExpression) {
-				$this->_quoteOrderBy($expression);
-				return;
-			}
+/**
+ * Quotes identifiers inside expression objects
+ *
+ * @param \Cake\Database\ExpressionInterface $expression
+ * @return void
+ */
+	public function quoteExpression($expression) {
+		if ($expression instanceof Comparison) {
+			$this->_quoteComparison($expression);
+			return;
+		}
 
-			if ($expression instanceof IdentifierExpression) {
-				$this->_quoteIndetifierExpression($expression);
-				return;
-			}
-		});
+		if ($expression instanceof OrderByExpression) {
+			$this->_quoteOrderBy($expression);
+			return;
+		}
 
-		$query->valueBinder($binder);
-		return $query;
+		if ($expression instanceof IdentifierExpression) {
+			$this->_quoteIndetifierExpression($expression);
+			return;
+		}
 	}
 
 /**
@@ -176,13 +184,20 @@ protected function _quoteComparison(Comparison $expression) {
 		$field = $expression->getField();
 		if (is_string($field)) {
 			$expression->field($this->_driver->quoteIdentifier($field));
-		}
-		if (is_array($field)) {
+		} elseif (is_array($field)) {
 			$quoted = [];
 			foreach ($field as $f) {
 				$quoted[] = $this->_driver->quoteIdentifier($f);
 			}
 			$expression->field($quoted);
+		} elseif ($field instanceof ExpressionInterface) {
+			$expression->field($this->quoteExpression($field));
+		}
+
+		$value = $expression->getValue();
+		if ($value instanceof ExpressionInterface) {
+			$this->quoteExpression($value);
+			$expression->value($value);
 		}
 	}