aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-11-17 17:10:40 +0000
committerstuconnolly <stuart02@gmail.com>2012-11-17 17:10:40 +0000
commit5d87d8f8cd268e753a1b2ed647ee413c43360ba6 (patch)
treebaf2d183ceb511ac13a0e32efc8ccdaea2db4fe5
parent85dbac812f6d1cbba269d9e92ab3ad14cb858e67 (diff)
downloadsequelpro-5d87d8f8cd268e753a1b2ed647ee413c43360ba6.tar.gz
sequelpro-5d87d8f8cd268e753a1b2ed647ee413c43360ba6.tar.bz2
sequelpro-5d87d8f8cd268e753a1b2ed647ee413c43360ba6.zip
Comments.
-rw-r--r--Frameworks/PostgresKit/Source/PGPostgresConnection.m7
-rw-r--r--Frameworks/PostgresKit/Source/PGPostgresTypes.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/Frameworks/PostgresKit/Source/PGPostgresConnection.m b/Frameworks/PostgresKit/Source/PGPostgresConnection.m
index 8fcf8ae0..6d889231 100644
--- a/Frameworks/PostgresKit/Source/PGPostgresConnection.m
+++ b/Frameworks/PostgresKit/Source/PGPostgresConnection.m
@@ -114,6 +114,11 @@ static void _PGPostgresConnectionNoticeProcessor(void *arg, const char *message)
#pragma mark -
#pragma mark Accessors
+/**
+ * Get the underlying connection associated with this wrapper.
+ *
+ * @return The PGConn instance.
+ */
- (PGconn *)postgresConnection
{
return _connection;
@@ -295,7 +300,7 @@ static void _PGPostgresConnectionNoticeProcessor(void *arg, const char *message)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- BOOL reset = [isReset boolValue];
+ BOOL reset = isReset && [isReset boolValue];
int sock = PQsocket(_connection);
diff --git a/Frameworks/PostgresKit/Source/PGPostgresTypes.h b/Frameworks/PostgresKit/Source/PGPostgresTypes.h
index 9f822a8b..57ad2581 100644
--- a/Frameworks/PostgresKit/Source/PGPostgresTypes.h
+++ b/Frameworks/PostgresKit/Source/PGPostgresTypes.h
@@ -47,7 +47,7 @@ enum
PGPostgresOidOid = 26, // NumberHandler => NSNumber
// JSON
- PGPostgresOidJSON = 114, // StringHandler => NSString
+ PGPostgresOidJSON = 114, // StringHandler => NSString
// XML
PGPostgresOidXML = 142, // StringHandler => NSString