Fix table name token not being used in SQL exports even when only one…

… table is selected
sequelpro · Oct 24, 2015 · e7cf9cd · e7cf9cd
1 parent 6f82431
commit e7cf9cd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Source/SPExportFilenameUtilities.m b/Source/SPExportFilenameUtilities.m
@@ -149,6 +149,8 @@ - (void)updateAvailableExportFilenameTokens
 	}
 
 	[exportCustomFilenameTokenPool setObjectValue:exportTokens];
+	//update preview name as programmatically changing the exportCustomFilenameTokenField does not fire a notification
+	[self updateDisplayedExportFilename];
 }
 
 /**

diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m
@@ -304,7 +304,8 @@ - (void)exportTables:(NSArray *)exportTables orDataArray:(NSArray *)dataArray
 		[sqlExporter setSqlExportTables:exportTables];
 
 		// Create custom filename if required
-		[exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatUsingTableName:nil] : [self generateDefaultExportFilename]];
+		NSString *selectedTableName = (exportSource == SPTableExport && [exportTables count] == 1)? [[exportTables objectAtIndex:0] objectAtIndex:0] : nil;
+		[exportFilename setString:(createCustomFilename) ? [self expandCustomFilenameFormatUsingTableName:selectedTableName] : [self generateDefaultExportFilename]];
 
 		// Only append the extension if necessary
 		if (![[exportFilename pathExtension] length]) {