diff options
| author | Max <post@wickenrode.com> | 2016-02-12 01:16:45 +0100 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2016-02-12 01:16:45 +0100 |
| commit | 4341c2a1d270f7a6ede47616ddf79135bcd37cfd (patch) | |
| tree | d9bdb052369815e196c7daec7f68940ae2f889e5 /Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m | |
| parent | e168cbf3a71d244bb32fbe3904da7d47d2b668db (diff) | |
| download | sequelpro-4341c2a1d270f7a6ede47616ddf79135bcd37cfd.tar.gz sequelpro-4341c2a1d270f7a6ede47616ddf79135bcd37cfd.tar.bz2 sequelpro-4341c2a1d270f7a6ede47616ddf79135bcd37cfd.zip | |
Fix for #2353 ("Attempted to connect a connection that is not disconnected")release-1.1.1-rc1
Backport of 3aadea1be33212ca50e7faffcd0620ea976f9d59
Diffstat (limited to 'Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m')
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m index 48f4fc1e..1a8628c1 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m @@ -58,6 +58,9 @@ * Take a string and escapes any special character for safe use within a query; correctly * escapes any characters within the string using the current connection encoding. * Allows control over whether to also wrap the string in single quotes. + * + * WARNING: This method may return nil if the current thread is cancelled! + * You MUST check the isCancelled flag before using the result! */ - (NSString *)escapeString:(NSString *)theString includingQuotes:(BOOL)includeQuotes { @@ -221,6 +224,9 @@ * the connection encoding. * The result type desired can be specified, supporting either standard or streaming * result sets. + * + * WARNING: This method may return nil if the current thread is cancelled! + * You MUST check the isCancelled flag before using the result! */ - (id)queryString:(NSString *)theQueryString usingEncoding:(NSStringEncoding)theEncoding withResultType:(SPMySQLResultType)theReturnType { |