From cbbd92f713050d0deb3d286be9bc1220108fe285 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Mon, 24 Sep 2012 13:35:48 +0000 Subject: Fix the failure to process the first row in a result set. --- Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m | 2 +- Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m | 2 +- Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m index aa61381b..c4d6a96a 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeDateTimeHandler.m @@ -79,7 +79,7 @@ static FLXPostgresOid FLXPostgresTypeDateTimeTypes[] = - (id)objectFromResult { - if (!_result || !_type || !_row || !_column) return [NSNull null]; + if (!_result || !_type) return [NSNull null]; switch (_type) { diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m index 00a3f781..6756019f 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeNumberHandler.m @@ -80,7 +80,7 @@ static FLXPostgresOid FLXPostgresTypeNumberTypes[] = - (id)objectFromResult { - if (!_result || !_type || !_row || !_column) return [NSNull null]; + if (!_result || !_type) return [NSNull null]; NSUInteger length = PQgetlength(_result, (int)_row, (int)_column); const void *bytes = PQgetvalue(_result, (int)_row, (int)_column); diff --git a/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m b/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m index 68c9a45e..eeb346fa 100644 --- a/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m +++ b/Frameworks/PostgresKit/Source/FLXPostgresTypeStringHandler.m @@ -77,7 +77,7 @@ static FLXPostgresOid FLXPostgresTypeStringTypes[] = - (id)objectFromResult { - if (!_result || !_type || !_row || !_column) return [NSNull null]; + if (!_result || !_type) return [NSNull null]; switch (_type) { @@ -113,7 +113,7 @@ static FLXPostgresOid FLXPostgresTypeStringTypes[] = { const void *bytes = PQgetvalue(_result, (int)_row, (int)_column); NSUInteger length = PQgetlength(_result, (int)_row, (int)_column); - + if (!bytes || !length) return [NSNull null]; return [[[NSString alloc] initWithBytes:bytes length:length encoding:[_connection stringEncoding]] autorelease]; -- cgit v1.2.3