diff options
| -rw-r--r-- | Source/SPDatabaseData.m | 20 | ||||
| -rw-r--r-- | Source/SPExtendedTableInfo.m | 8 |
2 files changed, 23 insertions, 5 deletions
diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m index b8d8b394..a9c86ccc 100644 --- a/Source/SPDatabaseData.m +++ b/Source/SPDatabaseData.m @@ -386,7 +386,25 @@ const CHAR_SETS charsets[] = - (NSArray *)getDatabaseCharacterSetEncodings { if ([characterSetEncodings count] == 0) { - [characterSetEncodings addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM information_schema.character_sets ORDER BY character_set_name ASC"]]; + + // Check the information_schema.collations table is accessible + CMMCPResult *result = [connection queryString:@"SHOW TABLES IN information_schema LIKE 'character_sets'"]; + + if ([result numOfRows] == 1) { + // Table is accessible so get available encodings for the supplied encoding + [characterSetEncodings addObjectsFromArray:[self _getDatabaseDataForQuery:@"SELECT * FROM information_schema.character_sets ORDER BY character_set_name ASC"]]; + } + else { + // Get the list of collations matching the supplied encoding from our hard coded list + const CHAR_SETS *c = charsets; + + do { + [characterSetEncodings addObject:[NSDictionary dictionaryWithObject:[NSString stringWithCString:c->name encoding:NSUTF8StringEncoding] forKey:@"CHARACTER_SET_NAME"]]; + + ++c; + } + while (c[0].nr != 0); + } } return characterSetEncodings; diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 04070e93..0485281a 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -237,14 +237,14 @@ [tableTypePopUpButton addItemWithTitle:@"Not available"]; } - if ([encodings count] > 0) { + if (([encodings count] > 0) && ([tableDataInstance tableEncoding])) { NSString *selectedTitle = @""; // Populate encoding popup button for (NSDictionary *encoding in encodings) - { - NSString *menuItemTitle = [NSString stringWithFormat:@"%@ (%@)", [encoding objectForKey:@"DESCRIPTION"], [encoding objectForKey:@"CHARACTER_SET_NAME"]]; - + { + NSString *menuItemTitle = (![encoding objectForKey:@"DESCRIPTION"]) ? [encoding objectForKey:@"CHARACTER_SET_NAME"] : [NSString stringWithFormat:@"%@ (%@)", [encoding objectForKey:@"DESCRIPTION"], [encoding objectForKey:@"CHARACTER_SET_NAME"]]; + [tableEncodingPopUpButton addItemWithTitle:menuItemTitle]; if ([[tableDataInstance tableEncoding] isEqualToString:[encoding objectForKey:@"CHARACTER_SET_NAME"]]) { |