Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068, r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089, r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134, r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158, and r2160)

1 files changed, 11 insertions, 7 deletions

diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index 86cd550e..51d490d9 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -360,7 +360,7 @@
 	// A NULL value indicates that the user does not have permission to view the syntax
 	if ([[syntaxResult objectAtIndex:1] isNSNull]) {
 		[[NSAlert alertWithMessageText:NSLocalizedString(@"Permission Denied", @"Permission Denied")
-						 defaultButton:NSLocalizedString(@"OK", @"OK")
+						 defaultButton:NSLocalizedString(@"OK", @"OK button")
 					   alternateButton:nil otherButton:nil
 			 informativeTextWithFormat:NSLocalizedString(@"The creation syntax could not be retrieved due to a permissions error.\n\nPlease check your user permissions with an administrator.", @"Create syntax permission denied detail")]
 			  beginSheetModalForWindow:[NSApp mainWindow]
@@ -725,7 +725,7 @@
 	// A NULL value indicates that the user does not have permission to view the syntax
 	if ([syntaxString isNSNull]) {
 		[[NSAlert alertWithMessageText:NSLocalizedString(@"Permission Denied", @"Permission Denied")
-						 defaultButton:NSLocalizedString(@"OK", @"OK")
+						 defaultButton:NSLocalizedString(@"OK", @"OK button")
 					   alternateButton:nil otherButton:nil
 			 informativeTextWithFormat:NSLocalizedString(@"The creation syntax could not be retrieved due to a permissions error.\n\nPlease check your user permissions with an administrator.", @"Create syntax permission denied detail")]
 			  beginSheetModalForWindow:[NSApp mainWindow]
@@ -1088,25 +1088,29 @@
 	NSInteger i;
 	NSMutableArray *keyColumns = [NSMutableArray array];
 
-	r = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@ WHERE `key` = 'PRI'", [selectedTable backtickQuotedString]]];
+	// select all columns that are primary keys
+	// MySQL before 5.0.3 does not support the WHERE syntax
+	r = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@ /*!50003 WHERE `key` = 'PRI'*/", [selectedTable backtickQuotedString]]];
 	[r setReturnDataAsStrings:YES];
 
 	if([r numOfRows] < 1) return nil;
 
 	if ([mySQLConnection queryErrored]) {
 		if ([mySQLConnection isConnected])
-			NSRunAlertPanel(@"Error", [NSString stringWithFormat:@"An error occured while retrieving the PRIAMRY KEY data:\n\n%@", [mySQLConnection getLastErrorMessage]], @"OK", nil, nil);
+			NSRunAlertPanel(@"Error", [NSString stringWithFormat:NSLocalizedString(@"An error occured while retrieving the PRIMARY KEY data:\n\n%@",@"message when the query that fetches the primary keys fails"), [mySQLConnection getLastErrorMessage]], @"OK", nil, nil);
 		return nil;
 	}
 
 	
 	for( i = 0; i < [r numOfRows]; i++ ) {
 		resultRow = [r fetchRowAsArray];
-		[keyColumns addObject:[NSArrayObjectAtIndex(resultRow, 0) description]];
+		// check if the row is indeed a key (for MySQL servers before 5.0.3)
+		if ([[[resultRow objectAtIndex:3] description] isEqualToString:@"PRI"]) {
+			[keyColumns addObject:[[resultRow objectAtIndex:0] description]];
+		}
 	}
 
-	if([keyColumns count])
-		return keyColumns;
+	if([keyColumns count]) return keyColumns;
 
 	return nil;
 }