Encoding changes and improvements, particularly to increase compatibility with extended characters in MySQL identifiers (names of dbs/tables/cols):

 - Move encoding queries and control into MCPKit, with newly cleaned-up methods, and switch a number of locations to using the new code.
 - Use UTF8 connections for many identifier-based queries (selecting and listing databases, tables, stored procs, table information).  This fixes selection and creation of table and database names containing extended characters, also fixing exceptions and errors.
 - Improve UTF8 over Latin1 to correctly set the client character set encoding as well, fixing custom queries and edits; remove custom code in SPTableContent achieving the same thing in a single location.
 - Fix database encoding detection routines
 - Update localisable strings

1 files changed, 12 insertions, 18 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
index adcecb05..7e60ccb2 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
@@ -51,11 +51,6 @@
 /**
  *
  */
-- (BOOL)connectionEncodingViaLatin1:(id)connection;
-
-/**
- *
- */
 - (NSString *)keychainPasswordForConnection:(id)connection;
 
 /**
@@ -66,11 +61,6 @@
 /**
  *
  */
-- (NSString *)onReconnectShouldUseEncoding:(id)connection;
-
-/**
- *
- */
 - (void)noConnectionAvailable:(id)connection;
 
 /**
@@ -91,11 +81,6 @@
 /**
  *
  */
-- (NSString *)connectionEncoding;
-
-/**
- *
- */
 - (BOOL)navigatorSchemaPathExistsForDatabase:(NSString*)dbname;
 
 /**
@@ -153,7 +138,11 @@
 	NSString *connectionSocket;
 	NSInteger maxAllowedPacketSize;
 	unsigned long connectionThreadId;
-	
+
+	NSString *encoding, *previousEncoding;
+	NSStringEncoding *stringEncoding;
+	BOOL encodingUsesLatin1Transport, previousEncodingUsesLatin1Transport;
+
 	NSInteger currentProxyState;
 	
 	double lastQueryExecutionTime;
@@ -318,8 +307,13 @@ void performThreadedKeepAlive(void *ptr);
 - (NSString *)findSocketPath;
 
 // Encoding
-- (void)setEncoding:(NSStringEncoding)theEncoding;
-- (NSStringEncoding)encoding;
+- (BOOL)setEncoding:(NSString *)theEncoding;
+- (NSString *)encoding;
+- (NSStringEncoding)stringEncoding;
+- (BOOL)setEncodingUsesLatin1Transport:(BOOL)useLatin1;
+- (BOOL)encodingUsesLatin1Transport;
+- (void)storeEncodingForRestoration;
+- (void)restoreStoredEncoding;
 
 // Time zone
 - (void)setTimeZone:(NSTimeZone *)iTimeZone;