diff options
author | stuconnolly <stuart02@gmail.com> | 2012-05-02 13:12:38 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2012-05-02 13:12:38 +0000 |
commit | 5d87f0f50fc90c7ed47ff82b35f07b2749262132 (patch) | |
tree | 37ab959b7385c8f5aaf2d1465e1f19fbd47247c7 /Source/SPTableCopy.m | |
parent | dea294a90f9bf6017986f9c950991a7fc7c9645e (diff) | |
parent | fe555b6d511a51f3bdfb5c0a2b00a3206993076b (diff) | |
download | sequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.tar.gz sequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.tar.bz2 sequelpro-5d87f0f50fc90c7ed47ff82b35f07b2749262132.zip |
Merge outline view branch into trunk.
Adds support for managing and grouping favorites into folders in the connection view and removes the associated favorites management from the preferences window.
NOTE: On first launch your connection favorites will be migrated from Sequel Pro's preference file to a new file in ~/Application Support/Sequel Pro/Data. Your old favorites will remain in the preference file until removed in a future version.
Outstanding known issues:
- Removing a group node with no child favorites presents a warning about also removing the non-existent favorites.
- Starting the application with no favorites, creating a group node then selecting, hides the connection details input. Doesn't support emoty selection.
- Setting the name of a connection, adding it to the favorites and then swicthing to a different connection type, screws with the favorite name.
- The preservation between launches of whether group nodes are collapsed or not is currently not supported.
Diffstat (limited to 'Source/SPTableCopy.m')
-rw-r--r-- | Source/SPTableCopy.m | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m index 47c425a7..fd9b9055 100644 --- a/Source/SPTableCopy.m +++ b/Source/SPTableCopy.m @@ -91,23 +91,27 @@ { BOOL success = YES; - //disable foreign key checks + // Disable foreign key checks [connection queryString:@"/*!32352 SET foreign_key_checks=0 */"]; - if([connection queryErrored]) + + if ([connection queryErrored]) { success = NO; + } - //copy tables - for(NSString *tableName in tablesArray) { - if(![self copyTable:tableName from:sourceDB to:targetDB withContent:copyWithContent]) + for (NSString *tableName in tablesArray) + { + if (![self copyTable:tableName from:sourceDB to:targetDB withContent:copyWithContent]) { success = NO; + } } - //enable foreign key checks + // Enable foreign key checks [connection queryString:@"/*!32352 SET foreign_key_checks=1 */"]; - if([connection queryErrored]) + + if ([connection queryErrored]) { success = NO; + } - //done return success; } @@ -119,12 +123,10 @@ [targetDB backtickQuotedString], [tableName backtickQuotedString] ]; - // Move the table + [connection queryString:moveStatement]; - if ([connection queryErrored]) return NO; - - return YES; + return ![connection queryErrored]; } @end |