- When switching tables, correctly catch disconnections and suppress error dialogs and related crashes

 - Move connection error sheet close method to the connection delegate
 - Tweak the information_schema db schema building query to be much faster on busy servers by amending the VIEW part
 - Set the connection lock to nil after releasing, coping with connection unlocks deferred on the main thread until after dealloc

1 files changed, 13 insertions, 4 deletions

diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m
index 6e755d1a..56a254fa 100644
--- a/Source/SPConnectionDelegate.m
+++ b/Source/SPConnectionDelegate.m
@@ -110,22 +110,31 @@
  */
 - (MCPConnectionCheck)connectionLost:(id)connection
 {
+
+	// Display the connection error dialog and wait for the return code
 	[NSApp beginSheet:connectionErrorDialog modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil];
+	NSInteger connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog];
 
-    NSInteger connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog];
-	
 	[NSApp endSheet:connectionErrorDialog];
 	[connectionErrorDialog orderOut:nil];
-	
+
 	// If 'disconnect' was selected, trigger a window close.
 	if (connectionErrorCode == MCPConnectionCheckDisconnect) {
 		[self performSelectorOnMainThread:@selector(closeDocumentWindowAndDisconnect) withObject:nil waitUntilDone:YES];
 	}
-	
+
 	return connectionErrorCode;
 }
 
 /**
+ * Invoked when user dismisses the error sheet displayed as a result of the current connection being lost.
+ */
+- (IBAction)closeErrorConnectionSheet:(id)sender
+{
+	[NSApp stopModalWithCode:[sender tag]];
+}
+
+/**
  * Close the connection - should be performed on the main thread.
  * First hides the window to give code a little bit of time to clean
  * everything up before it's all deallocated as a result of the close.