aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-03-20 22:52:11 +0000
committerstuconnolly <stuart02@gmail.com>2012-03-20 22:52:11 +0000
commit69943b4162474259354f2e778e44a74965c2eb8b (patch)
treed0ce6e7ae37d53f9333b596b464855850162d95d
parent1f18d0eb40a1bc0551dbabdfe355c9632a47c6c6 (diff)
downloadsequelpro-69943b4162474259354f2e778e44a74965c2eb8b.tar.gz
sequelpro-69943b4162474259354f2e778e44a74965c2eb8b.tar.bz2
sequelpro-69943b4162474259354f2e778e44a74965c2eb8b.zip
- Fix error message being displayed when changing a table's storage engine even though no error actually occurred. Fixes issue #1304.
-rw-r--r--Source/SPExtendedTableInfo.m9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m
index 9baaecab..52c7cff6 100644
--- a/Source/SPExtendedTableInfo.m
+++ b/Source/SPExtendedTableInfo.m
@@ -610,16 +610,17 @@ static NSString *SPUpdateTableTypeNewType = @"SPUpdateTableTypeNewType";
if ([connection queryErrored]) {
- // Reload the table's data
- [tableDocumentInstance loadTable:selectedTable ofType:[tableDocumentInstance tableType]];
- }
- else {
[tableTypePopUpButton selectItemWithTitle:currentType];
SPBeginAlertSheet(NSLocalizedString(@"Error changing table type", @"error changing table type message"),
NSLocalizedString(@"OK", @"OK button"), nil, nil, [NSApp mainWindow], self, nil, nil,
[NSString stringWithFormat:NSLocalizedString(@"An error occurred when trying to change the table type to '%@'.\n\nMySQL said: %@", @"error changing table type informative message"), newType, [connection lastErrorMessage]]);
+
+ return;
}
+
+ // Reload the table's data
+ [tableDocumentInstance loadTable:selectedTable ofType:[tableDocumentInstance tableType]];
}
/**