- Rework the Add Index indexes menu and the auto_increment index required menu to use tag-based values when generating queries, allowing localisation of menu contents without using those localised values in queries. This addresses I$

 - Remove the ability to specify a FULLTEXT auto_increment index, as I believe this isn't possible.
 - Prevent sheet reuse from specifying invalid storage types for PRIMARY KEYs
 - Fix exceptions when adding indexes to a table where every field is already indexed
 - Fix initialField/indexedFieldNames check to improve on r3061
 - Fix toggling advanced index view after closing the sheet with the view open
 - Update localisable strings

4 files changed, 67 insertions, 17 deletions

diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index d3171802..f724535f 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -180,6 +180,16 @@ typedef enum
 	SPEncodingEUCKRKorean		= 180
 } SPEncodingTypes;
 
+// Table index type menu tags
+typedef enum
+{
+	SPPrimaryKeyMenuTag	= 0,
+	SPIndexMenuTag		= 1,
+	SPUniqueMenuTag		= 2,
+	SPFullTextMenuTag	= 3,
+	SPSpatialMenuTag	= 4
+} SPTableIndexTypeTags;
+
 // File compression formats
 typedef enum
 {
diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index c26eb0c7..ad057926 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -122,18 +122,26 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 	// Check whether a save of the current field row is required.
 	if (![tableStructure saveRowOnDeselect]) return;
 
-	[indexTypePopUpButton insertItemWithTitle:@"PRIMARY KEY" atIndex:0];
+	// Reset visibility of the primary key item
+	[[[indexTypePopUpButton menu] itemWithTag:SPPrimaryKeyMenuTag] setHidden:NO];
 
 	// Set sheet defaults - key type PRIMARY, key name PRIMARY and disabled
-	[indexTypePopUpButton selectItemAtIndex:0];
+	[indexTypePopUpButton selectItemWithTag:SPPrimaryKeyMenuTag];
 	[indexNameTextField setEnabled:NO];
 	[indexNameTextField setStringValue:@"PRIMARY"];
-	
-	// If the table is of type MyISAM and Spatial extension support is available, add the SPATIAL type
+
+	// Remove any existing SPATIAL menu item
+	if ([indexTypePopUpButton indexOfItemWithTag:SPSpatialMenuTag] != -1)
+		[indexTypePopUpButton removeItemAtIndex:[indexTypePopUpButton indexOfItemWithTag:SPSpatialMenuTag]];
+
+	// If the table is of type MyISAM and Spatial extension support is available, (re-)add the SPATIAL type
 	NSString *engine = [[tableData statusValues] objectForKey:@"Engine"];
 	
 	if ([engine isEqualToString:@"MyISAM"] && [[dbDocument serverSupport] supportsSpatialExtensions]) {
-		[indexTypePopUpButton addItemWithTitle:@"SPATIAL"];
+		NSMenuItem *spatialMenuItem = [[[NSMenuItem alloc] init] autorelease];
+		[spatialMenuItem setTitle:NSLocalizedString(@"SPATIAL", @"Spatial index menu item title")];
+		[spatialMenuItem setTag:SPSpatialMenuTag];
+		[[indexTypePopUpButton menu] addItem:spatialMenuItem];
 	}
 	
 	// Check to see whether a primary key already exists for the table, and if so select INDEX instead
@@ -156,11 +164,11 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 		
 		if (isPrimaryKey || hasCompositePrimaryKey) {
 
-			// Remove primary key option
-			[indexTypePopUpButton removeItemAtIndex:0];
+			// Hide primary key option
+			[[[indexTypePopUpButton menu] itemWithTag:SPPrimaryKeyMenuTag] setHidden:YES];
 
 			// Select INDEX type
-			[indexTypePopUpButton selectItemAtIndex:0];
+			[indexTypePopUpButton selectItemWithTag:SPIndexMenuTag];
 			[indexNameTextField setEnabled:YES];
 			[indexNameTextField setStringValue:@""];
 
@@ -188,8 +196,11 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 			break;
 		}
 	}
+
+	// If no initial field has been selected yet - all fields are indexed - add the first field.
+	if (!initialField) initialField = [fields objectAtIndex:0];
 	
-	if (initialField) [indexedFieldNames release], indexedFieldNames = nil;
+	if (indexedFieldNames) [indexedFieldNames release], indexedFieldNames = nil;
 
 	// Reset the indexed columns
 	[indexedFields removeAllObjects];
@@ -275,11 +286,12 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
  */
 - (IBAction)chooseIndexType:(id)sender
 {
-	NSString *indexType = [indexTypePopUpButton titleOfSelectedItem];
+	NSInteger *indexType = [[indexTypePopUpButton selectedItem] tag];
 	
-	if ([indexType isEqualToString:@"PRIMARY KEY"] ) {
+	if (indexType == SPPrimaryKeyMenuTag) {
 		[indexNameTextField setEnabled:NO];
 		[indexNameTextField setStringValue:@"PRIMARY"];
+		[indexStorageTypePopUpButton setEnabled:NO];
 	}
 	else {
 		[indexNameTextField setEnabled:YES];
@@ -289,7 +301,7 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 		}
 		
 		// Specifiying an index storage type (i.e. HASH or BTREE) is not permitted with SPATIAL indexes
-		[indexStorageTypePopUpButton setEnabled:(![indexType isEqualToString:@"SPATIAL"])];
+		[indexStorageTypePopUpButton setEnabled:(indexType != SPSpatialMenuTag)];
 	}
 }
 
@@ -301,6 +313,7 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 	// Close the advanced options view if it's open
 	[indexAdvancedOptionsView setHidden:YES];
 	[indexAdvancedOptionsViewButton setState:NSOffState];
+	showAdvancedView = NO;
 
 	// Hide the size column
 	[indexSizeTableColumn setHidden:YES];
@@ -532,14 +545,30 @@ static const NSString *SPNewIndexKeyBlockSize   = @"IndexKeyBlockSize";
 
 		[indexDetails setObject:indexedFields forKey:SPNewIndexIndexedColumns];
 		[indexDetails setObject:[indexNameTextField stringValue] forKey:SPNewIndexIndexName];
-		[indexDetails setObject:[indexTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexIndexType];
+		switch ([[indexTypePopUpButton selectedItem] tag]) {
+			case SPPrimaryKeyMenuTag:
+				[indexDetails setObject:@"PRIMARY KEY" forKey:SPNewIndexIndexType];
+				break;
+			case SPIndexMenuTag:
+				[indexDetails setObject:@"INDEX" forKey:SPNewIndexIndexType];
+				break;
+			case SPUniqueMenuTag:
+				[indexDetails setObject:@"UNIQUE" forKey:SPNewIndexIndexType];
+				break;
+			case SPFullTextMenuTag:
+				[indexDetails setObject:@"FULLTEXT" forKey:SPNewIndexIndexType];
+				break;
+			case SPSpatialMenuTag:
+				[indexDetails setObject:@"SPATIAL" forKey:SPNewIndexIndexType];
+				break;
+		}
 		
 		// If there is a key block size set it means the database version supports it
 		if ([[indexKeyBlockSizeTextField stringValue] length]) {
 			[indexDetails setObject:[NSNumber numberWithInteger:[indexKeyBlockSizeTextField integerValue]] forKey:SPNewIndexKeyBlockSize];
 		}
 
-		if (([indexStorageTypePopUpButton indexOfSelectedItem] > 0) && (![[indexTypePopUpButton titleOfSelectedItem] isEqualToString:@"SPATIAL"])) {
+		if (([[indexTypePopUpButton selectedItem] tag] != SPPrimaryKeyMenuTag) && ([[indexTypePopUpButton selectedItem] tag] != SPSpatialMenuTag)) {
 			[indexDetails setObject:[indexStorageTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexStorageType];
 		}
 
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index f57a881f..8e6b7e77 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -1219,8 +1219,18 @@
 	alertSheetOpened = NO;
 
 	if(contextInfo && [contextInfo isEqualToString:@"autoincrementindex"]) {
-		if(returnCode) {
-			autoIncrementIndex = [chooseKeyButton titleOfSelectedItem];
+		if (returnCode) {
+			switch ([[chooseKeyButton selectedItem] tag]) {
+				case SPPrimaryKeyMenuTag:
+					autoIncrementIndex = @"PRIMARY KEY";
+					break;
+				case SPIndexMenuTag:
+					autoIncrementIndex = @"INDEX";
+					break;
+				case SPUniqueMenuTag:
+					autoIncrementIndex = @"UNIQUE";
+					break;
+			}
 		} else {
 			autoIncrementIndex = nil;
 			if([tableSourceView selectedRow] > -1 && [extraFieldSuggestions count])
diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m
index d63064e2..17ad817d 100644
--- a/Source/SPTableStructureDelegate.m
+++ b/Source/SPTableStructureDelegate.m
@@ -116,9 +116,10 @@
 			isCurrentExtraAutoIncrement = [[[anObject stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] uppercaseString] isEqualToString:@"AUTO_INCREMENT"];
 			if(isCurrentExtraAutoIncrement) {
 				[currentRow setObject:[NSNumber numberWithInteger:0] forKey:@"null"];
+
 				// Asks the user to add an index to query if AUTO_INCREMENT is set and field isn't indexed
 				if ((![currentRow objectForKey:@"Key"] || [[currentRow objectForKey:@"Key"] isEqualToString:@""])) {
-					[chooseKeyButton selectItemAtIndex:0];
+					[chooseKeyButton selectItemWithTag:SPPrimaryKeyMenuTag];
 
 					[NSApp beginSheet:keySheet
 					   modalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self