• further preparations to F5 completion

Note: not yet active - only querying the data in background will be performed for testing

6 files changed, 190 insertions, 96 deletions

diff --git a/Source/CMTextView.m b/Source/CMTextView.m
index bebea5c0..e05ceefb 100644
--- a/Source/CMTextView.m
+++ b/Source/CMTextView.m
@@ -124,7 +124,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
  * NSDic key "display" := the displayed and to be inserted word
  * NSDic key "image" := an image to be shown left from "display" (optional)
  *
- * [NSDictionary dictionaryWithObjectsAndKeys:@"foo", @"display", @"`foo`", @"insert", @"func-small", @"image", nil]
+ * [NSDictionary dictionaryWithObjectsAndKeys:@"foo", @"display", @"`foo`", @"match", @"func-small", @"image", nil]
  */
 - (NSArray *)suggestionsForSQLCompletionWith:(NSString *)currentWord dictMode:(BOOL)isDictMode
 {
@@ -140,42 +140,6 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 
 	NSMutableArray *possibleCompletions = [[NSMutableArray alloc] initWithCapacity:32];
 
-	if([mySQLConnection isConnected])
-	{
-
-		// NSLog(@"struct:\n %@", [mySQLConnection getDbStructure]);
-
-		// Add table names to completions list
-		for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allTableNames"])
-			[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"table-small-square", @"image", nil]];
-
-		// Add view names to completions list
-		for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allViewNames"])
-			[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"table-view-small-square", @"image", nil]];
-
-		// Add field names to completions list for currently selected table
-		if ([[[self window] delegate] table] != nil)
-			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tableDataInstance"] valueForKey:@"columnNames"])
-				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"dummy-small", @"image", nil]];
-
-
-		// Add all database names to completions list
-		for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allDatabaseNames"])
-			[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"database-small", @"image", nil]];
-
-		// Add proc/func only for MySQL version 5 or higher
-		if(mySQLmajorVersion > 4) {
-			// Add all procedures to completions list for currently selected table
-			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allProcedureNames"])
-				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"proc-small", @"image", nil]];
-
-			// Add all function to completions list for currently selected table
-			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allFunctionNames"])
-				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"func-small", @"image", nil]];
-		}
-		
-	}
-	
 	// If caret is not inside backticks add keywords and all words coming from the view.
 	if([[self string] length] && ![[[self textStorage] attribute:kBTQuote atIndex:[self selectedRange].location-1 effectiveRange:nil] isEqualToString:kBTQuoteValue] )
 	{
@@ -209,9 +173,90 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
 
 	}
 
+	if([mySQLConnection isConnected])
+	{
+		// Add structural db/table/field data to completions list or fallback to gathering TablesList data
+		NSDictionary *dbs = [NSDictionary dictionaryWithDictionary:[mySQLConnection getDbStructure]];
+		if(dbs != nil && [dbs count]) {
+			NSArray *allDbs = [dbs allKeys];
+			NSSortDescriptor *desc = [[NSSortDescriptor alloc] initWithKey:nil ascending:YES selector:@selector(localizedCompare:)];
+			NSArray *sortedDbs = [allDbs sortedArrayUsingDescriptors:[NSArray arrayWithObject:desc]];
+			for(id db in sortedDbs) {
+				NSArray *allTables = [[dbs objectForKey:db] allKeys];
+				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:db, @"display", @"database-small", @"image", nil]];
+				NSArray *sortedTables = [allTables sortedArrayUsingDescriptors:[NSArray arrayWithObject:desc]];
+				for(id table in sortedTables) {
+					NSDictionary * theTable = [[dbs objectForKey:db] objectForKey:table];
+					NSArray *allFields = [theTable allKeys];
+					NSInteger structtype = [[theTable objectForKey:@"  struct_type  "] intValue];
+					BOOL breakFlag = NO;
+					switch(structtype) {
+						case 0:
+						[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:table, @"display", @"table-small-square", @"image", db, @"path", nil]];
+						break;
+						case 1:
+						[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:table, @"display", @"table-view-small-square", @"image", db, @"path", nil]];
+						break;
+						case 2:
+						[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:table, @"display", @"proc-small", @"image", db, @"path", nil]];
+						breakFlag = YES;
+						break;
+						case 3:
+						[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:table, @"display", @"func-small", @"image", db, @"path", nil]];
+						breakFlag = YES;
+						break;
+					}
+					if(!breakFlag) {
+						NSArray *sortedFields = [allFields sortedArrayUsingDescriptors:[NSArray arrayWithObject:desc]];
+						for(id field in sortedFields) {
+							if(![field hasPrefix:@"  "]) {
+								[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:field, @"display", @"field-small-square", @"image", [NSString stringWithFormat:@"%@⇠%@",table,db], @"path", [theTable objectForKey:field], @"type", nil]];
+							}
+						}
+					}
+				}
+			}
+		} else {
+			// [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"updating data…", @"updating table data for completion in progress message"), @"path", nil]];
+
+			// Add all database names to completions list
+			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allDatabaseNames"])
+				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"database-small", @"image", nil]];
+
+			// Add all system database names to completions list
+			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allSystemDatabaseNames"])
+				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"database-small", @"image", nil]];
+
+			// Add table names to completions list
+			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allTableNames"])
+				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"table-small-square", @"image", nil]];
+
+			// Add view names to completions list
+			for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allViewNames"])
+				[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"table-view-small-square", @"image", nil]];
+
+			// Add field names to completions list for currently selected table
+			if ([[[self window] delegate] table] != nil)
+				for (id obj in [[[[self window] delegate] valueForKeyPath:@"tableDataInstance"] valueForKey:@"columnNames"])
+					[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"field-small-square", @"image", nil]];
+
+			// Add proc/func only for MySQL version 5 or higher
+			if(mySQLmajorVersion > 4) {
+				// Add all procedures to completions list for currently selected table
+				for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allProcedureNames"])
+					[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"proc-small", @"image", nil]];
+
+				// Add all function to completions list for currently selected table
+				for (id obj in [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"allFunctionNames"])
+					[possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:obj, @"display", @"func-small", @"image", nil]];
+			}
+		}
+	}
+
 	// Make suggestions unique
+	BOOL avoidUnique = ([currentWord isEqualToString:@"`"]) ? YES :NO;
 	for(id suggestion in possibleCompletions)
-		if(![compl containsObject:suggestion])
+		if(avoidUnique || ![compl containsObject:suggestion])
 			[compl addObject:suggestion];
 
 	[possibleCompletions release];
diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
index 090319dc..0724d722 100644
--- a/Source/SPNarrowDownCompletion.m
+++ b/Source/SPNarrowDownCompletion.m
@@ -98,7 +98,7 @@
 // =============================
 - (id)init
 {
-	if(self = [super initWithContentRect:NSZeroRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO])
+	if(self = [super initWithContentRect:NSMakeRect(0,0,450,0) styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO])
 	{
 		mutablePrefix = [NSMutableString new];
 		textualInputCharacters = [[NSMutableCharacterSet alphanumericCharacterSet] retain];
@@ -193,24 +193,44 @@
 	[self setLevel:NSStatusWindowLevel];
 	[self setHidesOnDeactivate:YES];
 	[self setHasShadow:YES];
+	[self setAlphaValue:0.9];
 
 	NSScrollView* scrollView = [[[NSScrollView alloc] initWithFrame:NSZeroRect] autorelease];
-	[scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+	// [scrollView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
 	[scrollView setAutohidesScrollers:YES];
 	[scrollView setHasVerticalScroller:YES];
+	[scrollView setHasHorizontalScroller:NO];
 	[[scrollView verticalScroller] setControlSize:NSSmallControlSize];
+	[[scrollView horizontalScroller] setControlSize:NSSmallControlSize];
 
 	theTableView = [[[NSTableView alloc] initWithFrame:NSZeroRect] autorelease];
 	[theTableView setFocusRingType:NSFocusRingTypeNone];
 	[theTableView setAllowsEmptySelection:NO];
 	[theTableView setHeaderView:nil];
-
-	NSTableColumn *column = [[[NSTableColumn alloc] initWithIdentifier:@"foo"] autorelease];
-	//
-	[column setDataCell:[[ImageAndTextCell new] autorelease]];
-	[column setEditable:NO];
-	[theTableView addTableColumn:column];
-	[column setWidth:[theTableView bounds].size.width];
+	// [theTableView setSelectionHighlightStyle:NSTableViewSelectionHighlightStyleSourceList];
+
+	NSTableColumn *column0 = [[[NSTableColumn alloc] initWithIdentifier:@"image"] autorelease];
+	[column0 setDataCell:[[ImageAndTextCell new] autorelease]];
+	[column0 setEditable:NO];
+	[theTableView addTableColumn:column0];
+	[column0 setWidth:20];
+	NSTableColumn *column1 = [[[NSTableColumn alloc] initWithIdentifier:@"name"] autorelease];
+	[column1 setEditable:NO];
+	// [[column1 dataCell] setFont:[NSFont systemFontOfSize:12]];
+	[theTableView addTableColumn:column1];
+	[column1 setWidth:180];
+	NSTableColumn *column2 = [[[NSTableColumn alloc] initWithIdentifier:@"type"] autorelease];
+	[column2 setEditable:NO];
+	// [[column2 dataCell] setFont:[NSFont systemFontOfSize:11]];
+	[[column2 dataCell] setTextColor:[NSColor grayColor]];
+	[theTableView addTableColumn:column2];
+	[column2 setWidth:120];
+	NSTableColumn *column3 = [[[NSTableColumn alloc] initWithIdentifier:@"path"] autorelease];
+	[column3 setEditable:NO];
+	// [[column3 dataCell] setFont:[NSFont systemFontOfSize:11]];
+	[[column3 dataCell] setTextColor:[NSColor grayColor]];
+	[theTableView addTableColumn:column3];
+	[column3 setWidth:130];
 
 	[theTableView setDataSource:self];
 	[scrollView setDocumentView:theTableView];
@@ -230,15 +250,22 @@
 {
 	NSImage* image = nil;
 	NSString* imageName = nil;
-	if(!dictMode) {
-		imageName = [[filtered objectAtIndex:rowIndex] objectForKey:@"image"];
-		if(imageName)
-			image = [NSImage imageNamed:imageName];
-		[[aTableColumn dataCell] setImage:image];
+	if([[aTableColumn identifier] isEqualToString:@"image"]) {
+		if(!dictMode) {
+			imageName = [[filtered objectAtIndex:rowIndex] objectForKey:@"image"];
+			if(imageName)
+				image = [NSImage imageNamed:imageName];
+			[[aTableColumn dataCell] setImage:image];
+			return @"";
+		}
+	} else if([[aTableColumn identifier] isEqualToString:@"name"]) {
 		return [[filtered objectAtIndex:rowIndex] objectForKey:@"display"];
+	} else if([[aTableColumn identifier] isEqualToString:@"type"]) {
+		return ([[filtered objectAtIndex:rowIndex] objectForKey:@"type"])?[[filtered objectAtIndex:rowIndex] objectForKey:@"type"]:@"";
+	} else if ([[aTableColumn identifier] isEqualToString:@"path"]) {
+		return ([[filtered objectAtIndex:rowIndex] objectForKey:@"path"])?[[filtered objectAtIndex:rowIndex] objectForKey:@"path"]:@"";
 	}
 	return [filtered objectAtIndex:rowIndex];
-
 }
 
 // ====================
@@ -246,7 +273,7 @@
 // ====================
 - (void)filter
 {
-	NSRect mainScreen = [self rectOfMainScreen];
+	// NSRect mainScreen = [self rectOfMainScreen];
 
 	NSArray* newFiltered;
 	if([mutablePrefix length] > 0)
@@ -274,46 +301,47 @@
 	NSInteger displayedRows = [newFiltered count] < SP_NARROWDOWNLIST_MAX_ROWS ? [newFiltered count] : SP_NARROWDOWNLIST_MAX_ROWS;
 	CGFloat newHeight   = ([theTableView rowHeight] + [theTableView intercellSpacing].height) * displayedRows;
 	
-	CGFloat maxLen = 1;
-	NSString* item;
-	NSInteger i;
-	BOOL spaceInSuggestion = NO;
-	[textualInputCharacters removeCharactersInString:@" "];
-	CGFloat maxWidth = [self frame].size.width;
-	if([newFiltered count]>0)
-	{
-		for(i=0; i<[newFiltered count]; i++)
-		{
-			if(dictMode)
-				item = NSArrayObjectAtIndex(newFiltered, i);
-			else
-				item = [NSArrayObjectAtIndex(newFiltered, i) objectForKey:@"display"];
-			// If space in suggestion add space to allowed input chars
-			if(!spaceInSuggestion && [item rangeOfString:@" "].length) {
-				[textualInputCharacters addCharactersInString:@" "];
-				spaceInSuggestion = YES;
-			}
-
-			if([item length]>maxLen)
-				maxLen = [item length];
-		}
-		maxWidth = maxLen*16;
-		maxWidth = (maxWidth>340) ? 340 : maxWidth;
-	}
-	if(caretPos.y>=0 && (isAbove || caretPos.y<newHeight))
-	{
-		isAbove = YES;
-		old.y = caretPos.y + (newHeight + [tableFont pointSize]*1.5);
-	}
-	if(caretPos.y<0 && (isAbove || (mainScreen.size.height-newHeight)<(caretPos.y*-1)))
-	{
-		old.y = caretPos.y + (newHeight + [tableFont pointSize]*1.5);
-	}
+	// CGFloat maxLen = 1;
+	// NSString* item;
+	// NSInteger i;
+	// BOOL spaceInSuggestion = NO;
+	// [textualInputCharacters removeCharactersInString:@" "];
+	// CGFloat maxWidth = [self frame].size.width;
+	// if([newFiltered count]>0)
+	// {
+	// 	for(i=0; i<[newFiltered count]; i++)
+	// 	{
+	// 		if(dictMode)
+	// 			item = NSArrayObjectAtIndex(newFiltered, i);
+	// 		else
+	// 			item = [NSArrayObjectAtIndex(newFiltered, i) objectForKey:@"display"];
+	// 		// If space in suggestion add space to allowed input chars
+	// 		if(!spaceInSuggestion && [item rangeOfString:@" "].length) {
+	// 			[textualInputCharacters addCharactersInString:@" "];
+	// 			spaceInSuggestion = YES;
+	// 		}
+	// 
+	// 		if([item length]>maxLen)
+	// 			maxLen = [item length];
+	// 	}
+	// 	maxWidth = maxLen*16;
+	// 	maxWidth = (maxWidth>340) ? 340 : maxWidth;
+	// 	maxWidth = (maxWidth<20) ? 20 : maxWidth;
+	// }
+	// if(caretPos.y>=0 && (isAbove || caretPos.y<newHeight))
+	// {
+	// 	isAbove = YES;
+	// 	old.y = caretPos.y + (newHeight + [tableFont pointSize]*1.5);
+	// }
+	// if(caretPos.y<0 && (isAbove || (mainScreen.size.height-newHeight)<(caretPos.y*-1)))
+	// {
+	// 	old.y = caretPos.y + (newHeight + [tableFont pointSize]*1.5);
+	// }
 	
 	// newHeight is currently the new height for theTableView, but we need to resize the whole window
 	// so here we use the difference in height to find the new height for the window
 	// newHeight = [[self contentView] frame].size.height + (newHeight - [theTableView frame].size.height);
-	[self setFrame:NSMakeRect(old.x, old.y-newHeight, maxWidth, newHeight) display:YES];
+	[self setFrame:NSMakeRect(old.x, old.y-newHeight, 450, newHeight) display:YES];
 	if (filtered) [filtered release];
 	filtered = [newFiltered retain];
 	[theTableView reloadData];
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 60bb2bdd..bfc6ef39 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -147,6 +147,7 @@
 	WebView *printWebView;
 	
 	NSMutableArray *allDatabases;
+	NSMutableArray *allSystemDatabases;
 	
 	NSString *queryEditorInitString;
 	
@@ -180,6 +181,7 @@
 - (IBAction)showServerProcesses:(id)sender;
 - (IBAction)openCurrentConnectionInNewWindow:(id)sender;
 - (NSArray *)allDatabaseNames;
+- (NSArray *)allSystemDatabaseNames;
 
 // Task progress and notification methods
 - (void) startTaskWithDescription:(NSString *)description;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 30645361..2bd178e7 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -681,7 +681,7 @@
 											  notificationName:@"Connected"];
 
 	// Query the structure of all databases in the background (mainly for completion)
-	[mySQLConnection performSelector:@selector(queryDbStructure) withObject:nil afterDelay:0.1];
+	// [mySQLConnection performSelector:@selector(queryDbStructure) withObject:nil afterDelay:2];
 
 	// Init Custom Query editor with the stored queries in a spf file if given.
 	[spfDocData setObject:[NSNumber numberWithBool:NO] forKey:@"save_editor_content"];
@@ -914,10 +914,11 @@
 	if ([queryResult numOfRows]) [queryResult dataSeek:0];
 
 	if (allDatabases) [allDatabases release];
+	if (allSystemDatabases) [allSystemDatabases release];
 	
 	allDatabases = [[NSMutableArray alloc] initWithCapacity:[queryResult numOfRows]];
 
-	NSMutableArray *systemDatabases = [NSMutableArray array];
+	allSystemDatabases = [[NSMutableArray alloc] initWithCapacity:2];
 	
 	for (NSInteger i = 0 ; i < [queryResult numOfRows] ; i++)
 	{
@@ -925,7 +926,7 @@
 		
 		// If the database is either information_schema or mysql then it is classed as a system table
 		if ([database isEqualToString:@"information_schema"] || [database isEqualToString:@"mysql"]) {
-			[systemDatabases addObject:database];
+			[allSystemDatabases addObject:database];
 		}
 		else {
 			[allDatabases addObject:database];
@@ -933,13 +934,13 @@
 	}
 
 	// Add system databases
-	for (NSString *db in systemDatabases) 
+	for (NSString *db in allSystemDatabases) 
 	{
 		[chooseDatabaseButton addItemWithTitle:db];
 	}
 	
 	// Add a separator between the system and user databases
-	if ([systemDatabases count] > 0) {
+	if ([allSystemDatabases count] > 0) {
 		[[chooseDatabaseButton menu] addItem:[NSMenuItem separatorItem]];
 	}
 
@@ -1115,6 +1116,14 @@
 }
 
 /**
+ * Returns an array of all available system database names
+ */
+- (NSArray *)allSystemDatabaseNames
+{
+	return allSystemDatabases;
+}
+
+/**
  * Alert sheet method. Invoked when an alert sheet is dismissed.
  *
  * if contextInfo == removeDatabase -> Remove the selected database
@@ -3599,6 +3608,7 @@
 {
 	[_encoding release];
 	[allDatabases release];
+	[allSystemDatabases release];
 	[printWebView release];
 	
 	if (connectionController) [connectionController release];
diff --git a/Source/TablesList.h b/Source/TablesList.h
index b9a3d0c2..911945eb 100644
--- a/Source/TablesList.h
+++ b/Source/TablesList.h
@@ -139,6 +139,7 @@ enum sp_table_types
 - (NSArray *)allFunctionNames;
 - (NSArray *)allProcedureNames;
 - (NSArray *)allDatabaseNames;
+- (NSArray *)allSystemDatabaseNames;
 - (BOOL)structureLoaded;
 - (BOOL)contentLoaded;
 - (BOOL)statusLoaded;
diff --git a/Source/TablesList.m b/Source/TablesList.m
index b5dbc110..b5490e7a 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -87,7 +87,7 @@
 		[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance];
 
 		// Query the structure of all databases in the background (mainly for completion)
-		[mySQLConnection performSelector:@selector(queryDbStructure) withObject:nil afterDelay:0.1];
+		[mySQLConnection performSelector:@selector(queryDbStructure) withObject:nil afterDelay:0.5];
 
 		// Select the table list for the current database.  On MySQL versions after 5 this will include
 		// views; on MySQL versions >= 5.0.02 select the "full" list to also select the table type column.
@@ -1065,6 +1065,14 @@
 }
 
 /**
+ * Returns an array of all available database names
+ */
+- (NSArray *)allSystemDatabaseNames
+{
+	return [tableDocumentInstance allSystemDatabaseNames];
+}
+
+/**
  * Database table types accessor
  */
 - (NSArray *)tableTypes