Adjust to ObjFW changes

FossilOrigin-Name: bec524d06bdfb4ce57a88ef307fb1fc93eaa01201ff20c221814f404891d1009
This commit is contained in:
Jonathan Schleifer 2014-07-18 21:40:09 +00:00
parent 25c48048a1
commit 71342537cf
3 changed files with 5 additions and 5 deletions

View file

@ -114,7 +114,7 @@
OFNumber *number = parameter; OFNumber *number = parameter;
switch ([number type]) { switch ([number type]) {
case OF_NUMBER_BOOL: case OF_NUMBER_TYPE_BOOL:
if ([number boolValue]) if ([number boolValue])
values[i++] = "t"; values[i++] = "t";
else else

View file

@ -1,7 +1,7 @@
#import "PGResultRow.h" #import "PGResultRow.h"
static id static id
convert_type(PGresult *res, int column, OFString *string) convertType(PGresult *res, int column, OFString *string)
{ {
switch (PQftype(res, column)) { switch (PQftype(res, column)) {
case 16: /* BOOLOID */ case 16: /* BOOLOID */
@ -94,7 +94,7 @@ convert_type(PGresult *res, int column, OFString *string)
if (PQgetisnull(_res, _row, column)) if (PQgetisnull(_res, _row, column))
return nil; return nil;
return convert_type(_res, column, return convertType(_res, column,
[OFString stringWithUTF8String: PQgetvalue(_res, _row, column)]); [OFString stringWithUTF8String: PQgetvalue(_res, _row, column)]);
} }
@ -200,7 +200,7 @@ convert_type(PGresult *res, int column, OFString *string)
if (_pos >= _count) if (_pos >= _count)
return nil; return nil;
return convert_type(_res, _pos, return convertType(_res, _pos,
[OFString stringWithUTF8String: PQgetvalue(_res, _row, _pos++)]); [OFString stringWithUTF8String: PQgetvalue(_res, _row, _pos++)]);
} }
@end @end

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: OF_STRING_ENCODING_NATIVE]; encoding: [OFString nativeOSEncoding]];
} @catch (id e) { } @catch (id e) {
[self release]; [self release];
@throw e; @throw e;