aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPDatabaseData.m
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2013-03-02 19:07:11 +0000
committerrowanbeentje <rowan@beent.je>2013-03-02 19:07:11 +0000
commit552d01b14d97cdd325ed433bca2945c9a13061b3 (patch)
tree155f29f9257783e7ecd709a2f7da567451f2ac99 /Source/SPDatabaseData.m
parente01f4a945279605ae5b674b61e0bee752e8d933d (diff)
downloadsequelpro-552d01b14d97cdd325ed433bca2945c9a13061b3.tar.gz
sequelpro-552d01b14d97cdd325ed433bca2945c9a13061b3.tar.bz2
sequelpro-552d01b14d97cdd325ed433bca2945c9a13061b3.zip
- Alter the database creation sheet to correctly use the selected new database encoding
- Clean up the database creation logic and remove redundant selection logic - Correctly reset and detect the database encoding when creating and switching databases
Diffstat (limited to 'Source/SPDatabaseData.m')
-rw-r--r--Source/SPDatabaseData.m4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m
index 6bf72d5e..202f56ce 100644
--- a/Source/SPDatabaseData.m
+++ b/Source/SPDatabaseData.m
@@ -79,7 +79,9 @@ NSInteger _sortStorageEngineEntry(NSDictionary *itemOne, NSDictionary *itemTwo,
*/
- (void)resetAllData
{
- if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil;
+ if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil;
+ if (defaultCollation != nil) [defaultCollation release], defaultCollation = nil;
+ if (defaultCharacterSetEncoding != nil) [defaultCharacterSetEncoding release], defaultCharacterSetEncoding = nil;
[collations removeAllObjects];
[characterSetCollations removeAllObjects];