aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authordmoagx <post@wickenrode.com>2011-07-04 20:05:25 +0000
committerdmoagx <post@wickenrode.com>2011-07-04 20:05:25 +0000
commit10c3673a3a63f2a7a610f9f474a1d4b45c44a9f6 (patch)
tree7e8dd54312ade870178b11d929dac0e93bd5abbd /Source
parent17309b1f8bc10f674941b0a375ecc0cc8a189945 (diff)
downloadsequelpro-10c3673a3a63f2a7a610f9f474a1d4b45c44a9f6.tar.gz
sequelpro-10c3673a3a63f2a7a610f9f474a1d4b45c44a9f6.tar.bz2
sequelpro-10c3673a3a63f2a7a610f9f474a1d4b45c44a9f6.zip
* Fixes a spacing issue and an issue where MySQL keywords could be translated (fixes #1105)
* Adds support for naming relations (fixes #948, #1085)
Diffstat (limited to 'Source')
-rw-r--r--Source/SPTableRelations.h2
-rw-r--r--Source/SPTableRelations.m80
2 files changed, 73 insertions, 9 deletions
diff --git a/Source/SPTableRelations.h b/Source/SPTableRelations.h
index a71b151a..74dd0a17 100644
--- a/Source/SPTableRelations.h
+++ b/Source/SPTableRelations.h
@@ -42,6 +42,7 @@
IBOutlet SPTableView *relationsTableView;
IBOutlet NSPanel *addRelationPanel;
+ IBOutlet NSTextField *constraintName;
IBOutlet NSBox *addRelationTableBox;
IBOutlet NSPopUpButton *columnPopUpButton;
IBOutlet NSPopUpButton *refTablePopUpButton;
@@ -54,6 +55,7 @@
NSMutableArray *relationData;
NSUserDefaults *prefs;
+ NSMutableArray *takenConstraintNames;
}
@property (readonly) NSMutableArray *relationData;
diff --git a/Source/SPTableRelations.m b/Source/SPTableRelations.m
index 980b8d30..f6d51cad 100644
--- a/Source/SPTableRelations.m
+++ b/Source/SPTableRelations.m
@@ -48,8 +48,9 @@
- (id)init
{
if ((self = [super init])) {
- relationData = [[NSMutableArray alloc] init];
- prefs = [NSUserDefaults standardUserDefaults];
+ relationData = [[NSMutableArray alloc] init];
+ prefs = [NSUserDefaults standardUserDefaults];
+ takenConstraintNames = [[NSMutableArray alloc] init];
}
return self;
@@ -117,20 +118,27 @@
NSString *thatTable = [refTablePopUpButton titleOfSelectedItem];
NSString *thatColumn = [refColumnPopUpButton titleOfSelectedItem];
- NSString *query = [NSString stringWithFormat:@"ALTER TABLE %@ ADD FOREIGN KEY (%@) REFERENCES %@ (%@)",
- [thisTable backtickQuotedString],
+ NSString *query = [NSString stringWithFormat:@"ALTER TABLE %@ ADD ",[thisTable backtickQuotedString]];
+
+ //set constraint name?
+ if([[constraintName stringValue] length] > 0) {
+ query = [query stringByAppendingString:[NSString stringWithFormat:@"CONSTRAINT %@ ",[[constraintName stringValue] backtickQuotedString]]];
+ }
+
+ query = [query stringByAppendingString:[NSString stringWithFormat:@"FOREIGN KEY (%@) REFERENCES %@ (%@)",
[thisColumn backtickQuotedString],
[thatTable backtickQuotedString],
- [thatColumn backtickQuotedString]];
+ [thatColumn backtickQuotedString]]];
+ NSArray *onActions = [NSArray arrayWithObjects:@"RESTRICT",@"CASCADE",@"SET NULL",@"NO ACTION",nil];
// If required add ON DELETE
- if ([onDeletePopUpButton indexOfSelectedItem] > 0) {
- query = [query stringByAppendingString:[NSString stringWithFormat:@" ON DELETE %@", [[onDeletePopUpButton titleOfSelectedItem] uppercaseString]]];
+ if ([onDeletePopUpButton selectedTag] >= 0) {
+ query = [query stringByAppendingString:[NSString stringWithFormat:@" ON DELETE %@", [onActions objectAtIndex:[onDeletePopUpButton selectedTag]]]];
}
// If required add ON UPDATE
- if ([onUpdatePopUpButton indexOfSelectedItem] > 0) {
- query = [query stringByAppendingString:[NSString stringWithFormat:@" ON UPDATE %@", [[onUpdatePopUpButton titleOfSelectedItem] uppercaseString]]];
+ if ([onUpdatePopUpButton selectedTag] >= 0) {
+ query = [query stringByAppendingString:[NSString stringWithFormat:@" ON UPDATE %@", [onActions objectAtIndex:[onUpdatePopUpButton selectedTag]]]];
}
// Execute query
@@ -190,6 +198,7 @@
}
// Get all InnoDB tables in the current database
+ // TODO: MySQL 4 compatibility
MCPResult *result = [connection queryString:[NSString stringWithFormat:@"SELECT table_name FROM information_schema.tables WHERE table_type = 'BASE TABLE' AND engine = 'InnoDB' AND table_schema = %@", [[tableDocumentInstance database] tickQuotedString]]];
[result dataSeek:0];
@@ -198,6 +207,22 @@
{
[refTablePopUpButton addItemWithTitle:[[result fetchRowAsArray] objectAtIndex:0]];
}
+
+ // Get a list of used constraint names for this db
+ [takenConstraintNames removeAllObjects];
+ result = [connection queryString:[NSString stringWithFormat:@"SELECT DISTINCT constraint_name FROM information_schema.table_constraints WHERE constraint_type = 'FOREIGN KEY' AND constraint_schema = %@", [[tableDocumentInstance database] tickQuotedString]]];
+
+ [result dataSeek:0];
+
+ for (NSUInteger i = 0; i < [result numOfRows]; i++)
+ {
+ [takenConstraintNames addObject:[[[result fetchRowAsArray] objectAtIndex:0] lowercaseString]];
+ }
+
+ // Reset other fields
+ [constraintName setStringValue:@""];
+ [onDeletePopUpButton selectItemAtIndex:0];
+ [onUpdatePopUpButton selectItemAtIndex:0];
// Restore encoding if appropriate
if (changeEncoding) [connection restoreStoredEncoding];
@@ -280,6 +305,40 @@
}
#pragma mark -
+#pragma mark TextField delegate methods
+
+- (void)controlTextDidChange:(NSNotification *)aNotification
+{
+ id field = [aNotification object];
+
+ // Make sure the user does not enter a taken name
+ if (field == constraintName) {
+
+ NSString *userValue = [[constraintName stringValue] lowercaseString];
+ BOOL taken = NO;
+ for(NSString *takenName in takenConstraintNames) {
+ if([takenName isEqualToString:userValue]) {
+ taken = YES;
+ break;
+ }
+ }
+
+ //make field red and disable add button
+ if(taken) {
+ [constraintName setTextColor:[NSColor redColor]];
+ [confirmAddRelationButton setEnabled:NO];
+ }
+ //reset
+ else {
+ [constraintName setTextColor:[NSColor controlTextColor]];
+ [confirmAddRelationButton setEnabled:YES];
+ }
+
+ return;
+ }
+}
+
+#pragma mark -
#pragma mark Tableview datasource methods
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
@@ -487,6 +546,9 @@
[[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:SPUseMonospacedFonts];
[relationData release], relationData = nil;
+
+ [takenConstraintNames release];
+ takenConstraintNames = nil;
[super dealloc];
}