aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2009-02-24 02:01:06 +0000
committerrowanbeentje <rowan@beent.je>2009-02-24 02:01:06 +0000
commitbf15cc38766128464dae8af97b79991ecf26a58f (patch)
tree05aaf97bc2b9a2e562de55660bda1780073fab7c
parent40e5f768c40608f6d661d32e6dec9fefe64608e2 (diff)
downloadsequelpro-bf15cc38766128464dae8af97b79991ecf26a58f.tar.gz
sequelpro-bf15cc38766128464dae8af97b79991ecf26a58f.tar.bz2
sequelpro-bf15cc38766128464dae8af97b79991ecf26a58f.zip
Fix table creation, deletion, duplication following recent changes
-rw-r--r--Source/TablesList.m10
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/TablesList.m b/Source/TablesList.m
index 0b5b76fd..f5f8a16f 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -104,6 +104,7 @@ adds a new table to the tables-array (no changes in mysql-db)
[tableWindow endEditingFor:nil];
[tables addObject:@""];
+ [tableTypes addObject:[NSNumber numberWithInt:SP_TABLETYPE_TABLE]];
[tablesListView reloadData];
[tablesListView selectRow:[tables count]-1 byExtendingSelection:NO];
[tablesListView editColumn:0 row:[tables count]-1 withEvent:nil select:YES];
@@ -222,6 +223,7 @@ copies a table, if desired with content
}
[tables insertObject:[copyTableNameField stringValue] atIndex:[tablesListView selectedRow]+1];
+ [tableTypes insertObject:[NSNumber numberWithInt:SP_TABLETYPE_TABLE] atIndex:[tablesListView selectedRow]+1];
[tablesListView reloadData];
[tablesListView selectRow:[tablesListView selectedRow]+1 byExtendingSelection:NO];
[tablesListView scrollRowToVisible:[tablesListView selectedRow]];
@@ -276,6 +278,7 @@ removes selected table(s) from mysql-db and tableView
if ( [[mySQLConnection getLastErrorMessage] isEqualTo:@""] ) {
//dropped table with success
[tables removeObjectAtIndex:currentIndex];
+ [tableTypes removeObjectAtIndex:currentIndex];
} else {
//couldn't drop table
error = TRUE;
@@ -425,10 +428,11 @@ Mark the content table for refresh when it's next switched to
NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self,
@selector(sheetDidEnd:returnCode:contextInfo:), nil, @"addRow", NSLocalizedString(@"Table must have a name.", @"message of panel when no name is given for table"));
[tables removeObjectAtIndex:rowIndex];
+ [tableTypes removeObjectAtIndex:rowIndex];
[tablesListView reloadData];
} else {
if ( [tableDocumentInstance supportsEncoding] ) {
- [mySQLConnection queryString:[NSString stringWithFormat:@"CREATE TABLE `%@` (id int) DEFAULT CHARACTER SET %@", anObject, [tableDocumentInstance encoding]]];
+ [mySQLConnection queryString:[NSString stringWithFormat:@"CREATE TABLE `%@` (id int) DEFAULT CHARACTER SET %@", anObject, [tableDocumentInstance connectionEncoding]]];
} else {
[mySQLConnection queryString:[NSString stringWithFormat:@"CREATE TABLE `%@` (id int)", anObject]];
}
@@ -469,6 +473,7 @@ Mark the content table for refresh when it's next switched to
@selector(sheetDidEnd:returnCode:contextInfo:), nil, @"addRow",
[NSString stringWithFormat:NSLocalizedString(@"Couldn't add table %@.\nMySQL said: %@", @"message of panel when table cannot be created with the given name"),
anObject, [mySQLConnection getLastErrorMessage]]);
+ [tableTypes removeObjectAtIndex:rowIndex];
[tables removeObjectAtIndex:rowIndex];
[tablesListView reloadData];
}
@@ -549,6 +554,7 @@ traps enter and esc and edit/cancel without entering next row
if ( [[tables objectAtIndex:[tablesListView selectedRow]] isEqualToString:@""] ) {
//user added new table and then pressed escape
+ [tableTypes removeObjectAtIndex:[tablesListView selectedRow]];
[tables removeObjectAtIndex:[tablesListView selectedRow]];
[tablesListView reloadData];
}
@@ -594,7 +600,7 @@ traps enter and esc and edit/cancel without entering next row
*/
- (void)tableViewSelectionDidChange:(NSNotification *)aNotification
{
- if ( [tablesListView numberOfSelectedRows] == 1 ) {
+ if ( [tablesListView numberOfSelectedRows] == 1 && [[self tableName] length] ) {
// Reset the table information caches
[tableDataInstance resetAllData];