Skip to content

Commit e7cf9cd

Browse files
committed
Fix table name token not being used in SQL exports even when only one table is selected
1 parent 6f82431 commit e7cf9cd

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Source/SPExportFilenameUtilities.m

+2
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,8 @@ - (void)updateAvailableExportFilenameTokens
149149
}
150150

151151
[exportCustomFilenameTokenPool setObjectValue:exportTokens];
152+
//update preview name as programmatically changing the exportCustomFilenameTokenField does not fire a notification
153+
[self updateDisplayedExportFilename];
152154
}
153155

154156
/**

Source/SPExportInitializer.m

+2-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@ - (void)exportTables:(NSArray *)exportTables orDataArray:(NSArray *)dataArray
304304
[sqlExporter setSqlExportTables:exportTables];
305305

306306
// Create custom filename if required
307-
[exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatUsingTableName:nil] : [self generateDefaultExportFilename]];
307+
NSString *selectedTableName = (exportSource == SPTableExport && [exportTables count] == 1)? [[exportTables objectAtIndex:0] objectAtIndex:0] : nil;
308+
[exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatUsingTableName:selectedTableName] : [self generateDefaultExportFilename]];
308309

309310
// Only append the extension if necessary
310311
if (![[exportFilename pathExtension] length]) {

0 commit comments

Comments
 (0)