New add index sheet, which includes:

- The ability to easily index multiple columns
- The ability to specify the storage type (HASH or BTREE) that should be used when available and permitted
- The ability to specify a length prefix when indexing a specific column (required on TEXT columns)

Requires lots of testing.

1 files changed, 445 insertions, 143 deletions

diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index fdd5b886..ddd80354 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -27,11 +27,21 @@
 #import "SPConstants.h"
 #import "SPAlertSheets.h"
 
+// Constants
+NSString *SPNewIndexIndexName      = @"IndexName";
+NSString *SPNewIndexIndexType      = @"IndexType";
+NSString *SPNewIndexIndexedColumns = @"IndexedColumns";
+NSString *SPNewIndexStorageType    = @"IndexStorageType";
+
 @interface SPIndexesController (PrivateAPI)
 
+- (void)_reloadIndexedColumnsTableData;
+
 - (void)_addIndexUsingDetails:(NSDictionary *)indexDetails;
 - (void)_removeIndexUsingDeatails:(NSDictionary *)indexDetails;
 
+- (void)_resizeWindowForAdvancedOptionsViewByHeightDelta:(NSInteger)delta;
+
 @end
 
 @implementation SPIndexesController
@@ -47,15 +57,32 @@
 - (id)init
 {
 	if ((self = [super initWithWindowNibName:@"IndexesView"])) {
-
+		
 		table = @"";
-
+		
 		fields  = [[NSMutableArray alloc] init];
 		indexes = [[NSMutableArray alloc] init];
-
+		indexedFields = [[NSMutableArray alloc] init];
+		
 		prefs = [NSUserDefaults standardUserDefaults];
+		
+		showAdvancedView = NO;
+		
+		heightOffset = 0;
+		windowMinWidth = [[self window] minSize].width;
+		windowMinHeigth = [[self window] minSize].height;
+		
+		// Create an array of field types that supporting specifying an index length prefix
+		supportsLength = [[NSArray alloc] initWithObjects:
+						  @"CHAR", @"VARCHAR", @"TINYTEXT", @"TEXT", @"MEDIUMTEXT", @"LONGTEXT",
+						  @"BINARY", @"VARBINARY", @"TINYBLOB", @"BLOB", @"MEDIUMBLOB", @"LONGBLOB", nil];
+		
+		// Create an array of field types that require an index length prefix
+		requiresLength = [[NSArray alloc] initWithObjects:
+						  @"TINYTEXT", @"TEXT", @"MEDIUMTEXT", @"LONGTEXT",
+						  @"TINYBLOB", @"BLOB", @"MEDIUMBLOB", @"LONGBLOB", nil];
 	}
-
+	
 	return self;
 }
 
@@ -63,18 +90,23 @@
  * Nib awakening.
  */
 - (void)awakeFromNib
-{
+{	
 	// Set the index tables view's vertical gridlines if required
 	[indexesTableView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone];
-
+	
 	// Set the strutcture and index view's font
 	BOOL useMonospacedFont = [prefs boolForKey:SPUseMonospacedFonts];
-
+	
 	for (NSTableColumn *indexColumn in [indexesTableView tableColumns])
 	{
 		[[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
 	}
-
+	
+	for (NSTableColumn *fieldColumn in [indexedColumnsTableView tableColumns])
+	{
+		[[fieldColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
+	}
+	
 	[prefs addObserver:self forKeyPath:SPDisplayTableViewVerticalGridlines options:NSKeyValueObservingOptionNew context:NULL];
 }
 
@@ -85,50 +117,49 @@
  * Opens the add new index sheet.
  */
 - (IBAction)addIndex:(id)sender
-{
+{	
 	// Check whether a save of the current field row is required.
 	if (![tableStructure saveRowOnDeselect]) return;
-
+	
+	[indexTypePopUpButton insertItemWithTitle:@"PRIMARY KEY" atIndex:0];
+	
 	// Set sheet defaults - key type PRIMARY, key name PRIMARY and disabled
 	[indexTypePopUpButton selectItemAtIndex:0];
 	[indexNameTextField setEnabled:NO];
 	[indexNameTextField setStringValue:@"PRIMARY"];
-
-	[[self window] makeFirstResponder:indexedColumnsComboBox];
-
+		
 	// Check to see whether a primary key already exists for the table, and if so select an INDEX instead
-	for (NSDictionary *field in fields)
+	for (NSDictionary *field in fields) 
 	{
-		if ([[field objectForKey:@"Key"] isEqualToString:@"PRI"]) {
-			[indexTypePopUpButton selectItemAtIndex:1];
+		if ([field objectForKey:@"isprimarykey"]) {
+			
+			[indexTypePopUpButton removeItemAtIndex:0];
+			
+			// Select INDEX type
+			[indexTypePopUpButton selectItemAtIndex:0];
 			[indexNameTextField setEnabled:YES];
 			[indexNameTextField setStringValue:@""];
-
+			
 			[[self window] makeFirstResponder:indexNameTextField];
-
+			
 			break;
 		}
 	}
-
-	// Update the default values array and the indexed column fields control
-	[indexedColumnsComboBox removeAllItems];
-
-	for (NSDictionary *field in fields)
-	{
-		[indexedColumnsComboBox addItemWithObjectValue:[field objectForKey:@"name"]];
-	}
-
-	// Only show up to ten items in the indexed column fields combo box
-	[indexedColumnsComboBox setNumberOfVisibleItems:([fields count] < 10) ? [fields count] : 10];
-
-	// Select the first column
-	[indexedColumnsComboBox selectItemAtIndex:0];
-
+	
+	[addIndexedColumnButton setEnabled:([indexedFields count] < [fields count])];
+	
+	// Index storage types (HASH & BTREE) are only available some storage engines
+	NSString *engine = [[tableData statusValues] objectForKey:@"Engine"];
+	
+	// MyISAM and InnoDB tables only support BTREE storage types so disable the storage type popup button
+	// as it's the default anyway.
+	[indexStorageTypePopUpButton setEnabled:(!([engine isEqualToString:@"MyISAM"] || [engine isEqualToString:@"InnoDB"]))];
+	
 	// Begin the sheet
 	[NSApp beginSheet:[self window]
-	   modalForWindow:[dbDocument parentWindow]
+	   modalForWindow:[dbDocument parentWindow] 
 		modalDelegate:self
-	   didEndSelector:@selector(addIndexSheetDidEnd:returnCode:contextInfo:)
+	   didEndSelector:@selector(addIndexSheetDidEnd:returnCode:contextInfo:) 
 		  contextInfo:nil];
 }
 
@@ -138,20 +169,20 @@
 - (IBAction)removeIndex:(id)sender
 {
 	if (![indexesTableView numberOfSelectedRows]) return;
-
+	
 	// Check whether a save of the current fields row is required.
 	if (![tableStructure saveRowOnDeselect]) return;
-
+	
 	NSInteger index = [indexesTableView selectedRow];
-
+	
 	if ((index == -1) || (index > ([indexes count] - 1))) return;
-
+	
 	NSString *keyName    =  [[indexes objectAtIndex:index] objectForKey:@"Key_name"];
 	NSString *columnName =  [[indexes objectAtIndex:index] objectForKey:@"Column_name"];
-
+	
 	BOOL hasForeignKey = NO;
 	NSString *constraintName = @"";
-
+	
 	// Check to see whether the user is attempting to remove an index that a foreign key constraint depends on
 	// thus would result in an error if not dropped before removing the index.
 	for (NSDictionary *constraint in [tableData getConstraints])
@@ -165,22 +196,22 @@
 			}
 		}
 	}
-
+	
 	NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete index '%@'?", @"delete index message"), keyName]
 									 defaultButton:NSLocalizedString(@"Delete", @"delete button")
 								   alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
-									   otherButton:nil
+									   otherButton:nil 
 						 informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]];
-
+	
 	[alert setAlertStyle:NSCriticalAlertStyle];
-
+	
 	NSArray *buttons = [alert buttons];
-
+	
 	// Change the alert's cancel button to have the key equivalent of return
 	[[buttons objectAtIndex:0] setKeyEquivalent:@"d"];
 	[[buttons objectAtIndex:0] setKeyEquivalentModifierMask:NSCommandKeyMask];
 	[[buttons objectAtIndex:1] setKeyEquivalent:@"\r"];
-
+	
 	[alert beginSheetModalForWindow:[dbDocument parentWindow] modalDelegate:self didEndSelector:@selector(removeIndexSheetDidEnd:returnCode:contextInfo:) contextInfo:(hasForeignKey) ? @"removeIndexAndForeignKey" : @"removeIndex"];
 }
 
@@ -192,10 +223,10 @@
 	if ([[indexTypePopUpButton titleOfSelectedItem] isEqualToString:@"PRIMARY KEY"] ) {
 		[indexNameTextField setEnabled:NO];
 		[indexNameTextField setStringValue:@"PRIMARY"];
-	}
+	} 
 	else {
 		[indexNameTextField setEnabled:YES];
-
+		
 		if ([[indexNameTextField stringValue] isEqualToString:@"PRIMARY"]) {
 			[indexNameTextField setStringValue:@""];
 		}
@@ -203,100 +234,229 @@
 }
 
 /**
- * Close the current sheet
+ * Close the current sheet.
  */
 - (IBAction)closeSheet:(id)sender
 {
+	// Close the advanced options view if it's open
+	[indexAdvancedOptionsView setHidden:YES];
+	[indexAdvancedOptionsViewButton setState:NSOffState];
+	
+	[indexSizeTableColumn setHidden:YES];
+	
+	[self _resizeWindowForAdvancedOptionsViewByHeightDelta:0];
+	
 	[NSApp endSheet:[sender window] returnCode:[sender tag]];
 	[[sender window] orderOut:self];
 }
 
+/**
+ * Adds a new field to be included in the index.
+ */
+- (IBAction)addIndexedField:(id)sender
+{
+	if ([indexedFields count] <= ([fields count] - 1)) {
+
+		// Add a field that hasn't already been added
+		for (NSDictionary *field in fields)
+		{
+			if (![indexedFields containsObject:field]) {
+				[indexedFields addObject:[[field mutableCopy] autorelease]];
+				break;
+			}
+		}
+					
+		// If the field type is foud within the requires length array then a length prefix is required so 
+		// display the size column.
+		if ([requiresLength containsObject:[[[indexedFields objectAtIndex:([indexedFields count] - 1)] objectForKey:@"type"] uppercaseString]]) [indexSizeTableColumn setHidden:NO];
+	}
+	
+	[self _reloadIndexedColumnsTableData];
+	
+	[addIndexedColumnButton setEnabled:([indexedFields count] < [fields count])];
+}
+
+/**
+ * Removes a field from those that are to be included in the index.
+ */
+- (IBAction)removeIndexedField:(id)sender
+{
+	[indexedFields removeObjectAtIndex:[indexedColumnsTableView selectedRow]];
+	
+	[self _reloadIndexedColumnsTableData];
+	
+	[addIndexedColumnButton setEnabled:([indexedFields count] < [fields count])];
+}
+
+/**
+ * Toggles the display of the advanced options view.
+ */
+- (IBAction)toggleAdvancedIndexOptionsView:(id)sender
+{
+	showAdvancedView = (!showAdvancedView);
+	
+	[indexAdvancedOptionsViewButton setState:showAdvancedView];
+	[indexAdvancedOptionsView setHidden:(!showAdvancedView)];
+	
+	[indexSizeTableColumn setHidden:(!showAdvancedView)];
+	
+	[self _resizeWindowForAdvancedOptionsViewByHeightDelta:(showAdvancedView) ? ([indexAdvancedOptionsView frame].size.height + 10) : 0];
+}
+
 #pragma mark -
 #pragma mark TableView datasource methods
 
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
 {
-	return [indexes count];
+	return (tableView == indexesTableView) ? [indexes count] : [indexedFields count];
 }
 
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
 {
-	return [[indexes objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]];
+	return [[(tableView == indexesTableView) ? indexes : indexedFields objectAtIndex:rowIndex] objectForKey:[tableColumn identifier]];
+}
+
+- (void)tableView:(NSTableView *)tableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
+{
+	[[indexedFields objectAtIndex:rowIndex] setObject:object forKey:[tableColumn identifier]];
+	
+	if ([[tableColumn identifier] isEqualToString:@"name"]) {
+		// If the field type is foud within the requires length array then a length prefix is required so 
+		// display the size column.
+		if ([requiresLength containsObject:[[object objectForKey:@"type"] uppercaseString]]) [indexSizeTableColumn setHidden:NO];
+	}
+	
+	[self _reloadIndexedColumnsTableData];
+}
+
+- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)rowIndex
+{
+	if ([[tableColumn identifier] isEqualToString:@"Size"]) {
+				
+		// If the field is of type TEXT or BLOB then a index prefix length is required so change the default 
+		// placeholder of 'optional' to 'required'.
+		[cell setPlaceholderString:([requiresLength containsObject:[[[indexedFields objectAtIndex:rowIndex] objectForKey:@"type"] uppercaseString]]) ? NSLocalizedString(@"required", @"required placeholder string") : NSLocalizedString(@"optional", @"optional placeholder string")];
+	}
 }
 
 #pragma mark -
-#pragma mark TableView delegate methods
+#pragma mark ComboBoxCell datasource methods
 
 /**
- * Performs various interface validation
+ * Returns the number items that are to be shown in the combo box cell.
  */
-- (void)tableViewSelectionDidChange:(NSNotification *)notification
-{
-	if ([notification object] == indexesTableView) {
-
-		// Check if there is currently an index selected and change button state accordingly
-		[removeIndexButton setEnabled:([indexesTableView numberOfSelectedRows] > 0 && [tablesList tableType] == SPTableTypeTable)];
-	}
+- (NSInteger)numberOfItemsInComboBoxCell:(NSComboBoxCell *)comboBoxCell
+{	
+	return [fields count];
+}
 
+/**
+ * Returns the item to be displayed in the combo box cell as the supplied index.
+ */
+- (id)comboBoxCell:(NSComboBoxCell *)comboBoxCell objectValueForItemAtIndex:(NSInteger)index
+{	
+	return [[fields objectAtIndex:index] objectForKey:@"name"];
 }
 
 #pragma mark -
-#pragma mark Text field delegate methods
+#pragma mark TableView delegate methods
 
 /**
- * Only enable the add button if there is at least one indexed column.
+ * UI control validation.
  */
-- (void)controlTextDidChange:(NSNotification *)notification
+- (void)tableViewSelectionDidChange:(NSNotification *)notification
 {
-	if ([notification object] == indexedColumnsComboBox) {
-		[addIndexButton setEnabled:([[[indexedColumnsComboBox stringValue] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length] > 0)];
+	if ([notification object] == indexesTableView) {
+		
+		// Check if there is currently an index selected and change button state accordingly
+		[removeIndexButton setEnabled:([indexesTableView numberOfSelectedRows] > 0 && [tablesList tableType] == SPTableTypeTable)];
+	}
+	else if ([notification object] == indexedColumnsTableView) {
+		[removeIndexedColumnButton setEnabled:(([indexedFields count] > 1) && ([indexedColumnsTableView numberOfSelectedRows] == 1))];
 	}
 }
 
 #pragma mark -
-#pragma mark Other methods
+#pragma mark Accessor methods
 
 /**
  * Sets the current table's fields.
+ *
+ * @param tableFields An array of table fields (NSDictionary instances)
  */
 - (void)setFields:(NSArray *)tableFields
 {
 	[fields removeAllObjects];
-
+	
 	[fields setArray:tableFields];
+	
+	[indexedFields removeAllObjects];
+	
+	if ([fields count]) [indexedFields addObject:[[[fields objectAtIndex:0] mutableCopy] autorelease]];
 }
 
 /**
  * Sets the current table's indexes.
+ *
+ * @param tableIndexes An array of table indexes (NSDictionary instances)
  */
 - (void)setIndexes:(NSArray *)tableIndexes
 {
 	[indexes removeAllObjects];
-
+	
 	[indexes setArray:tableIndexes];
 }
 
+#pragma mark -
+#pragma mark Other methods
+
 /**
  * Process the new index sheet closing, adding the index if appropriate
  */
 - (void)addIndexSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
 {
 	[theSheet orderOut:nil];
-
+	
 	if (returnCode == NSOKButton) {
 		[dbDocument startTaskWithDescription:NSLocalizedString(@"Adding index...", @"adding index task status message")];
-
+		
+		NSUInteger i, j;
 		NSMutableDictionary *indexDetails = [NSMutableDictionary dictionary];
-
-		[indexDetails setObject:[[indexedColumnsComboBox stringValue] componentsSeparatedByString:@","] forKey:@"IndexedColumns"];
-		[indexDetails setObject:[indexNameTextField stringValue] forKey:@"IndexName"];
-		[indexDetails setObject:[indexTypePopUpButton titleOfSelectedItem] forKey:@"IndexType"];
-
+		
+		// Loop the indexed fields array and remove duplicates
+		NSArray *copy = [indexedFields copy];
+		
+		for (i = ([copy count] - 1); i > 0; i--) 
+		{
+			NSDictionary *field = [[copy objectAtIndex:i] objectForKey:@"name"];
+			
+			for (j = 0; j < i; j++)
+			{				
+				if ([[[copy objectAtIndex:j] objectForKey:@"name"] isEqualToString:field]) {					
+					[indexedFields removeObjectAtIndex:i];
+				}
+			}
+		}
+				
+		[copy release];
+		
+		// In the event that we removed duplicate columns reload the table view to ensure that the next time
+		// it is open we don't cause the table view to ask for rows that no longer exist.
+		[indexedColumnsTableView reloadData];
+				
+		[indexDetails setObject:indexedFields forKey:SPNewIndexIndexedColumns];
+		[indexDetails setObject:[indexNameTextField stringValue] forKey:SPNewIndexIndexName];
+		[indexDetails setObject:[indexTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexIndexType];
+				
+		if ([indexStorageTypePopUpButton indexOfSelectedItem] > 0) {
+			[indexDetails setObject:[indexStorageTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexStorageType];
+		}
+		
 		if ([NSThread isMainThread]) {
 			[NSThread detachNewThreadSelector:@selector(_addIndexUsingDetails:) toTarget:self withObject:indexDetails];
-
-			[dbDocument enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL];
-		}
+			
+			[dbDocument enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL];				
+		} 
 		else {
 			[self _addIndexUsingDetails:indexDetails];
 		}
@@ -311,20 +471,20 @@
 {
 	// Order out current sheet to suppress overlapping of sheets
 	[[alert window] orderOut:nil];
-
+	
 	if (returnCode == NSAlertDefaultReturn) {
 		[dbDocument startTaskWithDescription:NSLocalizedString(@"Removing index...", @"removing index task status message")];
-
+				
 		NSMutableDictionary *indexDetails = [NSMutableDictionary dictionary];
-
+		
 		[indexDetails setObject:[indexes objectAtIndex:[indexesTableView selectedRow]] forKey:@"Index"];
 		[indexDetails setObject:[NSNumber numberWithBool:[contextInfo hasSuffix:@"AndForeignKey"]] forKey:@"RemoveForeignKey"];
-
+		
 		if ([NSThread isMainThread]) {
 			[NSThread detachNewThreadSelector:@selector(_removeIndexUsingDeatails:) toTarget:self withObject:indexDetails];
-
+			
 			[dbDocument enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL];
-		}
+		} 
 		else {
 			[self _removeIndexUsingDeatails:indexDetails];
 		}
@@ -335,42 +495,53 @@
  * This method is called as part of Key Value Observing which is used to watch for preference changes which effect the interface.
  */
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
+{	
 	// Display table veiew vertical gridlines preference changed
 	if ([keyPath isEqualToString:SPDisplayTableViewVerticalGridlines]) {
 		[indexesTableView setGridStyleMask:([[change objectForKey:NSKeyValueChangeNewKey] boolValue]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone];
 	}
 	// Use monospaced fonts preference changed
 	else if ([keyPath isEqualToString:SPUseMonospacedFonts]) {
-
+		
 		BOOL useMonospacedFont = [[change objectForKey:NSKeyValueChangeNewKey] boolValue];
-
+		
 		for (NSTableColumn *indexColumn in [indexesTableView tableColumns])
 		{
 			[[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
 		}
-
+		
+		for (NSTableColumn *indexColumn in [indexedColumnsTableView tableColumns])
+		{
+			[[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]];
+		}
+		
 		[indexesTableView reloadData];
+		[self _reloadIndexedColumnsTableData];
 	}
 }
 
 /**
- * Menu validation
+ * Menu item validation.
  */
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
+{	
 	// Remove index
 	if ([menuItem action] == @selector(removeIndex:)) {
 		return ([indexesTableView numberOfSelectedRows] == 1);
 	}
-
+	
 	// Reset AUTO_INCREMENT
-	if ([menuItem action] == @selector(resetAutoIncrement:)) {
-		return ([indexesTableView numberOfSelectedRows] == 1
-				&& [[indexes objectAtIndex:[indexesTableView selectedRow]] objectForKey:@"Key_name"]
+	if ([menuItem action] == @selector(resetAutoIncrement:)) {		
+		return ([indexesTableView numberOfSelectedRows] == 1 
+				&& [[indexes objectAtIndex:[indexesTableView selectedRow]] objectForKey:@"Key_name"] 
 				&& [[[indexes objectAtIndex:[indexesTableView selectedRow]] objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]);
 	}
-
+	
+	// Remove indexed field
+	if ([menuItem action] == @selector(removeIndexedField:)) {
+		return (([indexedFields count] > 1) && ([indexedColumnsTableView numberOfSelectedRows] == 1));
+	}
+	
 	return YES;
 }
 
@@ -378,77 +549,141 @@
 #pragma mark Private API methods
 
 /**
+ * Reloads the indexed columns table view data and displays the size column if required.
+ */
+- (void)_reloadIndexedColumnsTableData
+{
+	NSUInteger c = 0;
+	
+	for (NSDictionary *field in indexedFields)
+	{		
+		if ([requiresLength containsObject:[[field objectForKey:@"type"] uppercaseString]]) c++;
+	}
+	
+	[indexSizeTableColumn setHidden:(!c)];
+	[confirmAddIndexButton setEnabled:(!c)];
+	
+	[indexedColumnsTableView reloadData];
+}
+
+/**
  * Adds an index to the current table.
+ *
+ * @param indexDeatails A dictionary containing the details of the new index to be added
  */
 - (void)_addIndexUsingDetails:(NSDictionary *)indexDetails
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+	
 	// Check whether a save of the current fields row is required.
 	if (![[tableStructure onMainThread] saveRowOnDeselect]) return;
-
-	NSString *indexName = [indexDetails objectForKey:@"IndexName"];
-	NSString *indexType = [indexDetails objectForKey:@"IndexType"];
-	NSArray *indexedColumns = [indexDetails objectForKey:@"IndexedColumns"];
-
-	// Interface validation should prevent this
+	
+	// Retrive index details
+	NSString *indexName        = [indexDetails objectForKey:SPNewIndexIndexName];
+	NSString *indexType        = [indexDetails objectForKey:SPNewIndexIndexType];
+	NSString *indexStorageType = [indexDetails objectForKey:SPNewIndexStorageType]; 
+	NSArray *indexedColumns    = [indexDetails objectForKey:SPNewIndexIndexedColumns];
+	
+	// Interface validation should prevent this, but just to be safe
 	if ([indexedColumns count] > 0) {
-
+		
 		NSMutableArray *tempIndexedColumns = [[NSMutableArray alloc] init];
-
-		if ([indexName isEqualToString:@"PRIMARY"]) {
+		
+		if ([indexType isEqualToString:@"PRIMARY KEY"]) {
 			indexName = @"";
-		}
+		} 
 		else {
 			indexName = ([indexName isEqualToString:@""]) ? @"" : [indexName backtickQuotedString];
 		}
-
+		
 		// For each column strip leading and trailing whitespace and add it to the temp array
-		for (NSString *column in indexedColumns)
-		{
-			[tempIndexedColumns addObject:[column stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]];
+		for (NSDictionary *column in indexedColumns)
+		{					
+			NSString *columnName = [[column objectForKey:@"name"] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+			NSString *columnType = [column objectForKey:@"type"];
+			
+			if ((![columnName length]) || (![columnType length])) continue;
+						
+			// If this field type requires a length and one hasn't been specified (interface validation 
+			// should ensure this doesn't happen), then skip it.
+			if ([requiresLength containsObject:[columnType uppercaseString]] && (![[column objectForKey:@"Size"] length])) continue;
+			
+			if ([column objectForKey:@"Size"] && [supportsLength containsObject:columnType]) {
+				
+				[tempIndexedColumns addObject:[NSString stringWithFormat:@"%@ (%@)", [columnName backtickQuotedString], [column objectForKey:@"Size"]]];
+			}
+			else {
+				[tempIndexedColumns addObject:[columnName backtickQuotedString]];
+			}
 		}
-
+		
+		// Build the query
+		NSMutableString *query = [NSMutableString stringWithFormat:@"ALTER TABLE %@ ADD %@", [table backtickQuotedString], indexType];
+		
+		// If supplied specify the index's name
+		if ([indexName length]) {
+			[query appendString:@" "];
+			[query appendString:indexName];
+		}
+		
+		// Add the columns
+		[query appendFormat:@" (%@)", [tempIndexedColumns componentsJoinedByCommas]];
+		
+		// If supplied specify the index's storage type
+		if (indexStorageType) {
+			[query appendString:@" USING "];
+			[query appendString:indexStorageType];
+		}
+		
 		// Execute the query
-		[connection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@ (%@)", [table backtickQuotedString], indexType, indexName, [tempIndexedColumns componentsJoinedAndBacktickQuoted]]];
-
+		[connection queryString:query];
+		
+		// Get rid of temp arrays
+		[supportsLength release];
+		[requiresLength release];
 		[tempIndexedColumns release];
-
+		
 		// Check for errors, but only if the query wasn't cancelled
 		if ([connection queryErrored] && ![connection queryCancelled]) {
-			SPBeginAlertSheet(NSLocalizedString(@"Unable to add index", @"add index error message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [dbDocument parentWindow], self, nil, nil,
+			SPBeginAlertSheet(NSLocalizedString(@"Unable to add index", @"add index error message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [dbDocument parentWindow], self, nil, nil, 
 							  [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to add the index.\n\nMySQL said: %@", @"add index error informative message"), [connection getLastErrorMessage]]);
 		}
 		else {
 			[tableData resetAllData];
 			[tablesList setStatusRequiresReload:YES];
-
+			
 			[tableStructure loadTable:table];
 		}
 	}
-
+	
+	// Reset indexed fields to default
+	[indexedFields removeAllObjects];
+	[indexedFields addObject:[[[fields objectAtIndex:0] mutableCopy] autorelease]];
+	
 	[dbDocument endTask];
-
+	
 	[pool drain];
 }
 
 /**
  * Removes an index from the current table using the supplied details.
+ *
+ * @param indexDetails A dictionary containing the details of the index to be removed
  */
 - (void)_removeIndexUsingDeatails:(NSDictionary *)indexDetails
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
+	
 	NSDictionary *index   = [indexDetails objectForKey:@"Index"];
 	BOOL removeForeignKey = [[indexDetails objectForKey:@"RemoveForeignKey"] boolValue];
-
+	
 	// Remove the foreign key dependency before the index if required
 	if (removeForeignKey) {
-
+		
 		NSString *columnName =  [index objectForKey:@"Column_name"];
-
+		
 		NSString *constraintName = @"";
-
+		
 		// Check to see whether the user is attempting to remove an index that a foreign key constraint depends on
 		// thus would result in an error if not dropped before removing the index.
 		for (NSDictionary *constraint in [tableData getConstraints])
@@ -461,20 +696,20 @@
 				}
 			}
 		}
-
+		
 		[connection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP FOREIGN KEY %@", [table backtickQuotedString], [constraintName backtickQuotedString]]];
-
+		
 		// Check for errors, but only if the query wasn't cancelled
 		if ([connection queryErrored] && ![connection queryCancelled]) {
 			NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary];
-
+			
 			[errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"];
 			[errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), constraintName, [connection getLastErrorMessage]] forKey:@"message"];
-
+			
 			[[tableStructure onMainThread] showErrorSheetWith:errorDictionary];
-		}
+		} 
 	}
-
+	
 	if ([[index objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]) {
 		[connection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP PRIMARY KEY", [table backtickQuotedString]]];
 	}
@@ -482,39 +717,106 @@
 		[connection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP INDEX %@",
 								 [table backtickQuotedString], [[index objectForKey:@"Key_name"] backtickQuotedString]]];
 	}
-
+	
 	// Check for errors, but only if the query wasn't cancelled
 	if ([connection queryErrored] && ![connection queryCancelled]) {
 		NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary];
-
+		
 		[errorDictionary setObject:NSLocalizedString(@"Unable to delete index", @"error deleting index message") forKey:@"title"];
 		[errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to delete the index.\n\nMySQL said: %@", @"error deleting index informative message"), [connection getLastErrorMessage]] forKey:@"message"];
-
+		
 		[[tableStructure onMainThread] showErrorSheetWith:errorDictionary];
-	}
+	} 
 	else {
 		[tableData resetAllData];
 		[tablesList setStatusRequiresReload:YES];
-
+		
 		[tableStructure loadTable:table];
 	}
-
+	
 	[dbDocument endTask];
-
+	
 	[pool drain];
 }
 
+/**
+ * Resizes the new index sheet's height by the supplied delta, while retaining the position of 
+ * all interface controls to accommodate the advanced options view.
+ *
+ * @param delta The height delta for which the height should be adjusted for.
+ */
+- (void)_resizeWindowForAdvancedOptionsViewByHeightDelta:(NSInteger)delta
+{
+	NSUInteger popUpMask        = [indexTypePopUpButton autoresizingMask];
+	NSUInteger nameFieldMask    = [indexNameTextField autoresizingMask];
+	NSUInteger scrollMask       = [indexedColumnsScrollView autoresizingMask];
+	NSUInteger buttonMask       = [indexAdvancedOptionsViewButton autoresizingMask];
+	NSUInteger textFieldMask    = [indexAdvancedOptionsViewLabelButton autoresizingMask];
+	NSUInteger advancedViewMask = [indexAdvancedOptionsView autoresizingMask];
+	NSUInteger typeLabelMask    = [indexTypeLabel autoresizingMask];
+	NSUInteger nameLabelMask    = [indexNameLabel autoresizingMask];
+	NSUInteger buttonBarMask    = [anchoredButtonBar autoresizingMask];
+	
+	NSRect frame = [[self window] frame];
+	
+	if (frame.size.height > 600 && delta > heightOffset) {
+		frame.origin.y += [indexAdvancedOptionsView frame].size.height;
+		frame.size.height -= [indexAdvancedOptionsView frame].size.height;
+		
+		[[self window] setFrame:frame display:YES animate:YES];
+	}
+	
+	[indexTypePopUpButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexNameTextField setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexedColumnsScrollView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexAdvancedOptionsViewButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexAdvancedOptionsViewLabelButton setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexAdvancedOptionsView setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexTypeLabel setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[indexNameLabel setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	[anchoredButtonBar setAutoresizingMask:NSViewNotSizable | NSViewMinYMargin];
+	
+	NSInteger newMinHeight = (windowMinHeigth - heightOffset + delta < windowMinHeigth) ? windowMinHeigth : windowMinHeigth - heightOffset + delta;
+	
+	[[self window] setMinSize:NSMakeSize(windowMinWidth, newMinHeight)];
+	
+	frame.origin.y += heightOffset;
+	frame.size.height -= heightOffset;
+	
+	heightOffset= delta;
+	
+	frame.origin.y -= heightOffset;
+	frame.size.height += heightOffset;
+	
+	[[self window] setFrame:frame display:YES animate:YES];
+	
+	[indexTypePopUpButton setAutoresizingMask:popUpMask];
+	[indexNameTextField setAutoresizingMask:nameFieldMask];
+	[indexedColumnsScrollView setAutoresizingMask:scrollMask];
+	[indexAdvancedOptionsViewButton setAutoresizingMask:buttonMask];
+	[indexAdvancedOptionsViewLabelButton setAutoresizingMask:textFieldMask];
+	[indexAdvancedOptionsView setAutoresizingMask:advancedViewMask];
+	[indexTypeLabel setAutoresizingMask:typeLabelMask];
+	[indexNameLabel setAutoresizingMask:nameLabelMask];
+	[anchoredButtonBar setAutoresizingMask:buttonBarMask];
+}
+
 #pragma mark -
 
 /**
  * Dealloc.
  */
 - (void)dealloc
-{
-	[table release];
-	[indexes release];
-	[fields release];
-
+{		
+	[table release], table = nil;
+	[indexes release], indexes = nil;
+	[fields release], fields = nil;
+	
+	[supportsLength release], supportsLength = nil;
+	[requiresLength release], requiresLength = nil;
+	
+	if (indexedFields) [indexedFields release], indexedFields = nil;
+	
 	[super dealloc];
 }