Merge branch 'develop'

Author: helje5

sope-gdl1/GDLAccess/EOSQLExpression.m

@@ -1161,9 +1161,9 @@ + (NSString *)formatSQLString:(NSString *)_sqlString format:(NSString *)_fmt {
 - (NSString *)sqlStringForSelector:(SEL)_selector value:(id)_value {
   if ((_value == null) || (_value == nil)) {
     if (sel_isEqual(_selector, EOQualifierOperatorEqual))
-      return @"is";
+      return @"IS";
     else if (sel_isEqual(_selector, EOQualifierOperatorNotEqual))
-      return @"is not";
+      return @"IS NOT";
   }
   else {
     if (sel_isEqual(_selector, EOQualifierOperatorEqual))
@@ -1182,6 +1182,8 @@ - (NSString *)sqlStringForSelector:(SEL)_selector value:(id)_value {
     return @">=";
   else if (sel_isEqual(_selector, EOQualifierOperatorLike))
     return @"LIKE";
+  else if (sel_isEqual(_selector, EOQualifierOperatorCaseInsensitiveLike))
+    return @"ILIKE";
   else {
     return [NSString stringWithFormat:@"UNKNOWN<%@>",
                        NSStringFromSelector(_selector)];
@@ -1212,6 +1214,7 @@ - (NSString *)sqlStringForKeyComparisonQualifier:(EOKeyComparisonQualifier *)_q
 }
 
 - (NSString *)sqlStringForKeyValueQualifier:(EOKeyValueQualifier *)_q {
+  SEL sel = [_q selector];
   NSMutableString *s;
   NSString        *sql;
   id              v;
@@ -1224,12 +1227,12 @@ - (NSString *)sqlStringForKeyValueQualifier:(EOKeyValueQualifier *)_q {
   [s appendString:sql];
 
   [s appendString:@" "];
-  sql = [self sqlStringForSelector:[_q selector] value:v];
+  sql = [self sqlStringForSelector:sel value:v];
   [s appendString:sql];
   [s appendString:@" "];
 
-  if (([_q selector] == EOQualifierOperatorLike) ||
-      ([_q selector] == EOQualifierOperatorCaseInsensitiveLike))
+  if ((sel == EOQualifierOperatorLike) ||
+      (sel == EOQualifierOperatorCaseInsensitiveLike))
     v = [[self class] sqlPatternFromShellPattern:v];
 
   sql = [self sqlStringForValue:v attributeNamed:[_q key]];

sope-gdl1/PostgreSQL/PostgreSQL72Expression.m

@@ -41,7 +41,8 @@ - (id)selectExpressionForAttributes:(NSArray *)attributes
   lock:(BOOL)flag
   qualifier:(EOSQLQualifier *)qualifier
   fetchOrder:(NSArray *)fetchOrder
-  channel:(EOAdaptorChannel *)channel {
+  channel:(EOAdaptorChannel *)channel 
+{
 
   lock = flag;
   [super selectExpressionForAttributes:attributes
@@ -52,6 +53,27 @@ - (id)selectExpressionForAttributes:(NSArray *)attributes
   return self;
 }
 
+- (NSString *)sqlStringForKeyValueQualifier:(EOKeyValueQualifier *)_q {
+  SEL sel = [_q selector];
+  if (sel_isEqual(sel, EOQualifierOperatorLike) ||
+      sel_isEqual(sel, EOQualifierOperatorCaseInsensitiveLike))
+  {
+    NSMutableString *s = [NSMutableString stringWithCapacity:100];        
+    [s appendString:[[self class] 
+      formatSQLString:[self sqlStringForAttributeNamed:[_q key]] 
+      format:nil]];
+    // Cast, LIKE only works on TEXT in modern PostgreSQL.
+    [s appendString:
+        sel_isEqual(sel, EOQualifierOperatorCaseInsensitiveLike)
+        ? @"::TEXT ILIKE ": @"::TEXT LIKE "];
+    id v = [[self class] sqlPatternFromShellPattern:[_q value]];
+    [s appendString:[self sqlStringForValue:v attributeNamed:[_q key]]];
+    return s;
+  }
+  
+  return [super sqlStringForKeyValueQualifier: _q];
+}
+
 - (NSString *)fromClause {
   NSMutableString *fromClause;
   NSEnumerator    *enumerator;