aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/SPConnectionController.h3
-rw-r--r--Source/SPConnectionController.m60
-rw-r--r--Source/SPConnectionControllerDataSource.m1
-rw-r--r--Source/SPConnectionControllerInitializer.m6
-rw-r--r--Source/SPConnectionHandler.h1
-rw-r--r--Source/SPConnectionHandler.m45
-rw-r--r--Source/SPConstants.h1
-rw-r--r--Source/SPConstants.m1
-rw-r--r--Source/SPDatabaseDocument.m11
-rw-r--r--Source/SPDatabaseStructure.h2
-rw-r--r--Source/SPDatabaseStructure.m11
11 files changed, 83 insertions, 59 deletions
diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h
index 6e439953..80cfd132 100644
--- a/Source/SPConnectionController.h
+++ b/Source/SPConnectionController.h
@@ -157,7 +157,6 @@
BOOL isEditingItemName;
BOOL reverseFavoritesSort;
BOOL initComplete;
- BOOL mySQLConnectionCancelled;
BOOL favoriteNameFieldWasAutogenerated;
#ifndef SP_REFACTOR /* ivars */
@@ -211,7 +210,7 @@
// Connection processes
- (IBAction)initiateConnection:(id)sender;
-- (IBAction)cancelMySQLConnection:(id)sender;
+- (IBAction)cancelConnection:(id)sender;
#ifndef SP_REFACTOR
// Interface interaction
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 409b89c0..23fe0911 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -93,6 +93,8 @@ static NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist";
- (void)_startEditingConnection;
+- (void)_documentWillClose:(NSNotification *)notification;
+
static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, void *key);
#endif
@@ -291,21 +293,41 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
}
/**
- * Cancels (or rather marks) the current connection is to be cancelled once established.
- *
- * Note, that once called this method does not mark the connection attempt to be immediately cancelled as
- * there is no reliable way to actually cancel connection attempts via the MySQL client libs. Once the
- * connection is established it will be immediately killed.
+ * Cancels the current connection - both SSH and MySQL.
*/
-- (IBAction)cancelMySQLConnection:(id)sender
+- (IBAction)cancelConnection:(id)sender
{
#ifndef SP_REFACTOR
[connectButton setEnabled:NO];
[progressIndicatorText setStringValue:NSLocalizedString(@"Cancelling...", @"cancelling task status message")];
[progressIndicatorText display];
-
- mySQLConnectionCancelled = YES;
+
+ if (mySQLConnection) {
+ [NSThread detachNewThreadSelector:@selector(disconnect) toTarget:mySQLConnection withObject:nil];
+ }
+#endif
+
+ cancellingConnection = YES;
+
+ // Cancel the MySQL connection - handing it off to a background thread - if one is present
+ if (mySQLConnection) {
+ [mySQLConnection setDelegate:nil];
+ [NSThread detachNewThreadSelector:@selector(disconnect) toTarget:mySQLConnection withObject:nil];
+ [mySQLConnection autorelease];
+ mySQLConnection = nil;
+ }
+
+ // Cancel the SSH tunnel if present
+ if (sshTunnel) {
+ [sshTunnel disconnect];
+ [sshTunnel release];
+ sshTunnel = nil;
+ }
+
+#ifndef SP_REFACTOR
+ // Restore the connection interface
+ [self _restoreConnectionInterface];
#endif
}
@@ -1558,9 +1580,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
// Re-enable favorites table view
[favoritesOutlineView setEnabled:YES];
[(NSView *)favoritesOutlineView display];
-
- mySQLConnectionCancelled = NO;
-
+
// Revert the connect button back to its original selector
[connectButton setAction:@selector(initiateConnection:)];
}
@@ -1767,6 +1787,18 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
#pragma mark -
+- (void)_documentWillClose:(NSNotification *)notification
+{
+ dbDocument = nil;
+ if (mySQLConnection) {
+ [mySQLConnection setDelegate:nil];
+ [NSThread detachNewThreadSelector:@selector(disconnect) toTarget:mySQLConnection withObject:nil];
+ [mySQLConnection autorelease];
+ mySQLConnection = nil;
+ }
+ if (sshTunnel) [sshTunnel setConnectionStateChangeSelector:nil delegate:nil], [sshTunnel disconnect], [sshTunnel release];
+}
+
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -1809,12 +1841,6 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
for (id retainedObject in nibObjectsToRelease) [retainedObject release];
[nibObjectsToRelease release];
-
- if (mySQLConnection) {
- [mySQLConnection setDelegate:nil];
- [mySQLConnection release];
- }
- if (sshTunnel) [sshTunnel setConnectionStateChangeSelector:nil delegate:nil], [sshTunnel disconnect], [sshTunnel release];
if (connectionKeychainID) [connectionKeychainID release];
if (connectionKeychainItemName) [connectionKeychainItemName release];
diff --git a/Source/SPConnectionControllerDataSource.m b/Source/SPConnectionControllerDataSource.m
index a318db85..17da21c7 100644
--- a/Source/SPConnectionControllerDataSource.m
+++ b/Source/SPConnectionControllerDataSource.m
@@ -39,6 +39,7 @@
@interface SPConnectionController ()
- (void)_reloadFavoritesViewData;
+- (void)_saveCurrentDetailsCreatingNewFavorite:(BOOL)createNewFavorite validateDetails:(BOOL)validateDetails;
@end
diff --git a/Source/SPConnectionControllerInitializer.m b/Source/SPConnectionControllerInitializer.m
index b3f06691..2f4d725e 100644
--- a/Source/SPConnectionControllerInitializer.m
+++ b/Source/SPConnectionControllerInitializer.m
@@ -85,7 +85,6 @@ static NSString *SPConnectionViewNibName = @"ConnectionView";
sshTunnel = nil;
mySQLConnection = nil;
cancellingConnection = NO;
- mySQLConnectionCancelled = NO;
favoriteNameFieldWasAutogenerated = NO;
[self loadNib];
@@ -169,6 +168,11 @@ static NSString *SPConnectionViewNibName = @"ConnectionView";
*/
- (void)registerForNotifications
{
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(_documentWillClose:)
+ name:SPDocumentWillCloseNotification
+ object:dbDocument];
+
#ifndef SP_REFACTOR
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(scrollViewFrameChanged:)
diff --git a/Source/SPConnectionHandler.h b/Source/SPConnectionHandler.h
index 765bae73..73e1f00b 100644
--- a/Source/SPConnectionHandler.h
+++ b/Source/SPConnectionHandler.h
@@ -48,7 +48,6 @@
- (void)mySQLConnectionEstablished;
- (void)sshTunnelCallback:(SPSSHTunnel *)theTunnel;
-- (void)cancelConnection;
- (void)addConnectionToDocument;
- (void)failConnectionWithTitle:(NSString *)theTitle errorMessage:(NSString *)theErrorMessage detail:(NSString *)errorDetail rawErrorText:(NSString *)rawErrorText;
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m
index 1a85bc50..3495eb95 100644
--- a/Source/SPConnectionHandler.m
+++ b/Source/SPConnectionHandler.m
@@ -69,9 +69,9 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
[progressIndicatorText setStringValue:NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")];
}
[progressIndicatorText display];
-
+
[connectButton setTitle:NSLocalizedString(@"Cancel", @"cancel button")];
- [connectButton setAction:@selector(cancelMySQLConnection:)];
+ [connectButton setAction:@selector(cancelConnection:)];
[connectButton setEnabled:YES];
[connectButton display];
#endif
@@ -250,6 +250,11 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
}
[progressIndicatorText display];
+ [connectButton setTitle:NSLocalizedString(@"Cancel", @"cancel button")];
+ [connectButton setAction:@selector(cancelConnection:)];
+ [connectButton setEnabled:YES];
+ [connectButton display];
+
// Trim whitespace and newlines from the SSH host field before attempting to connect
[self setSshHost:[[self sshHost] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]];
@@ -285,18 +290,10 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
{
isConnecting = NO;
- // If the user hit cancel during the connection attempt, or a test connection is
- // occurring, kill the connection once established and reset the UI.
- if (mySQLConnectionCancelled || isTestingConnection) {
- if ([mySQLConnection isConnected]) {
- [mySQLConnection disconnect];
- [mySQLConnection release], mySQLConnection = nil;
- }
-
- // Kill the SSH connection if present
- [self cancelConnection];
-
- [self _restoreConnectionInterface];
+ // If the user is only testing the connection, kill the connection
+ // once established and reset the UI.
+ if (isTestingConnection) {
+ [self cancelConnection:self];
if (isTestingConnection) {
[self _showConnectionTestResult:NSLocalizedString(@"Connection succeeded", @"Connection success very short status message")];
@@ -387,21 +384,6 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
}
}
-/*
- * Cancel connection.
- */
-- (void)cancelConnection
-{
- cancellingConnection = YES;
-
- if (!sshTunnel) return;
-
- [sshTunnel disconnect];
- [sshTunnel release];
-
- sshTunnel = nil;
-}
-
/**
* Add the connection to the parent document and restore the
* interface, allowing the application to run as normal.
@@ -463,9 +445,8 @@ static NSString *SPLocalhostAddress = @"127.0.0.1";
[[(NSObject *)delegate onMainThread] connectionControllerConnectAttemptFailed:self];
}
- // Only display the connection error message if there is a window visible and the connection attempt
- // wasn't cancelled even though it failed.
- if ([[dbDocument parentWindow] isVisible] && (!mySQLConnectionCancelled)) {
+ // Only display the connection error message if there is a window visible
+ if ([[dbDocument parentWindow] isVisible]) {
SPBeginAlertSheet(theTitle, NSLocalizedString(@"OK", @"OK button"), (errorDetail) ? NSLocalizedString(@"Show Detail", @"Show detail button") : nil, (isSSHTunnelBindError) ? NSLocalizedString(@"Use Standard Connection", @"use standard connection button") : nil, [dbDocument parentWindow], self, @selector(connectionFailureSheetDidEnd:returnCode:contextInfo:), @"connect", theErrorMessage);
}
}
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index 3978db6f..03da11a6 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -394,6 +394,7 @@ extern NSString *SPExportFilenameFormat;
extern NSString *SPContentFilters;
extern NSString *SPDocumentTaskEndNotification;
extern NSString *SPDocumentTaskStartNotification;
+extern NSString *SPDocumentWillCloseNotification;
extern NSString *SPActivitiesUpdateNotification;
extern NSString *SPFieldEditorSheetFont;
extern NSString *SPLastSQLFileEncoding;
diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index b72c0217..33f5e22a 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -199,6 +199,7 @@ NSString *SPExportFilenameFormat = @"SPExportFilenameFormat";
NSString *SPContentFilters = @"ContentFilters";
NSString *SPDocumentTaskEndNotification = @"DocumentTaskEnded";
NSString *SPDocumentTaskStartNotification = @"DocumentTaskStarted";
+NSString *SPDocumentWillCloseNotification = @"DocumentWillClose";
NSString *SPActivitiesUpdateNotification = @"ActivitiesUpdateNotification";
NSString *SPFieldEditorSheetFont = @"FieldEditorSheetFont";
NSString *SPLastSQLFileEncoding = @"lastSqlFileEncoding";
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 0bfbb16f..fa46db2d 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -4065,8 +4065,11 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
[mySQLConnection setDelegate:nil];
- if (_isConnected) [self closeConnection];
- else [connectionController cancelConnection];
+ if (_isConnected) {
+ [self closeConnection];
+ } else {
+ [connectionController cancelConnection:self];
+ }
#ifndef SP_REFACTOR
if ([[[SPQueryController sharedQueryController] window] isVisible]) [self toggleConsole:self];
[createTableSyntaxWindow orderOut:nil];
@@ -5737,7 +5740,9 @@ static NSString *SPRenameDatabaseAction = @"SPRenameDatabase";
#endif
- [databaseStructureRetrieval destroy];
+ // Tell listeners that this database document is being closed - fixes retain cycles and allows cleanup
+ [[NSNotificationCenter defaultCenter] postNotificationName:SPDocumentWillCloseNotification object:self];
+
[databaseStructureRetrieval release];
[allDatabases release];
diff --git a/Source/SPDatabaseStructure.h b/Source/SPDatabaseStructure.h
index f382944a..57249c93 100644
--- a/Source/SPDatabaseStructure.h
+++ b/Source/SPDatabaseStructure.h
@@ -53,7 +53,7 @@
// Setup and teardown
- (id)initWithDelegate:(SPDatabaseDocument *)theDelegate;
- (void)setConnectionToClone:(SPMySQLConnection *)aConnection;
-- (void)destroy;
+- (void)destroy:(NSNotification *)notification;
// Information
- (SPMySQLConnection *)connection;
diff --git a/Source/SPDatabaseStructure.m b/Source/SPDatabaseStructure.m
index 16a5b205..2ceb2728 100644
--- a/Source/SPDatabaseStructure.m
+++ b/Source/SPDatabaseStructure.m
@@ -81,6 +81,11 @@
structure = [[NSMutableDictionary alloc] initWithCapacity:1];
allKeysofDbStructure = [[NSMutableArray alloc] initWithCapacity:20];
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(destroy:)
+ name:SPDocumentWillCloseNotification
+ object:theDelegate];
+
// Set up the connection, thread management and data locks
pthread_mutex_init(&threadManagementLock, NULL);
pthread_mutex_init(&dataLock, NULL);
@@ -105,7 +110,7 @@
/**
* Ensure that processing is completed.
*/
-- (void)destroy
+- (void)destroy:(NSNotification *)notification
{
delegate = nil;
@@ -127,7 +132,9 @@
- (void)dealloc
{
- [self destroy];
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
+
+ [self destroy:nil];
[structureRetrievalThreads release];
pthread_mutex_destroy(&threadManagementLock);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 14:34:10 +0000