gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-19 01:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve transaction rollback

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@38109 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2014-10-07 07:09:38 +00:00
parent 0f06c9b7fc
commit c035f9cf39
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SQLClient.m
View file

@ -3201,6 +3201,7 @@ static unsigned int maxConnections = 8;
if (_count > 0) if (_count > 0)
{ {
NSMutableArray *info = nil; NSMutableArray *info = nil;
BOOL wrap = [_db isInTransaction] ? NO : YES;
NS_DURING NS_DURING
{ {
@ -3216,14 +3217,14 @@ static unsigned int maxConnections = 8;
sql = [[NSMutableString alloc] initWithCapacity: sqlSize + 13]; sql = [[NSMutableString alloc] initWithCapacity: sqlSize + 13];
[info addObject: sql]; [info addObject: sql];
[sql release]; [sql release];
if ([_db isInTransaction] == NO) if (YES == wrap)
{ {
[sql appendString: @"begin;"]; [sql appendString: @"begin;"];
} }
[self _addSQL: sql andArgs: info]; [self _addSQL: sql andArgs: info];
if ([_db isInTransaction] == NO) if (YES == wrap)
{ {
[sql appendString: @"commit;"]; [sql appendString: @"commit;"];
} }
@ -3233,8 +3234,10 @@ static unsigned int maxConnections = 8;
} }
NS_HANDLER NS_HANDLER
{ {
NSException *e = localException;
[info release]; [info release];
if ([_db isInTransaction] == NO) if (YES == wrap)
{ {
NS_DURING NS_DURING
{ {
@ -3242,10 +3245,12 @@ static unsigned int maxConnections = 8;
} }
NS_HANDLER NS_HANDLER
{ {
[_db disconnect];
NSLog(@"Disconnected due to failed rollback after %@", e);
} }
NS_ENDHANDLER NS_ENDHANDLER
} }
[localException raise]; [e raise];
} }
NS_ENDHANDLER NS_ENDHANDLER
} }