aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-10-19 18:15:09 +0000
committerstuconnolly <stuart02@gmail.com>2010-10-19 18:15:09 +0000
commitda8b958902b41f733b2c346836a1c5bdab3abc70 (patch)
tree8c9e4cee344290737404533cf1f712f66d507f64
parent54a82bd39cb5a4e9368700030fcd71ab5e724362 (diff)
downloadsequelpro-da8b958902b41f733b2c346836a1c5bdab3abc70.tar.gz
sequelpro-da8b958902b41f733b2c346836a1c5bdab3abc70.tar.bz2
sequelpro-da8b958902b41f733b2c346836a1c5bdab3abc70.zip
Because the process of editing a trigger involves droping and then re-creating it, if an error occurs when attempting to re-create it remember to then re-create the original one. Fixes issue #795.
-rw-r--r--Resources/English.lproj/Localizable.stringsbin182972 -> 182996 bytes
-rw-r--r--Source/SPTableTriggers.h4
-rw-r--r--Source/SPTableTriggers.m93
3 files changed, 59 insertions, 38 deletions
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 7cb2e5ab..7a6b90af 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Source/SPTableTriggers.h b/Source/SPTableTriggers.h
index b1923830..b2a754ce 100644
--- a/Source/SPTableTriggers.h
+++ b/Source/SPTableTriggers.h
@@ -54,8 +54,12 @@
NSMutableArray *triggerData;
BOOL isEdit;
+
NSString *editTriggerName;
+ NSString *editTriggerEvent;
+ NSString *editTriggerTableName;
NSString *editTriggerStatement;
+ NSString *editTriggerActionTime;
}
@property (readwrite, assign) MCPConnection *connection;
diff --git a/Source/SPTableTriggers.m b/Source/SPTableTriggers.m
index b9956e3c..86f0aa53 100644
--- a/Source/SPTableTriggers.m
+++ b/Source/SPTableTriggers.m
@@ -145,43 +145,50 @@
- (IBAction)confirmAddTrigger:(id)sender
{
[self closeTriggerSheet:self];
+
+ NSString *createTriggerStatementTemplate = @"CREATE TRIGGER %@ %@ %@ ON %@ FOR EACH ROW %@";
// MySQL doesn't have ALTER TRIGGER, so we delete the old one and add a new one.
// In case of error, all the old trigger info is kept in buffer
- if(isEdit && [editTriggerName length]>0)
+ if (isEdit && [editTriggerName length] > 0)
{
NSString *queryDelete = [NSString stringWithFormat:@"DROP TRIGGER %@.%@",
[[tableDocumentInstance database] backtickQuotedString],
[editTriggerName backtickQuotedString]];
+
[connection queryString:queryDelete];
- if([connection queryErrored])
- {
- SPBeginAlertSheet(NSLocalizedString(@"Unable to delete trigger",
- @"error deleting trigger message"),
+
+ if ([connection queryErrored]) {
+ SPBeginAlertSheet(NSLocalizedString(@"Unable to delete trigger", @"error deleting trigger message"),
NSLocalizedString(@"OK", @"OK button"),
nil, nil, [NSApp mainWindow], nil, nil, nil,
- [NSString stringWithFormat:NSLocalizedString(@"The selected trigger couldn't be deleted.\n\nMySQL said: %@",
- @"error deleting trigger informative message"),
+ [NSString stringWithFormat:NSLocalizedString(@"The selected trigger couldn't be deleted.\n\nMySQL said: %@", @"error deleting trigger informative message"),
[connection getLastErrorMessage]]);
+
+ return;
}
}
NSString *triggerName = [triggerNameTextField stringValue];
NSString *triggerActionTime = ([triggerActionTimePopUpButton indexOfSelectedItem]) ? @"AFTER" : @"BEFORE";
NSString *triggerEvent = @"";
- switch([triggerEventPopUpButton indexOfSelectedItem]) {
+
+ switch ([triggerEventPopUpButton indexOfSelectedItem])
+ {
case 0:
- triggerEvent = @"INSERT";
- break;
+ triggerEvent = @"INSERT";
+ break;
case 1:
- triggerEvent = @"UPDATE";
- break;
- case 2:triggerEvent = @"DELETE";
- break;
+ triggerEvent = @"UPDATE";
+ break;
+ case 2:
+ triggerEvent = @"DELETE";
+ break;
}
+
NSString *triggerStatement = [triggerStatementTextView string];
- NSString *query = [NSString stringWithFormat:@"CREATE TRIGGER %@ %@ %@ ON %@ FOR EACH ROW %@",
+ NSString *query = [NSString stringWithFormat:createTriggerStatementTemplate,
[triggerName backtickQuotedString],
triggerActionTime,
triggerEvent,
@@ -192,16 +199,27 @@
[connection queryString:query];
if (([connection queryErrored])) {
- SPBeginAlertSheet(NSLocalizedString(@"Error creating trigger",
- @"error creating trigger message"),
+ SPBeginAlertSheet(NSLocalizedString(@"Error creating trigger", @"error creating trigger message"),
NSLocalizedString(@"OK", @"OK button"),
nil, nil, [NSApp mainWindow], nil, nil, nil,
- [NSString stringWithFormat:NSLocalizedString(@"The specified trigger was unable to be created.\n\nMySQL said: %@",
- @"error creating trigger informative message"),
+ [NSString stringWithFormat:NSLocalizedString(@"The specified trigger was unable to be created.\n\nMySQL said: %@", @"error creating trigger informative message"),
[connection getLastErrorMessage]]);
- // In case of error, restore the original trigger statement
- if(isEdit) {
+
+ // In case of error, re-create the original trigger statement
+ if (isEdit) {
[triggerStatementTextView setString:editTriggerStatement];
+
+ NSString *query = [NSString stringWithFormat:createTriggerStatementTemplate,
+ [editTriggerName backtickQuotedString],
+ editTriggerActionTime,
+ editTriggerEvent,
+ [editTriggerTableName backtickQuotedString],
+ editTriggerStatement];
+
+ // If this attempt to re-create the trigger failed, then we're screwed as we've just lost the user's
+ // data, but they had a backup and everything's cool, right? Should we be displaying an error here
+ // or will it interfere with the one above?
+ [connection queryString:query];
}
}
else {
@@ -210,10 +228,9 @@
}
// After Edit, rename button to Add
- if(isEdit)
- {
+ if (isEdit) {
isEdit = NO;
- [confirmAddTriggerButton setTitle: NSLocalizedString(@"Add", @"Add trigger button")];
+ [confirmAddTriggerButton setTitle:NSLocalizedString(@"Add", @"Add trigger button label")];
}
[self _refreshTriggerDataForcingCacheRefresh:YES];
@@ -224,7 +241,6 @@
*/
- (IBAction)addTrigger:(id)sender
{
-
[NSApp beginSheet:addTriggerPanel
modalForWindow:[tableDocumentInstance parentWindow]
modalDelegate:self
@@ -298,41 +314,42 @@
if ([tableDocumentInstance isWorking]) return NO;
// Start Edit panel
- if([triggerData count] > rowIndex && [triggerData objectAtIndex:rowIndex] != NSNotFound)
+ if (([triggerData count] > rowIndex) && ([triggerData objectAtIndex:rowIndex] != NSNotFound))
{
NSDictionary *trigger = [triggerData objectAtIndex:rowIndex];
- // Temporary save original name and statement (we need them later)
- editTriggerName = [trigger objectForKey:@"trigger"];
- editTriggerStatement = [trigger objectForKey:@"statement"];
+ // Cache the original trigger's name and statement in the event that the editing process fails and
+ // we need to recreate it.
+ editTriggerName = [trigger objectForKey:@"trigger"];
+ editTriggerStatement = [trigger objectForKey:@"statement"];
+ editTriggerTableName = [trigger objectForKey:@"table"];
+ editTriggerEvent = [trigger objectForKey:@"event"];
+ editTriggerActionTime = [trigger objectForKey:@"timing"];
[triggerNameTextField setStringValue:editTriggerName];
[triggerStatementTextView setString:editTriggerStatement];
// Timin title is different then what we have saved in the database (case difference)
- for(int i=0;i<[[triggerActionTimePopUpButton itemArray] count]; i++)
+ for (NSUInteger i = 0; i < [[triggerActionTimePopUpButton itemArray] count]; i++)
{
- if([[[triggerActionTimePopUpButton itemTitleAtIndex:i] uppercaseString]
- isEqualToString:[[trigger objectForKey:@"timing"] uppercaseString]])
- {
+ if ([[[triggerActionTimePopUpButton itemTitleAtIndex:i] uppercaseString] isEqualToString:[[trigger objectForKey:@"timing"] uppercaseString]]) {
[triggerActionTimePopUpButton selectItemAtIndex:i];
break;
}
}
// Event title is different then what we have saved in the database (case difference)
- for(int i=0;i<[[triggerEventPopUpButton itemArray] count]; i++)
+ for (NSUInteger i = 0; i < [[triggerEventPopUpButton itemArray] count]; i++)
{
- if([[[triggerEventPopUpButton itemTitleAtIndex:i] uppercaseString]
- isEqualToString:[[trigger objectForKey:@"event"] uppercaseString]])
- {
+ if ([[[triggerEventPopUpButton itemTitleAtIndex:i] uppercaseString] isEqualToString:[[trigger objectForKey:@"event"] uppercaseString]]) {
[triggerEventPopUpButton selectItemAtIndex:i];
break;
}
}
// Change button label from Add to Edit
- [confirmAddTriggerButton setTitle:NSLocalizedString(@"Edit", @"Edit trigger button")];
+ [confirmAddTriggerButton setTitle:NSLocalizedString(@"Save", @"Save trigger button label")];
+
isEdit = YES;
[NSApp beginSheet:addTriggerPanel