Rework type handling; reducing the number of paremeters being passed around as well as libpq calls.

1 files changed, 11 insertions, 2 deletions

diff --git a/Frameworks/PostgresKit/Source/FLXPostgresResult.m b/Frameworks/PostgresKit/Source/FLXPostgresResult.m
index 0d9656d0..9fd44d8c 100644
--- a/Frameworks/PostgresKit/Source/FLXPostgresResult.m
+++ b/Frameworks/PostgresKit/Source/FLXPostgresResult.m
@@ -215,9 +215,18 @@ static NSString *FLXPostgresResultError = @"FLXPostgresResultError";
 		if (!bytes || !length) return nil;
 		
 		return [NSData dataWithBytes:bytes length:length];
-	} 
+	}
+	
+	[handler setRow:row];
+	[handler setType:type];
+	[handler setColumn:column];
+	[handler setResult:_result];
+	
+	id object = [handler objectFromResult];
+	
+	[handler setResult:nil];
 	
-	return [handler objectFromResult:_result atRow:row column:column];
+	return object;
 }
 
 /**