Merge further revisions back from trunk to the 1.0.x release branch, potentially comprising the last of 1.0.2:

 - r4066: Fix query status and error message title to not always suggest an error has occurred, addressing Issue #1670
 - r4067: Fix validation of the "Add to Favorites" File menu item when editing past favorites; Fix the action of the "Add to Favorites" File menu item to correctly create the new favorite; These address Issue #1666
 - r4068: Move the SPBeginWaitingAlertSheet function to a beginWaitingAlertSheetWithTitle:... class method on a new SPAlertSheets class, allowing us to use invocation forwarding to ensure the entire function is executing on the main thread.  This allows runloop processing to happen on the main thread, addressing Issue #1676
 - r4069: Fix newline warnings
 - r4070: Issue #1601: Fix menu items not being validated properly once a connection is established
 - r4071: Split the process list controller's table view data source and delegate methods into their own category
 - r4072: Fix process list kill query/connection actions not using the correct ID if the list was filtered
 - r4074: Correctly link the SSH name field, fixing issues editing and automatically filling in connection names on the SSH tab, addressing Issue #1686
 - r4075: Specify the NULL status of fields when creating view placeholders on export, fixing problems with invalid timestamp NULL defaults, addressing Issue #1688
 - r4076: Add a spotlight comment to allow easy location of Sequel Pro with other search terms than the name
 - r4077: Fix string type detection, addressing errors when converting string types to blob or binary fields (addressing Issue #1453)
 - r4078: Composite Foreign Keys will now show all columns in Relation view (workaround)
 - r4079: Changed a query (addressing issue #1687); Make some strings localizable
 - r4087: Fix another issue causing ALTER statements to error for binary column types being edited, further addressing Issue #1265
 - r4088: Update version number to 1.0.2

1 files changed, 1 insertions, 1 deletions

diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index fcbc7d13..01ff6be9 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -796,7 +796,7 @@
 			}
 
 			// ADD COLLATE
-			if([fieldEncoding length] && [[theRow objectForKey:@"collation"] integerValue] > 0) {
+			if([fieldEncoding length] && [[theRow objectForKey:@"collation"] integerValue] > 0 && ![[theRow objectForKey:@"binary"] integerValue]) {
 				NSArray *theCollations = [databaseDataInstance getDatabaseCollationsForEncoding:fieldEncoding];
 				NSString *col = [[theCollations objectAtIndex:[[theRow objectForKey:@"collation"] integerValue]-1] objectForKey:@"COLLATION_NAME"];
 				[queryString appendFormat:@"\n COLLATE %@", col];