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

fixup transaction execution context for retrying batch

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@28630 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-09-08 09:59:05 +00:00
parent 93b0273a55
commit 917c6a00f4
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SQLClient.m
View file

@ -2788,6 +2788,12 @@ static unsigned int maxConnections = 8;
} }
} }
- (void) _addPrepared: (NSArray*)statement
{
[_info addObject: statement];
_count++;
}
- (void) _countLength: (unsigned*)length andArgs: (unsigned*)args - (void) _countLength: (unsigned*)length andArgs: (unsigned*)args
{ {
unsigned count = [_info count]; unsigned count = [_info count];
@ -2951,8 +2957,9 @@ static unsigned int maxConnections = 8;
} }
if (_batch == YES) if (_batch == YES)
{ {
unsigned count = [_info count]; SQLTransaction *wrapper = nil;
unsigned i; unsigned count = [_info count];
unsigned i;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
@ -2963,7 +2970,22 @@ static unsigned int maxConnections = 8;
{ {
NS_DURING NS_DURING
{ {
[_db simpleExecute: (NSArray*)o]; /* Wrap the statement inside a transaction so
* its context will still be that of a statement
* in a transaction rather than a standalone
* statement. This might be important if the
* statement is actually a call to a stored
* procedure whose code must all be executed
* with the visibility rules of a single
* transaction.
*/
if (wrapper == nil)
{
wrapper = [_db transaction];
}
[wrapper reset];
[wrapper _addPrepared: o];
[wrapper execute];
executed++; executed++;
success = YES; success = YES;
} }
@ -2971,8 +2993,7 @@ static unsigned int maxConnections = 8;
{ {
if (failures != nil) if (failures != nil)
{ {
[failures->_info addObject: o]; [failures _addPrepared: o];
failures->_count++;
} }
if (log == YES || [_db debugging] > 0) if (log == YES || [_db debugging] > 0)
{ {
@ -3011,8 +3032,7 @@ static unsigned int maxConnections = 8;
if ([o isKindOfClass: NSArrayClass] == YES) if ([o isKindOfClass: NSArrayClass] == YES)
{ {
[failures->_info addObject: o]; [failures _addPrepared: o];
failures->_count++;
} }
else else
{ {
@ -3103,8 +3123,7 @@ static unsigned int maxConnections = 8;
{ {
SQLTransaction *t = [[self db] transaction]; SQLTransaction *t = [[self db] transaction];
[t->_info addObject: o]; [t _addPrepared: o];
t->_count = 1;
return t; return t;
} }
else else