Author: rfm
Date: Thu Jun 25 10:08:47 2015
New Revision: 38678
URL: http://svn.gna.org/viewcvs/gnustep?rev=38678&view=rev
Log:
Fixup default name
Modified:
libs/sqlclient/trunk/ChangeLog
libs/sqlclient/trunk/SQLClient.h
libs/sqlclient/trunk/SQLClient.m
libs/sqlclient/trunk/SQLClientPool.m
Modified: libs/sqlclient/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/ChangeLog?rev=38678&r1=38677&r2=38678&view=diff
==============================================================================
--- libs/sqlclient/trunk/ChangeLog (original)
+++ libs/sqlclient/trunk/ChangeLog Thu Jun 25 10:08:47 2015
@@ -1,10 +1,16 @@
+2015-06-25 Richard Frith-Macdonald <[email protected]>
+
+ * SQLClient.h: Add -name method for pools.
+ * SQLClient.m: Match documentation and use 'Database' as default name.
+ * SQLClientPool.m: Add -name method and fix default name.
+
2015-06-19 Richard Frith-Macdonald <[email protected]>
* Postgres.m: Fix error parsing timezone in date.
2015-06-09 Richard Frith-Macdonald <[email protected]>
- * SQLClient.m: Fix reace condition spotted by Wolfgang and change
+ * SQLClient.m: Fix race condition spotted by Wolfgang and change
purge operation to avoid disconnecting clients while the class lock
is locked.
Modified: libs/sqlclient/trunk/SQLClient.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.h?rev=38678&r1=38677&r2=38678&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.h (original)
+++ libs/sqlclient/trunk/SQLClient.h Thu Jun 25 10:08:47 2015
@@ -1598,6 +1598,11 @@
*/
- (int) minConnections;
+/** Returns the name of the database configuration for the connections in
+ * the pool.
+ */
+- (NSString*) name;
+
/** Fetches an (autoreleased) client from the pool.<br />
* This method blocks indefinitely waiting for a client to become
* available in the pool.
Modified: libs/sqlclient/trunk/SQLClient.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClient.m?rev=38678&r1=38677&r2=38678&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClient.m (original)
+++ libs/sqlclient/trunk/SQLClient.m Thu Jun 25 10:08:47 2015
@@ -826,15 +826,11 @@
if ([reference isKindOfClass: NSStringClass] == NO)
{
- if (config == nil)
+ if (nil == config)
{
- reference = [[NSUserDefaults standardUserDefaults] objectForKey:
- @"SQLClientName"];
+ config = (NSDictionary*)[NSUserDefaults standardUserDefaults];
}
- else
- {
- reference = [config objectForKey: @"SQLClientName"];
- }
+ reference = [config objectForKey: @"SQLClientName"];
if ([reference isKindOfClass: NSStringClass] == NO)
{
reference = @"Database";
@@ -1382,7 +1378,7 @@
reference = [conf objectForKey: @"SQLClientName"];
if ([reference isKindOfClass: NSStringClass] == NO)
{
- reference = [conf objectForKey: @"Database"];
+ reference = @"Database";
}
}
Modified: libs/sqlclient/trunk/SQLClientPool.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/sqlclient/trunk/SQLClientPool.m?rev=38678&r1=38677&r2=38678&view=diff
==============================================================================
--- libs/sqlclient/trunk/SQLClientPool.m (original)
+++ libs/sqlclient/trunk/SQLClientPool.m Thu Jun 25 10:08:47 2015
@@ -33,6 +33,7 @@
#import <Foundation/NSInvocation.h>
#import <Foundation/NSLock.h>
#import <Foundation/NSString.h>
+#import <Foundation/NSUserDefaults.h>
#import <Performance/GSCache.h>
#import "SQLClient.h"
@@ -137,7 +138,19 @@
{
if (nil != (self = [super init]))
{
+ if (nil == config)
+ {
+ config = (NSDictionary*)[NSUserDefaults standardUserDefaults];
+ }
ASSIGN(_config, config);
+ if (NO == [reference isKindOfClass: [NSString class]])
+ {
+ reference = [_config objectForKey: @"SQLClientName"];
+ if (NO == [reference isKindOfClass: [NSString class]])
+ {
+ reference = @"Database";
+ }
+ }
ASSIGNCOPY(_name, reference);
lock = [[NSConditionLock alloc] initWithCondition: 0];
[self setMax: maxConnections min: minConnections];
@@ -165,6 +178,11 @@
- (int) minConnections
{
return min;
+}
+
+- (NSString*) name
+{
+ return _name;
}
- (SQLClient*) provideClient
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
