From 03ac106c2160bde2640b0400a77a805f8969acd8 Mon Sep 17 00:00:00 2001
From: Hivert Quentin <quentin.hivert.fr@gmail.com>
Date: Sun, 1 Nov 2026 12:45:49 +0100
Subject: [PATCH] fix(sql): properly parse name in contact lookup

---
 SoObjects/SOGo/SQLSource.m | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m
index 90ee641fe..7bb5e50dd 100644
--- a/SoObjects/SOGo/SQLSource.m
+++ b/SoObjects/SOGo/SQLSource.m
@@ -585,6 +585,8 @@
   NSMutableArray *qualifiers;
   NSArray *fieldNames;
   EOAdaptorChannel *channel;
+  EOAdaptorContext *adaptorContext;
+  EOAdaptor *adaptor;
   EOQualifier *loginQualifier, *domainQualifier, *qualifier;
   NSMutableString *sql;
   NSString *value, *field;
@@ -593,10 +595,12 @@
 
   response = nil;
 
-  theID = [theID stringByReplacingString: @"'"  withString: @"''"];
+  //theID = [theID stringByReplacingString: @"'"  withString: @"''"];
   channel = (EOAdaptorChannel *)connection;
   if (channel)
     {
+      adaptorContext = [channel adaptorContext];
+      adaptor = [adaptorContext adaptor];
       qualifiers = [NSMutableArray arrayWithCapacity: [_loginFields count] + 1];
 
       // Always compare against the c_uid field
@@ -660,7 +664,8 @@
       qualifier = [[EOOrQualifier alloc] initWithQualifierArray: qualifiers];
       if (domainQualifier)
         qualifier = [[EOAndQualifier alloc] initWithQualifiers: domainQualifier, qualifier, nil];
-      [qualifier appendSQLToString: sql];
+
+      [qualifier appendSQLToString: sql withAdaptor: adaptor];
 
       ex = [channel evaluateExpressionX: sql];
       if (!ex)
@@ -750,7 +755,7 @@
               [qualifier autorelease];
               [qualifier appendSQLToString: sql];
 
-              ex = [channel evaluateExpressionX: sql];
+              ex = [channel evaluateExpressionX: sql withAdaptor: adaptor];
               if (!ex)
                 {
                   NSDictionary *authResponse;
@@ -930,6 +935,8 @@
   EOAdaptorChannel *channel;
   EOQualifier *domainQualifier;
   GCSChannelManager *cm;
+  EOAdaptorContext *adaptorContext;
+  EOAdaptor *adaptor;
   NSException *ex;
   NSMutableArray *results;
   NSMutableString *sql;
@@ -950,8 +957,10 @@
               domainQualifier = [self visibleDomainsQualifierFromDomain: domain];
               if (domainQualifier)
                 {
+                  adaptorContext = [channel adaptorContext];
+                  adaptor = [adaptorContext adaptor];
                   [sql appendString: @" WHERE "];
-                  [domainQualifier appendSQLToString: sql];
+                  [domainQualifier appendSQLToString: sql withAdaptor: adaptor];
                 }
             }
           else