diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-03-20 22:43:34 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-03-20 22:43:34 +0000 |
| commit | 1f18d0eb40a1bc0551dbabdfe355c9632a47c6c6 (patch) | |
| tree | f2983b3e79cb542b3a4297a14cf93d9847871b6c /Source/SPExportInitializer.m | |
| parent | 008b8291ebaf3042c7229350ca1c77a110f4b65d (diff) | |
| download | sequelpro-1f18d0eb40a1bc0551dbabdfe355c9632a47c6c6.tar.gz sequelpro-1f18d0eb40a1bc0551dbabdfe355c9632a47c6c6.tar.bz2 sequelpro-1f18d0eb40a1bc0551dbabdfe355c9632a47c6c6.zip | |
- When exporting a query result or filtered table view make sure we're including the entire content of BLOBs, not just what we display. Fixes issue #1124.
- Move SPTableContent's table view datasource and delegate methods to separate categories in order to reduce it's size.
Diffstat (limited to 'Source/SPExportInitializer.m')
| -rw-r--r-- | Source/SPExportInitializer.m | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m index b2f250c4..7751ddc5 100644 --- a/Source/SPExportInitializer.m +++ b/Source/SPExportInitializer.m @@ -98,10 +98,10 @@ switch (exportSource) { case SPFilteredExport: - dataArray = [tableContentInstance currentDataResultWithNULLs:YES]; + dataArray = [tableContentInstance currentDataResultWithNULLs:YES hideBLOBs:NO]; break; case SPQueryExport: - dataArray = [customQueryInstance currentResult]; + dataArray = [customQueryInstance currentDataResultWithNULLs:YES truncateDataFields:NO]; break; case SPTableExport: // Create an array of tables to export @@ -211,9 +211,10 @@ // export, create the single file now and assign it to all subsequently created exporters. if ((![self exportToMultipleFiles]) || (exportSource == SPFilteredExport) || (exportSource == SPQueryExport)) { NSString *selectedTableName = nil; + if (exportSource == SPTableExport && [exportTables count] == 1) selectedTableName = [exportTables objectAtIndex:0]; - [exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatUsingTableName:selectedTableName] : [self generateDefaultExportFilename]]; + [exportFilename setString:createCustomFilename ? [self expandCustomFilenameFormatUsingTableName:selectedTableName] : [self generateDefaultExportFilename]]; // Only append the extension if necessary if (![[exportFilename pathExtension] length]) { |