diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-05-14 17:26:18 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-05-14 17:26:18 +0000 |
| commit | 2dbae24c7735ead0524bd9847af6ea99d8654ec6 (patch) | |
| tree | 87dbed4317214da2aa9e2aed493fd7b798b3e2bc /Source/SPCSVExporter.m | |
| parent | 160728cd29519794b47b3a09b139ce9d604883f0 (diff) | |
| download | sequelpro-2dbae24c7735ead0524bd9847af6ea99d8654ec6.tar.gz sequelpro-2dbae24c7735ead0524bd9847af6ea99d8654ec6.tar.bz2 sequelpro-2dbae24c7735ead0524bd9847af6ea99d8654ec6.zip | |
Bring outline view branch up to date with trunk (r3279:r3306).
Diffstat (limited to 'Source/SPCSVExporter.m')
| -rw-r--r-- | Source/SPCSVExporter.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPCSVExporter.m b/Source/SPCSVExporter.m index e5d945c3..651f0ffd 100644 --- a/Source/SPCSVExporter.m +++ b/Source/SPCSVExporter.m @@ -95,8 +95,7 @@ } // Check that we have all the required info before starting the export - if ((![self csvOutputFieldNames]) || - (![self csvFieldSeparatorString]) || + if ((![self csvFieldSeparatorString]) || (![self csvEscapeString]) || (![self csvLineEndingString])) { @@ -123,6 +122,7 @@ // Make a streaming request for the data if the data array isn't set if ((![self csvDataArray]) && [self csvTableName]) { + totalRows = [[[[connection queryString:[NSString stringWithFormat:@"SELECT COUNT(1) FROM %@", [[self csvTableName] backtickQuotedString]]] fetchRowAsArray] objectAtIndex:0] integerValue]; streamingResult = [connection streamingQueryString:[NSString stringWithFormat:@"SELECT * FROM %@", [[self csvTableName] backtickQuotedString]] useLowMemoryBlockingStreaming:[self exportUsingLowMemoryBlockingStreaming]]; } |