aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPSQLExporter.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/SPSQLExporter.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/SPSQLExporter.m')
-rw-r--r--Source/SPSQLExporter.m16
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m
index 649e4ac3..079ea8b9 100644
--- a/Source/SPSQLExporter.m
+++ b/Source/SPSQLExporter.m
@@ -614,7 +614,7 @@
}
// Export procedures and functions
- for (NSString *procedureType in [NSArray arrayWithObjects:@"PROCEDURE", @"FUNCTION", nil])
+ for (NSString *procedureType in @[@"PROCEDURE", @"FUNCTION"])
{
// Check for cancellation flag
if ([self isCancelled]) {
@@ -729,7 +729,7 @@
// A NULL result indicates a permission problem
if ([createProcedure isNSNull]) {
- NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Could not export the %@ '%@' because of a permisions error.\n", @"Procedure/function export permission error"), procedureType, procedureName];
+ NSString *errorString = [NSString stringWithFormat:NSLocalizedString(@"Could not export the %@ '%@' because of a permissions error.\n", @"Procedure/function export permission error"), procedureType, procedureName];
[errors appendString:errorString];
if ([self sqlOutputIncludeErrors]) {
[[self exportOutputFile] writeData:[[NSString stringWithFormat:@"# Error: %@\n", errorString] dataUsingEncoding:NSUTF8StringEncoding]];
@@ -910,12 +910,12 @@
- (void)dealloc
{
- [sqlExportTables release], sqlExportTables = nil;
- [sqlDatabaseHost release], sqlDatabaseHost = nil;
- [sqlDatabaseName release], sqlDatabaseName = nil;
- [sqlExportCurrentTable release], sqlExportCurrentTable = nil;
- [sqlDatabaseVersion release], sqlDatabaseVersion = nil;
- [sqlExportErrors release], sqlExportErrors = nil;
+ SPClear(sqlExportTables);
+ SPClear(sqlDatabaseHost);
+ SPClear(sqlDatabaseName);
+ SPClear(sqlExportCurrentTable);
+ SPClear(sqlDatabaseVersion);
+ SPClear(sqlExportErrors);
[super dealloc];
}