aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPExtendedTableInfo.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2009-07-20 18:22:36 +0000
committerstuconnolly <stuart02@gmail.com>2009-07-20 18:22:36 +0000
commit82490a9e850ff0eb94a7a159106ca50cb34cdfa7 (patch)
tree6392542269e2cb4a8dc94a444eb07ed9085a2e1a /Source/SPExtendedTableInfo.m
parenta3c74feedbdd46f3c5c0bd5c7091931e930ff6b9 (diff)
downloadsequelpro-82490a9e850ff0eb94a7a159106ca50cb34cdfa7.tar.gz
sequelpro-82490a9e850ff0eb94a7a159106ca50cb34cdfa7.tar.bz2
sequelpro-82490a9e850ff0eb94a7a159106ca50cb34cdfa7.zip
Remove the dependency on information_schema for table encodings.
Diffstat (limited to 'Source/SPExtendedTableInfo.m')
-rw-r--r--Source/SPExtendedTableInfo.m8
1 files changed, 4 insertions, 4 deletions
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"]]) {