From dcaa35d218ad66e61eeba0bac5a767f9a206f0b3 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Fri, 20 Nov 2009 01:12:14 +0000
Subject: Delay the releasing of the createTableSyntax variable in SPTableData
 until we are about the replace it to prevent threading issues. Also, in
 fieldListForQuery check that dataColumns array is not empty before
 constructing the field list as well as only obtaining the table's columns if
 the field list is going to be built in the first place.

---
 Source/SPTableData.m  | 29 ++++++++++++++---------------
 Source/TableContent.m | 19 +++++++++++++------
 2 files changed, 27 insertions(+), 21 deletions(-)

(limited to 'Source')

diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index c1fd0497..6f7c6702 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -120,7 +120,7 @@
  * Retrieve a column with a specified name, using or refreshing the cache as appropriate.
  */
 - (NSDictionary *) columnWithName:(NSString *)colName
-{
+{	
 	if ([columns count] == 0) {
 		if ([tableListInstance tableType] == SP_TABLETYPE_VIEW) {
 			[self updateInformationForCurrentView];
@@ -138,7 +138,7 @@
  * Retrieve column names for the current table as an array, using or refreshing the cache as appropriate.
  */
 - (NSArray *) columnNames
-{
+{	
 	if ([columnNames count] == 0) {
 		if ([tableListInstance tableType] == SP_TABLETYPE_VIEW) {
 			[self updateInformationForCurrentView];
@@ -154,7 +154,7 @@
  * Retrieve a specified column for the current table as a dictionary, using or refreshing the cache as appropriate.
  */
 - (NSDictionary *) columnAtIndex:(int)index
-{
+{	
 	if ([columns count] == 0) {
 		if ([tableListInstance tableType] == SP_TABLETYPE_VIEW) {
 			[self updateInformationForCurrentView];
@@ -171,7 +171,7 @@
  */
 
 - (BOOL) columnIsBlobOrText:(NSString *)colName
-{
+{	
 	if ([columns count] == 0) {
 		if ([tableListInstance tableType] == SP_TABLETYPE_VIEW) {
 			[self updateInformationForCurrentView];
@@ -266,7 +266,7 @@
 	NSDictionary *tableData = nil;
 	NSDictionary *columnData;
 	NSEnumerator *enumerator;
-
+	
 	if( [tableListInstance tableType] == SP_TABLETYPE_TABLE || [tableListInstance tableType] == SP_TABLETYPE_VIEW ) {		
 		tableData = [self informationForTable:[tableListInstance tableName]];
 	}
@@ -303,7 +303,7 @@
  * Returns a boolean indicating success.
  */
 - (NSDictionary *) informationForTable:(NSString *)tableName
-{
+{	
 	SPSQLParser *createTableParser, *fieldsParser, *fieldParser;
 	NSMutableArray *tableColumns, *fieldStrings, *definitionParts;
 	NSMutableDictionary *tableColumn, *tableData;
@@ -315,24 +315,21 @@
 	[columnNames removeAllObjects];
 	[constraints removeAllObjects];
 	
-	if (tableCreateSyntax != nil) [tableCreateSyntax release];
-	
 	// Catch unselected tables and return nil
 	if ([tableName isEqualToString:@""] || !tableName) return nil;
 
 	// Retrieve the CREATE TABLE syntax for the table
-	MCPResult *theResult = [mySQLConnection queryString: [NSString stringWithFormat: @"SHOW CREATE TABLE %@",
-																					   [tableName backtickQuotedString]
-																					]];
-
+	MCPResult *theResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW CREATE TABLE %@", [tableName backtickQuotedString]]];
+	
 	// Check for any errors, but only display them if a connection still exists
 	if (![[mySQLConnection getLastErrorMessage] isEqualToString:@""]) {
 		if ([mySQLConnection isConnected]) {
-			NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), 
+			NSBeginAlertSheet(NSLocalizedString(@"Error retrieving table information", @"error retrieving table information message"), NSLocalizedString(@"OK", @"OK button"), 
 					nil, nil, [NSApp mainWindow], self, nil, nil, nil,
-					[NSString stringWithFormat:NSLocalizedString(@"An error occured while retrieving table information.\nMySQL said: %@", @"message of panel when retrieving table information failed"),
-					   [mySQLConnection getLastErrorMessage]]);
+					[NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving the information for table '%@'. Please try again.\n\nMySQL said: %@", @"error retrieving table information informative message"),
+					   tableName, [mySQLConnection getLastErrorMessage]]);
 		}
+		
 		return nil;
 	}
 
@@ -340,6 +337,8 @@
 	NSArray *syntaxResult = [theResult fetchRowAsArray];
 	NSArray *resultFieldNames = [theResult fetchFieldNames];
 	
+	if (tableCreateSyntax != nil) [tableCreateSyntax release];
+	
 	if ([[syntaxResult objectAtIndex:1] isKindOfClass:[NSData class]]) {
 		tableCreateSyntax = [[NSString alloc] initWithData:[syntaxResult objectAtIndex:1] encoding:[mySQLConnection encoding]];
 		createTableParser = [[SPSQLParser alloc] initWithData:[syntaxResult objectAtIndex:1] encoding:[mySQLConnection encoding]]; 
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 58f2bc35..60a7ce4a 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -890,12 +890,14 @@
 - (IBAction)reloadTable:(id)sender
 {
 	[tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Reloading data...", @"Reloading data task description")];
+		
 	if ([NSThread isMainThread]) {
 		[NSThread detachNewThreadSelector:@selector(reloadTableTask) toTarget:self withObject:nil];
 	} else {
 		[self reloadTableTask];
 	}
 }
+
 - (void)reloadTableTask
 {
 	NSAutoreleasePool *reloadPool = [[NSAutoreleasePool alloc] init];
@@ -913,6 +915,7 @@
 	[self loadTable:selectedTable];
 
 	[tableDocumentInstance endTask];
+	
 	[reloadPool drain];
 }
 
@@ -1832,21 +1835,25 @@
 {
 	NSInteger i;
 	NSMutableArray *fields = [NSMutableArray array];
-	NSArray *columnNames = [tableDataInstance columnNames];
 	
-	if ( [prefs boolForKey:SPLoadBlobsAsNeeded] ) {
-		for ( i = 0 ; i < [columnNames count] ; i++ ) {
+	if (([prefs boolForKey:SPLoadBlobsAsNeeded]) && ([dataColumns count] > 0)) {
+		
+		NSArray *columnNames = [tableDataInstance columnNames];
+		
+		for (i = 0 ; i < [columnNames count]; i++) 
+		{
 			if (![tableDataInstance columnIsBlobOrText:[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"name"]] ) {
 				[fields addObject:[NSArrayObjectAtIndex(columnNames, i) backtickQuotedString]];
-			} else {
-			
+			} 
+			else {
 				// For blob/text fields, select a null placeholder so the column count is still correct
 				[fields addObject:@"NULL"];
 			}
 		}
 
 		return [fields componentsJoinedByString:@","];
-	} else {
+	} 
+	else {
 		return @"*";
 	}
 }
-- 
cgit v1.2.3