aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-03-12 02:21:19 +0100
committerMax <post@wickenrode.com>2015-03-12 02:21:19 +0100
commit6af24620e1126fe08e573ebf4dce93444ac140cb (patch)
tree4901c10c0b1e5bab63246a92090065cf5ce09e5c
parent8cc66aa348870e6cdf086500515848b07ea5aa06 (diff)
downloadsequelpro-6af24620e1126fe08e573ebf4dce93444ac140cb.tar.gz
sequelpro-6af24620e1126fe08e573ebf4dce93444ac140cb.tar.bz2
sequelpro-6af24620e1126fe08e573ebf4dce93444ac140cb.zip
Missed a special case in the previous commit
-rw-r--r--Source/SPDatabaseAction.h2
-rw-r--r--Source/SPDatabaseAction.m6
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/SPDatabaseAction.h b/Source/SPDatabaseAction.h
index 52af621f..137a8737 100644
--- a/Source/SPDatabaseAction.h
+++ b/Source/SPDatabaseAction.h
@@ -75,7 +75,7 @@
*
* @param database name of the new database to be created
* @param encoding charset of the new database (can be nil to skip)
- * @param collation sorting collation of the new database (can be nil. Will be ignored if encoding == nil)
+ * @param collation sorting collation of the new database (can be nil)
* @return YES on success, otherwise NO
*/
- (BOOL)createDatabase:(NSString *)database withEncoding:(NSString *)encoding collation:(NSString *)collation;
diff --git a/Source/SPDatabaseAction.m b/Source/SPDatabaseAction.m
index f5ed8b60..c7f5dbf9 100644
--- a/Source/SPDatabaseAction.m
+++ b/Source/SPDatabaseAction.m
@@ -71,9 +71,9 @@
if([encoding length]) { // [nil length] == 0
[query appendFormat:@" DEFAULT CHARACTER SET = %@",[encoding backtickQuotedString]];
- if([collation length]) {
- [query appendFormat:@" DEFAULT COLLATE = %@",[collation backtickQuotedString]];
- }
+ }
+ if([collation length]) {
+ [query appendFormat:@" DEFAULT COLLATE = %@",[collation backtickQuotedString]];
}
[connection queryString:query];