diff options
| author | stuconnolly <stuart02@gmail.com> | 2013-01-16 22:52:09 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2013-01-16 22:52:09 +0000 |
| commit | f5e507a38ba2a73619cfc3349257507c445464af (patch) | |
| tree | 41e45a2b66f843592f0ccc759a10b96be2f826b2 /Frameworks/PostgresKit/Source | |
| parent | c2d9b3fd35e64cbb307cc04fb6789dc4656f9ca3 (diff) | |
| download | sequelpro-f5e507a38ba2a73619cfc3349257507c445464af.tar.gz sequelpro-f5e507a38ba2a73619cfc3349257507c445464af.tar.bz2 sequelpro-f5e507a38ba2a73619cfc3349257507c445464af.zip | |
PostgresKit: Fix the integration tests as well as some issues that they highlighted.
Diffstat (limited to 'Frameworks/PostgresKit/Source')
| -rw-r--r-- | Frameworks/PostgresKit/Source/PGPostgresConnection.m | 6 | ||||
| -rw-r--r-- | Frameworks/PostgresKit/Source/PGPostgresConnectionQueryExecution.m | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Frameworks/PostgresKit/Source/PGPostgresConnection.m b/Frameworks/PostgresKit/Source/PGPostgresConnection.m index dda021fe..920fc626 100644 --- a/Frameworks/PostgresKit/Source/PGPostgresConnection.m +++ b/Frameworks/PostgresKit/Source/PGPostgresConnection.m @@ -168,11 +168,7 @@ static void _PGPostgresConnectionNoticeProcessor(void *arg, const char *message) */ - (BOOL)connect { - if ([self isConnected]) { - [PGPostgresException raise:PGPostgresConnectionErrorDomain reason:@"Attempt to initiate a connection that is already active"]; - - return NO; - } + if ([self isConnected]) return YES; [self _createConnectionParameters]; diff --git a/Frameworks/PostgresKit/Source/PGPostgresConnectionQueryExecution.m b/Frameworks/PostgresKit/Source/PGPostgresConnectionQueryExecution.m index ee8853c7..3de02350 100644 --- a/Frameworks/PostgresKit/Source/PGPostgresConnectionQueryExecution.m +++ b/Frameworks/PostgresKit/Source/PGPostgresConnectionQueryExecution.m @@ -118,8 +118,8 @@ PGQueryParamData; _lastQueryWasCancelled = NO; if (!query || - ![query isKindOfClass:[NSString class]] || - ![query isKindOfClass:[PGPostgresStatement class]] || + (![query isKindOfClass:[NSString class]] && + ![query isKindOfClass:[PGPostgresStatement class]]) || ![self isConnected]) { return nil; |