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

Move private methods to separate headers

Browse source 
Also fixes a typo and adds two missing nullability annotations.

FossilOrigin-Name: 6307a381989719ad89067e1ae2cb5d454dd0b77a83cc6141785067365767e7f6
This commit is contained in:
Jonathan Schleifer 2017-05-10 23:46:04 +00:00
parent ae918f26c4
commit 308199f21e
10 changed files with 58 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/PGConnection.m
View file

@ -1,4 +1,7 @@
#import "PGConnection.h"
#import "PGConnection+Private.h"
#import "PGResult.h"
#import "PGResult+Private.h"
#import "PGConnectionFailedException.h"
#import "PGCommandFailedException.h"
@ -34,10 +37,10 @@
@"%@=%@", key, object];
}
if ((_connnection = PQconnectdb([connectionInfo UTF8String])) == NULL)
if ((_connection = PQconnectdb([connectionInfo UTF8String])) == NULL)
@throw [OFOutOfMemoryException exception];
if (PQstatus(_connnection) == CONNECTION_BAD)
if (PQstatus(_connection) == CONNECTION_BAD)
@throw [PGConnectionFailedException
exceptionWithConnection: self];
@ -46,20 +49,20 @@
- (void)reset
{
PQreset(_connnection);
PQreset(_connection);
}
- (void)close
{
if (_connnection != NULL)
PQfinish(_connnection);
if (_connection != NULL)
PQfinish(_connection);
_connnection = NULL;
_connection = NULL;
}
- (PGResult *)executeCommand: (OFConstantString *)command
{
PGresult *result = PQexec(_connnection, [command UTF8String]);
PGresult *result = PQexec(_connection, [command UTF8String]);
if (PQresultStatus(result) == PGRES_FATAL_ERROR) {
PQclear(result);
@ -126,7 +129,7 @@
UTF8String];
} while ((parameter = va_arg(args, id)) != nil);
result = PQexecParams(_connnection, [command UTF8String],
result = PQexecParams(_connection, [command UTF8String],
argsCount, NULL, values, NULL, NULL, 0);
} @finally {
[self freeMemory: values];
@ -194,7 +197,7 @@
[command appendString: @")"];
result = PQexecParams(_connnection, [command UTF8String],
result = PQexecParams(_connection, [command UTF8String],
(int)count, NULL, values, NULL, NULL, 0);
} @finally {
[self freeMemory: values];
@ -222,6 +225,6 @@
- (PGconn *)PG_connection
{
return _connnection;
return _connection;
}
@end