aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/SPMySQLFramework
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-11-19 16:45:22 +0100
committerMax <post@wickenrode.com>2015-11-19 16:45:22 +0100
commit5f91e6e18ba9107c4a7a1d1709b3da2e984c123a (patch)
treebf6c8f5872789d9f34793dddaec20dfce6baec0d /Frameworks/SPMySQLFramework
parent38005592c2df5a2f9eff91026a8627578ea0efe3 (diff)
downloadsequelpro-5f91e6e18ba9107c4a7a1d1709b3da2e984c123a.tar.gz
sequelpro-5f91e6e18ba9107c4a7a1d1709b3da2e984c123a.tar.bz2
sequelpro-5f91e6e18ba9107c4a7a1d1709b3da2e984c123a.zip
Fix wrong charset mapping for "latin1"
Diffstat (limited to 'Frameworks/SPMySQLFramework')
-rw-r--r--Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m
index fb949679..76f323bc 100644
--- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m
+++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Encoding.m
@@ -213,7 +213,7 @@
if (!strcmp(mysqlCharset, "utf8")) {
return NSUTF8StringEncoding;
} else if (!strcmp(mysqlCharset, "latin1")) {
- return NSISOLatin1StringEncoding;
+ return NSWindowsCP1252StringEncoding; // Warning: This is NOT the same as ISO-8859-1 (aka "ISO Latin 1")
} else if (!strcmp(mysqlCharset, "ascii")) {
return NSASCIIStringEncoding;
@@ -289,7 +289,7 @@
} else if (!strcmp(mysqlCharset, "dos")) {
return CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingDOSLatin1);
} else if (!strcmp(mysqlCharset, "german1")) {
- return NSISOLatin1StringEncoding;
+ return NSWindowsCP1252StringEncoding;
} else if (!strcmp(mysqlCharset, "usa7")) {
return NSASCIIStringEncoding;
} else if (!strcmp(mysqlCharset, "danish")) {
@@ -313,7 +313,7 @@
} else if (!strcmp(mysqlCharset, "croat")) {
return NSISOLatin2StringEncoding;
} else if (!strcmp(mysqlCharset, "latin1_de")) {
- return NSISOLatin1StringEncoding;
+ return NSWindowsCP1252StringEncoding;
}
/**