aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/SPDatabaseInfo.h20
-rw-r--r--Source/SPDatabaseInfo.m22
-rw-r--r--Source/SPTableCopy.m10
3 files changed, 42 insertions, 10 deletions
diff --git a/Source/SPDatabaseInfo.h b/Source/SPDatabaseInfo.h
index e71863eb..5d678a21 100644
--- a/Source/SPDatabaseInfo.h
+++ b/Source/SPDatabaseInfo.h
@@ -1,10 +1,26 @@
//
+// $Id: $
+//
// SPDatabaseInfo.h
// sequel-pro
//
-// Created by David Rekowski on 19.04.10.
-// Copyright 2010 Papaya Software GmbH. All rights reserved.
+// Created by David Rekowski on Apr 13, 2010
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+// More info at <http://code.google.com/p/sequel-pro/>
#import <Foundation/Foundation.h>
#import "MCPConnection.h"
diff --git a/Source/SPDatabaseInfo.m b/Source/SPDatabaseInfo.m
index b2c2469d..26264298 100644
--- a/Source/SPDatabaseInfo.m
+++ b/Source/SPDatabaseInfo.m
@@ -1,10 +1,26 @@
//
-// SPDatabaseInfo.m
+// $Id: $
+//
+// SPDatbaseInfo.h
// sequel-pro
//
-// Created by David Rekowski on 19.04.10.
-// Copyright 2010 Papaya Software GmbH. All rights reserved.
+// Created by David Rekowski on Apr 13, 2010
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+// More info at <http://code.google.com/p/sequel-pro/>
#import "SPAlertSheets.h"
#import "SPDatabaseInfo.h"
diff --git a/Source/SPTableCopy.m b/Source/SPTableCopy.m
index acf03312..1e0a4d63 100644
--- a/Source/SPTableCopy.m
+++ b/Source/SPTableCopy.m
@@ -52,20 +52,21 @@
@"show create table error informative message"),
[connection getLastErrorMessage]]);
}
- NSLog(@"%i", [theResult numOfRows]);
if ([theResult numOfRows] != 0) {
- NSString *createTableStatment = [[theResult fetchRowAsArray] objectAtIndex:1];
- return createTableStatment;
+ return [[theResult fetchRowAsArray] objectAtIndex:1];
}
+ return @"";
}
- (BOOL)copyTable:(NSString *)tableName from: (NSString *)sourceDB to: (NSString *)targetDB {
- NSMutableString *createTableStatement = [[NSMutableString alloc] initWithString:[self getCreateTableStatementFor:tableName inDB:sourceDB]];
+ NSString *createTableResult = [self getCreateTableStatementFor:tableName inDB:sourceDB];
+ NSMutableString *createTableStatement = [[NSMutableString alloc] initWithString:createTableResult];
// adding the target DB name and the separator dot after "CREATE TABLE ".
[createTableStatement insertString:@"." atIndex:13];
[createTableStatement insertString:[targetDB backtickQuotedString] atIndex:13];
+ NSLog(@"%@", createTableStatement);
/*
// this only works with MySQL >= 4.1
NSString *copyStatement = [NSString stringWithFormat:@"CREATE TABLE %@.%@ LIKE %@.%@",
@@ -106,7 +107,6 @@
[sourceDB backtickQuotedString],
[tableName backtickQuotedString]
];
- DLog(@"Copying table data: %@", copyDataStatement);
[connection queryString:copyDataStatement];
if ([connection queryErrored]) {