ObjFW/ObjPgSQL
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Adjust to ObjFW changes

Browse source 
FossilOrigin-Name: 8af0a7a7662306b2875fc35b6656b24794e624be5b995b2b42fa88a2bac0a220
This commit is contained in:
Jonathan Schleifer 2015-09-06 16:17:10 +00:00
parent 2600168d95
commit f9d637e7be
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/PGResultRow.m
View file

@ -191,6 +191,8 @@ convertType(PGresult *res, int column, OFString *string)
@implementation PGResultRowObjectEnumerator @implementation PGResultRowObjectEnumerator
- (id)nextObject - (id)nextObject
{ {
id object;
if (_pos >= _count) if (_pos >= _count)
return nil; return nil;
@ -200,7 +202,10 @@ convertType(PGresult *res, int column, OFString *string)
if (_pos >= _count) if (_pos >= _count)
return nil; return nil;
return convertType(_res, _pos, object = convertType(_res, _pos,
[OFString stringWithUTF8String: PQgetvalue(_res, _row, _pos++)]); [OFString stringWithUTF8String: PQgetvalue(_res, _row, _pos)]);
_pos++;
return object;
} }
@end @end

2
src/exceptions/PGException.m
View file

@ -14,7 +14,7 @@
_connection = [connection retain]; _connection = [connection retain];
_error = [[OFString alloc] _error = [[OFString alloc]
initWithCString: PQerrorMessage([_connection PG_connection]) initWithCString: PQerrorMessage([_connection PG_connection])
encoding: [OFString nativeOSEncoding]]; encoding: [OFSystemInfo native8BitEncoding]];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;