Final feature work on the SPMySQL branch before merging:

 - Add a ping keepalive managing object to prevent retain cycles from the NSTimer
 - Add -[SPMySQLConnection copy] support
 - Refactor Hans-Jörg Bibiko's database structure retrieval, moving it out of the MySQL framework and building it around a copy of the connection.  This reduces the amount of connections-over-time used by Sequel Pro to two constant connections (addressing Issue #1097) and improves robustness.
 - Use the database structure retrieval connection for faster query cancellation without an extra connection required, if possible

1 files changed, 1 insertions, 9 deletions

diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
index cb5ce70d..9b54029c 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Querying & Preparation.m
@@ -282,7 +282,7 @@
 		} else {
 
 			// Prevent retries if the query was cancelled or not a connection error
-			if (lastQueryWasCancelled && ![SPMySQLConnection isErrorIDConnectionError:mysql_errno(mySQLConnection)]) {
+			if (lastQueryWasCancelled || ![SPMySQLConnection isErrorIDConnectionError:mysql_errno(mySQLConnection)]) {
 				break;
 			}
 		}
@@ -549,14 +549,6 @@
 }
 
 /**
- * Returns whether the last query was cancelled using cancelCurrentQuery.
- */
-- (BOOL)lastQueryWasCancelled
-{
-	return lastQueryWasCancelled;
-}
-
-/**
  * If the last query was cancelled, returns whether that query cancellation
  * required the connection to be reset or whether the query was successfully
  * cancelled leaving the connection intact.