aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPExportInitializer.m
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
committerAbhi Beckert <abhi@Twist-of-Lemon-2.local>2015-05-16 08:06:06 +1000
commit57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch)
treedd30aa6156064f1d4c0e10ea87059625470fc2f9 /Source/SPExportInitializer.m
parentb5e972f4504043dfb9c358e272e93fb59ae2127f (diff)
parent0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff)
downloadsequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2
sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Source/SPExportInitializer.m')
-rw-r--r--Source/SPExportInitializer.m14
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m
index bb59dd60..7794d1e4 100644
--- a/Source/SPExportInitializer.m
+++ b/Source/SPExportInitializer.m
@@ -99,7 +99,7 @@
NSArray *dataArray = nil;
// Get rid of the cached connection encoding
- if (previousConnectionEncoding) [previousConnectionEncoding release], previousConnectionEncoding = nil;
+ if (previousConnectionEncoding) SPClear(previousConnectionEncoding);
createCustomFilename = ([[exportCustomFilenameTokenField stringValue] length] > 0);
@@ -126,15 +126,15 @@
// Check the overall export settings
if ([[table objectAtIndex:1] boolValue] && (![exportSQLIncludeStructureCheck state])) {
- [table replaceObjectAtIndex:1 withObject:[NSNumber numberWithBool:NO]];
+ [table replaceObjectAtIndex:1 withObject:@NO];
}
if ([[table objectAtIndex:2] boolValue] && (![exportSQLIncludeContentCheck state])) {
- [table replaceObjectAtIndex:2 withObject:[NSNumber numberWithBool:NO]];
+ [table replaceObjectAtIndex:2 withObject:@NO];
}
if ([[table objectAtIndex:3] boolValue] && (![exportSQLIncludeDropSyntaxCheck state])) {
- [table replaceObjectAtIndex:3 withObject:[NSNumber numberWithBool:NO]];
+ [table replaceObjectAtIndex:3 withObject:@NO];
}
[exportTables addObject:table];
@@ -168,6 +168,12 @@
case SPDotExport:
exportTypeLabel = @"Dot";
break;
+ case SPPDFExport:
+ case SPHTMLExport:
+ case SPExcelExport:
+ default:
+ [NSException raise:NSInvalidArgumentException format:@"unsupported exportType=%lu",exportType];
+ return;
}
// Begin the export based on the source