diff options
| author | rowanbeentje <rowan@beent.je> | 2009-04-08 23:15:03 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2009-04-08 23:15:03 +0000 |
| commit | 291bc96e1c0b916b2106da936e4c732ec7897bcf (patch) | |
| tree | ab97ab91a5e6d5008a4839b6781a783938be506f /Source/CMMCPConnection.h | |
| parent | ce44079e15c6ad11589b0237fd78ee6b4b364bfa (diff) | |
| download | sequelpro-291bc96e1c0b916b2106da936e4c732ec7897bcf.tar.gz sequelpro-291bc96e1c0b916b2106da936e4c732ec7897bcf.tar.bz2 sequelpro-291bc96e1c0b916b2106da936e4c732ec7897bcf.zip | |
- Second part of r498: ensure that SQL imports are read in as UTF8, and queries are sent as UTF8, if possible; this correctly preserves encoding data when working with files export from Sequel Pro or via mysqldump, and attempts to fall back to the current connection encodings for other files. This should resolve Issue #116.
Diffstat (limited to 'Source/CMMCPConnection.h')
| -rw-r--r-- | Source/CMMCPConnection.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/CMMCPConnection.h b/Source/CMMCPConnection.h index 70b460f1..eece0d3c 100644 --- a/Source/CMMCPConnection.h +++ b/Source/CMMCPConnection.h @@ -64,6 +64,7 @@ - (void) setParentWindow:(NSWindow *)theWindow; - (BOOL) selectDB:(NSString *) dbName; - (CMMCPResult *) queryString:(NSString *) query; +- (CMMCPResult *) queryString:(NSString *) query usingEncoding:(NSStringEncoding) encoding; - (float) lastQueryExecutionTime; - (MCPResult *) listDBsLike:(NSString *) dbsName; - (BOOL) checkConnection; @@ -74,5 +75,6 @@ - (void) stopKeepAliveTimer; - (void) keepAlive:(NSTimer *)theTimer; - (void) threadedKeepAlive; +- (const char *) cStringFromString:(NSString *) theString usingEncoding:(NSStringEncoding) encoding; @end |