Merge branch 'master' of ssh://github.com/gnustep/libs-sqlclient

Conflicts:
	ChangeLog

ChangeLog

@@ -6,10 +6,18 @@
 	that received them (as documented) and only queue them in the main
 	thread if the receiving thread does not have an active run loop.
 
-2020-04-06  Wolfgang Lux  <wolfgang.lux@gmail.com>
+2020-04-13  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
-	* SQLClient.m(initWithConfiguration:name:pool:): Eventually
-	reconfigure a client connection that gets reused.
+	* MySQL.m (backendQuery:recordType:listType:):
+	Change argument types to match those of the overridden base class
+	implementation to make the override work with the GNUstep
+	Objective-C runtime.
+
+2020-04-08  Wolfgang Lux  <wolfgang.lux@gmail.com>
+
+	* SQLClient.m (clientWithConfiguration:name:):
+	* SQLClient.m (initWithConfiguration:name:pool:):
+	Eventually reconfigure a client connection that gets reused.
 
 2020-03-21 Richard Frith-Macdonald  <rfm@gnu.org>
 

MySQL.m

@@ -290,8 +290,8 @@ static unsigned int trim(char *str)
 }
 
 - (NSMutableArray*) backendQuery: (NSString*)stmt
-		      recordType: (Class)rtype
-		        listType: (Class)ltype
+		      recordType: (id)rtype
+		        listType: (id)ltype
 {
   NSAutoreleasePool     *arp = [NSAutoreleasePool new];
   NSMutableArray	*records = nil;

SQLClient.m

@@ -1246,6 +1246,18 @@ static int	        poolConnections = 0;
       o = [[[SQLClient alloc] initWithConfiguration: config name: reference]
         autorelease];
     }
+  else if ([config isKindOfClass: [NSUserDefaults class]] == NO)
+    {
+      /* If the configuration object is not the user defaults
+       * make sure to update the existing connnection's configuration.
+       */
+      NSNotification *n = [NSNotification
+	notificationWithName: NSUserDefaultsDidChangeNotification
+        object: config
+        userInfo: nil];
+      [o _configure: n];
+    }
+
   return o;
 }