From d7da5b0dfd54af225c4e80b5a619dc8995cdccca Mon Sep 17 00:00:00 2001
From: Joe Bordes <joe@tsolucio.com>
Date: Fri, 23 Feb 2024 21:03:50 +0100
Subject: [PATCH] fix(QueryGenerator) support field names with spaces in
 conditionals

---
 include/QueryGenerator/QueryGenerator.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 55be6b0a3d..21d7ef5a74 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -938,7 +938,7 @@ public function getWhereClause() {
 		$groupSql = $this->groupInfo;
 		$fieldSqlList = array();
 		foreach ($this->conditionals as $index => $conditionInfo) {
-			$fieldName = $conditionInfo['name'];
+			$fieldName = trim($conditionInfo['name']);
 			if ($fieldName=='id') {
 				if (empty($conditionInfo['value'])) {
 					$conditionInfo['value'] = '0';
@@ -1595,6 +1595,7 @@ public function addCondition($fieldname, $value, $operator, $glue = null, $newGr
 		}
 
 		$this->groupInfo .= "$conditionNumber ";
+		$fieldname = trim($fieldname);
 		$this->whereFields[] = $fieldname;
 		$this->reset();
 		$this->conditionals[$conditionNumber] = $this->getConditionalArray($fieldname, $value, $operator);
@@ -1618,7 +1619,7 @@ public function addReferenceModuleFieldCondition($relatedModule, $referenceField
 		$this->referenceModuleField[$conditionNumber] = array(
 			'relatedModule'=> $relatedModule,
 			'referenceField'=> $referenceField,
-			'fieldName'=>$fieldName,
+			'fieldName'=>trim($fieldName),
 			'value'=>$value,
 			'SQLOperator'=>$SQLOperator,
 		);