From 31ea7d44be9602679c57e0209689c261409aa384 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Thu, 27 May 2010 20:13:17 +0000 Subject: Rename TableSource to SPTableStructure. --- Interfaces/English.lproj/DBView.xib | 202 ++-- Source/SPExtendedTableInfo.m | 2 +- Source/SPPrintController.m | 2 +- Source/SPTableStructure.h | 109 ++ Source/SPTableStructure.m | 1921 ++++++++++++++++++++++++++++++++++ Source/SPTablesList.m | 2 +- Source/TableContent.m | 2 +- Source/TableDocument.m | 2 +- Source/TableDump.m | 2 +- Source/TableSource.h | 109 -- Source/TableSource.m | 1921 ---------------------------------- sequel-pro.xcodeproj/project.pbxproj | 12 +- 12 files changed, 2139 insertions(+), 2147 deletions(-) create mode 100644 Source/SPTableStructure.h create mode 100644 Source/SPTableStructure.m delete mode 100644 Source/TableSource.h delete mode 100644 Source/TableSource.m diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 18f8e6a2..a26eaa57 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -12120,7 +12120,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPTablesList - TableSource + SPTableStructure SPExtendedTableInfo @@ -28303,6 +28303,102 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPTableRelations.h + + SPTableStructure + NSObject + + YES + + YES + addField: + chooseIndexType: + closeKeySheet: + closeSheet: + copyField: + openIndexSheet: + reloadTable: + removeField: + removeIndex: + resetAutoIncrement: + + + YES + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addFieldButton + addIndexButton + chooseKeyButton + copyFieldButton + editTableButton + extendedTableInfoInstance + indexNameField + indexSheet + indexTypeField + indexView + indexedColumnsField + keySheet + reloadFieldsButton + reloadIndexesButton + removeFieldButton + removeIndexButton + resetAutoIncrementLine + resetAutoIncrementSheet + resetAutoIncrementValue + structureGrabber + tableDataInstance + tableDocumentInstance + tableInfoInstance + tableSourceView + tablesListInstance + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + IBUserSource + + + SPTableTextFieldCell ImageAndTextCell @@ -29184,110 +29280,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - - TableSource - NSObject - - YES - - YES - addField: - chooseIndexType: - closeKeySheet: - closeSheet: - copyField: - openIndexSheet: - reloadTable: - removeField: - removeIndex: - resetAutoIncrement: - - - YES - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - addFieldButton - addIndexButton - chooseKeyButton - copyFieldButton - editTableButton - extendedTableInfoInstance - indexNameField - indexSheet - indexTypeField - indexView - indexedColumnsField - keySheet - reloadFieldsButton - reloadIndexesButton - removeFieldButton - removeIndexButton - resetAutoIncrementLine - resetAutoIncrementSheet - resetAutoIncrementValue - structureGrabber - tableDataInstance - tableDocumentInstance - tableInfoInstance - tableSourceView - tablesListInstance - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - IBProjectSource - Source/TableSource.h - - - - TableSource - NSObject - - IBUserSource - - - YES diff --git a/Source/SPExtendedTableInfo.m b/Source/SPExtendedTableInfo.m index 3770ecd6..56f7a76c 100644 --- a/Source/SPExtendedTableInfo.m +++ b/Source/SPExtendedTableInfo.m @@ -32,7 +32,7 @@ #import "TableDocument.h" #import "SPTablesList.h" #import "SPAlertSheets.h" -#import "TableSource.h" +#import "SPTableStructure.h" @interface SPExtendedTableInfo (PrivateAPI) diff --git a/Source/SPPrintController.m b/Source/SPPrintController.m index b8f323c4..020e3ca0 100644 --- a/Source/SPPrintController.m +++ b/Source/SPPrintController.m @@ -25,7 +25,7 @@ #import "SPPrintController.h" #import "TableContent.h" -#import "TableSource.h" +#import "SPTableStructure.h" #import "CustomQuery.h" #import "SPConstants.h" #import "SPTableRelations.h" diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h new file mode 100644 index 00000000..f43a5257 --- /dev/null +++ b/Source/SPTableStructure.h @@ -0,0 +1,109 @@ +// +// $Id$ +// +// SPTableStructure.h +// sequel-pro +// +// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. +// Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. +// +// 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 + +#import +#import + +@interface SPTableStructure : NSObject +{ + IBOutlet id tablesListInstance; + IBOutlet id tableDataInstance; + IBOutlet id tableDocumentInstance; + IBOutlet id tableInfoInstance; + IBOutlet id extendedTableInfoInstance; + + IBOutlet id indexSheet; + IBOutlet id keySheet; + IBOutlet id resetAutoIncrementSheet; + IBOutlet id resetAutoIncrementValue; + IBOutlet id resetAutoIncrementLine; + IBOutlet id tableSourceView; + IBOutlet id indexView; + IBOutlet id addFieldButton; + IBOutlet id copyFieldButton; + IBOutlet id removeFieldButton; + IBOutlet id reloadFieldsButton; + IBOutlet id addIndexButton; + IBOutlet id removeIndexButton; + IBOutlet id reloadIndexesButton; + IBOutlet id indexTypeField; + IBOutlet id indexNameField; + IBOutlet id indexedColumnsField; + IBOutlet id chooseKeyButton; + IBOutlet id structureGrabber; + IBOutlet id editTableButton; + + MCPConnection *mySQLConnection; + MCPResult *tableSourceResult; + MCPResult *indexResult; + + NSString *selectedTable; + NSMutableArray *tableFields, *indexes; + NSMutableDictionary *oldRow, *enumFields; + NSDictionary *defaultValues; + BOOL isEditingRow, isEditingNewRow, isSavingRow, alertSheetOpened; + NSInteger currentlyEditingRow; + NSUserDefaults *prefs; +} + +// Table methods +- (void)loadTable:(NSString *)aTable; +- (IBAction)reloadTable:(id)sender; +- (void) setTableDetails:(NSDictionary *)tableDetails; + +// Edit methods +- (IBAction)addField:(id)sender; +- (IBAction)copyField:(id)sender; +- (IBAction)removeField:(id)sender; +- (IBAction)removeIndex:(id)sender; +- (IBAction)resetAutoIncrement:(id)sender; + +// Index sheet methods +- (IBAction)openIndexSheet:(id)sender; +- (IBAction)closeSheet:(id)sender; +- (IBAction)chooseIndexType:(id)sender; +- (void)closeAlertSheet; + +// Key sheet methods +- (IBAction)closeKeySheet:(id)sender; + +// Additional methods +- (void)setConnection:(MCPConnection *)theConnection; +- (NSArray *)fetchResultAsArray:(MCPResult *)theResult; +- (BOOL)saveRowOnDeselect; +- (BOOL)addRowToDB; +- (void)setAutoIncrementTo:(NSString*)valueAsString; + +// Getter methods +- (NSString *)defaultValueForField:(NSString *)field; +- (NSArray *)fieldNames; +- (NSDictionary *)enumFields; +- (NSDictionary *)tableSourceForPrinting; + +// Task interaction +- (void)startDocumentTaskForTab:(NSNotification *)aNotification; +- (void)endDocumentTaskForTab:(NSNotification *)aNotification; + +@end diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m new file mode 100644 index 00000000..2bef1a12 --- /dev/null +++ b/Source/SPTableStructure.m @@ -0,0 +1,1921 @@ +// +// $Id$ +// +// SPTableStructure.m +// sequel-pro +// +// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. +// Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. +// +// 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 + +#import "SPTableStructure.h" +#import "TableDocument.h" +#import "SPTableInfo.h" +#import "SPTablesList.h" +#import "SPTableData.h" +#import "SPSQLParser.h" +#import "SPStringAdditions.h" +#import "SPArrayAdditions.h" +#import "SPConstants.h" +#import "SPAlertSheets.h" +#import "SPMainThreadTrampoline.h" + +@interface SPTableStructure (PrivateAPI) + +- (void)_addIndex; +- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey; +- (void)_removeIndexAndForeignKey:(NSNumber *)removeForeignKey; + +@end + +@implementation SPTableStructure + +/** + * Loads aTable, put it in an array, update the tableViewColumns and reload the tableView + */ +- (void)loadTable:(NSString *)aTable +{ + NSArray *theTableFields, *theTableIndexes; + NSMutableDictionary *theTableEnumLists = [NSMutableDictionary dictionary]; + NSArray *extrasArray; + NSMutableDictionary *tempDefaultValues; + NSInteger i; + SPSQLParser *fieldParser; + + // Check whether a save of the current row is required. + if ( ![[self onMainThread] saveRowOnDeselect] ) return; + + // If no table is selected, reset the interface and return + if (!aTable || ![aTable length]) { + [[self onMainThread] setTableDetails:nil]; + return; + } + + // Send the query started/working notification + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; + + // Retrieve the column information for this table. + // TODO: update this and indexes to use TableData at some point - tiny bit more parsing required... + tableSourceResult = [[mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@", [aTable backtickQuotedString]]] retain]; + + // If an error occurred, reset the interface and abort + if ([mySQLConnection queryErrored]) { + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; + [[self onMainThread] setTableDetails:nil]; + + if ([mySQLConnection isConnected]) { + SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), + nil, nil, [NSApp mainWindow], self, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving information.\nMySQL said: %@", @"message of panel when retrieving information failed"), + [mySQLConnection getLastErrorMessage]]); + } + if (tableSourceResult) [tableSourceResult release]; + return; + } + + // Process the field names into a local array of dictionaries + theTableFields = [self fetchResultAsArray:tableSourceResult]; + [tableSourceResult release]; + + // Retrieve the indexes for the table + indexResult = [[mySQLConnection queryString:[NSString stringWithFormat:@"SHOW INDEX FROM %@", [aTable backtickQuotedString]]] retain]; + + // If an error occurred, reset the interface and abort + if ([mySQLConnection queryErrored]) { + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; + [[self onMainThread] setTableDetails:nil]; + + if ([mySQLConnection isConnected]) { + SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), + nil, nil, [NSApp mainWindow], self, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving information.\nMySQL said: %@", @"message of panel when retrieving information failed"), + [mySQLConnection getLastErrorMessage]]); + } + if (indexResult) [indexResult release]; + return; + } + + // Process the indexes into a local array of dictionaries + theTableIndexes = [self fetchResultAsArray:indexResult]; + [indexResult release]; + + // Process all the fields to normalise keys and add additional information + for (id theField in theTableFields) { + NSString *type; + NSString *length; + NSString *extras; + + // Set up the field parser with the type definition + fieldParser = [[SPSQLParser alloc] initWithString:[theField objectForKey:@"Type"]]; + + // Pull out the field type; if no brackets are found, this returns nil - in which case simple values can be used. + type = [fieldParser trimAndReturnStringToCharacter:'(' trimmingInclusively:YES returningInclusively:NO]; + if (!type) { + type = [NSString stringWithString:fieldParser]; + length = @""; + extras = @""; + } else { + + // Pull out the length, which may include enum/set values + length = [fieldParser trimAndReturnStringToCharacter:')' trimmingInclusively:YES returningInclusively:NO]; + if (!length) length = @""; + + // Separate any remaining extras + extras = [NSString stringWithString:fieldParser]; + if (!extras) extras = @""; + } + + [fieldParser release]; + + // Get possible values if the field is an enum or a set + if ([type isEqualToString:@"enum"] || [type isEqualToString:@"set"]) { + SPSQLParser *valueParser = [[SPSQLParser alloc] initWithString:length]; + NSMutableArray *possibleValues = [[NSMutableArray alloc] initWithArray:[valueParser splitStringByCharacter:',']]; + for (i = 0; i < [possibleValues count]; i++) { + [valueParser setString:[possibleValues objectAtIndex:i]]; + [possibleValues replaceObjectAtIndex:i withObject:[valueParser unquotedString]]; + } + [theTableEnumLists setObject:[NSArray arrayWithArray:possibleValues] forKey:[theField objectForKey:@"Field"]]; + [possibleValues release]; + [valueParser release]; + } + + // For timestamps check to see whether "on update CURRENT_TIMESTAMP" - not returned + // by SHOW COLUMNS - should be set from the table data store + if ([type isEqualToString:@"timestamp"] + && [[[tableDataInstance columnWithName:[theField objectForKey:@"Field"]] objectForKey:@"onupdatetimestamp"] integerValue]) + { + [theField setObject:@"on update CURRENT_TIMESTAMP" forKey:@"Extra"]; + } + + // Scan extras for values like unsigned, zerofill, binary + extrasArray = [extras componentsSeparatedByString:@" "]; + for (id extra in extrasArray) { + if ([extra isEqualToString:@"unsigned"]) { + [theField setObject:@"1" forKey:@"unsigned"]; + } else if ([extra isEqualToString:@"zerofill"]) { + [theField setObject:@"1" forKey:@"zerofill"]; + } else if ([extra isEqualToString:@"binary"]) { + [theField setObject:@"1" forKey:@"binary"]; + } else { + if (![extra isEqualToString:@""]) + NSLog(@"ERROR: unknown option in field definition: %@", extra); + } + } + + [theField setObject:type forKey:@"Type"]; + [theField setObject:length forKey:@"Length"]; + } + + // Set up the table details for the new table, and request an data/interface update + NSDictionary *tableDetails = [NSDictionary dictionaryWithObjectsAndKeys: + aTable, @"name", + theTableFields, @"tableFields", + theTableIndexes, @"tableIndexes", + theTableEnumLists, @"enumLists", + nil]; + [[self onMainThread] setTableDetails:tableDetails]; + + // Send the query finished/work complete notification + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; + +} + +/** + * Reloads the table (performing a new mysql-query) + */ +- (IBAction)reloadTable:(id)sender +{ + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + + // Query the structure of all databases in the background (mainly for completion) + [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"forceUpdate", nil]]; + + [self loadTable:selectedTable]; +} + +/** + * Update stored table details and update the interface to match the supplied + * table details. + * Should be called on the main thread. + */ +- (void) setTableDetails:(NSDictionary *)tableDetails +{ + NSString *newTableName = [tableDetails objectForKey:@"name"]; + NSMutableDictionary *newDefaultValues; + BOOL enableInteraction = ![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure] || ![tableDocumentInstance isWorking]; + + // Update the selected table name + if (selectedTable) [selectedTable release], selectedTable = nil; + if (newTableName) selectedTable = [[NSString alloc] initWithString:newTableName]; + + // Reset the table store and display + [enumFields removeAllObjects]; + [tableSourceView deselectAll:self]; + [indexView deselectAll:self]; + [tableFields removeAllObjects]; + [indexes removeAllObjects]; + [addFieldButton setEnabled:NO]; + [copyFieldButton setEnabled:NO]; + [removeFieldButton setEnabled:NO]; + [addIndexButton setEnabled:NO]; + [removeIndexButton setEnabled:NO]; + [editTableButton setEnabled:NO]; + + // If no table is selected, refresh the table display to blank and return + if (!selectedTable) { + [tableSourceView reloadData]; + [indexView reloadData]; + return; + } + + // Update the fields and indexes stores + [tableFields setArray:[tableDetails objectForKey:@"tableFields"]]; + [indexes setArray:[tableDetails objectForKey:@"tableIndexes"]]; + + // Update the default values array and the indexed column fields control + [indexedColumnsField removeAllItems]; + if (defaultValues) [defaultValues release], defaultValues = nil; + newDefaultValues = [NSMutableDictionary dictionaryWithCapacity:[tableFields count]]; + for (id theField in tableFields) { + [newDefaultValues setObject:[theField objectForKey:@"Default"] forKey:[theField objectForKey:@"Field"]]; + [indexedColumnsField addItemWithObjectValue:[theField objectForKey:@"Field"]]; + } + defaultValues = [[NSDictionary dictionaryWithDictionary:newDefaultValues] retain]; + + // Only show up to ten items in the indexed column fields control + if ([tableFields count] < 10) { + [indexedColumnsField setNumberOfVisibleItems:[tableFields count]]; + } else { + [indexedColumnsField setNumberOfVisibleItems:10]; + } + + // Enable the edit table button + [editTableButton setEnabled:enableInteraction]; + + // If a view is selected, disable the buttons; otherwise enable. + BOOL editingEnabled = ([tablesListInstance tableType] == SPTableTypeTable) && enableInteraction; + [addFieldButton setEnabled:editingEnabled]; + [addIndexButton setEnabled:editingEnabled]; + + // Reload the views + [indexView reloadData]; + [tableSourceView reloadData]; +} + +#pragma mark - +#pragma mark Edit methods + +/** + * Adds an empty row to the tableSource-array and goes into edit mode + */ +- (IBAction)addField:(id)sender +{ + // Check whether a save of the current row is required. + if ( ![self saveRowOnDeselect] ) return; + + NSInteger insertIndex = ([tableSourceView numberOfSelectedRows] == 0 ? [tableSourceView numberOfRows] : [tableSourceView selectedRow] + 1); + + [tableFields insertObject:[NSMutableDictionary + dictionaryWithObjects:[NSArray arrayWithObjects:@"", @"int", @"", @"0", @"0", @"0", ([prefs boolForKey:SPNewFieldsAllowNulls]) ? @"1" : @"0", @"", [prefs stringForKey:SPNullValue], @"None", nil] + forKeys:[NSArray arrayWithObjects:@"Field", @"Type", @"Length", @"unsigned", @"zerofill", @"binary", @"Null", @"Key", @"Default", @"Extra", nil]] + atIndex:insertIndex]; + + [tableSourceView reloadData]; + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:insertIndex] byExtendingSelection:NO]; + isEditingRow = YES; + isEditingNewRow = YES; + currentlyEditingRow = [tableSourceView selectedRow]; + [tableSourceView editColumn:0 row:insertIndex withEvent:nil select:YES]; +} + +/** + * Copies a field and goes in edit mode for the new field + */ +- (IBAction)copyField:(id)sender +{ + NSMutableDictionary *tempRow; + NSUInteger rowToCopy; + + // Store the row to duplicate, as saveRowOnDeselect and subsequent reloads may trigger a deselection + if ([tableSourceView numberOfSelectedRows]) { + rowToCopy = [tableSourceView selectedRow]; + } else { + rowToCopy = [tableSourceView numberOfRows]-1; + } + + // Check whether a save of the current row is required. + if ( ![self saveRowOnDeselect] ) return; + + //add copy of selected row and go in edit mode + tempRow = [NSMutableDictionary dictionaryWithDictionary:[tableFields objectAtIndex:rowToCopy]]; + [tempRow setObject:[[tempRow objectForKey:@"Field"] stringByAppendingString:@"Copy"] forKey:@"Field"]; + [tempRow setObject:@"" forKey:@"Key"]; + [tempRow setObject:@"None" forKey:@"Extra"]; + [tableFields addObject:tempRow]; + [tableSourceView reloadData]; + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:[tableSourceView numberOfRows]-1] byExtendingSelection:NO]; + isEditingRow = YES; + isEditingNewRow = YES; + currentlyEditingRow = [tableSourceView selectedRow]; + [tableSourceView editColumn:0 row:[tableSourceView numberOfRows]-1 withEvent:nil select:YES]; +} + +/** + * Ask the user to confirm that they really want to remove the selected field. + */ +- (IBAction)removeField:(id)sender +{ + if (![tableSourceView numberOfSelectedRows]) return; + + // Check whether a save of the current row is required. + if (![self saveRowOnDeselect]) return; + + NSInteger index = [tableSourceView selectedRow]; + + if ((index == -1) || (index > ([tableFields count] - 1))) return; + + // Check if the user tries to delete the last defined field in table + // Note that because of better menu item validation, this check will now never evaluate to true. + if ([tableSourceView numberOfRows] < 2) { + NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while deleting field", @"Error while deleting field") + defaultButton:NSLocalizedString(@"OK", @"OK button") + alternateButton:nil + otherButton:nil + informativeTextWithFormat:NSLocalizedString(@"You cannot delete the last field in a table. Delete the table instead.", @"You cannot delete the last field in a table. Delete the table instead.")]; + + [alert setAlertStyle:NSCriticalAlertStyle]; + + [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"cannotremovefield"]; + + } + + NSString *field = [[tableFields objectAtIndex:index] objectForKey:@"Field"]; + + BOOL hasForeignKey = NO; + NSString *referencedTable = @""; + + // Check to see whether the user is attempting to remove a field that has foreign key constraints and thus + // would result in an error if not dropped before removing the field. + for (NSDictionary *constraint in [tableDataInstance getConstraints]) + { + for (NSString *column in [constraint objectForKey:@"columns"]) + { + if ([column isEqualToString:field]) { + hasForeignKey = YES; + referencedTable = [constraint objectForKey:@"ref_table"]; + break; + } + } + } + + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete field '%@'?", @"delete field message"), field] + defaultButton:NSLocalizedString(@"Delete", @"delete button") + alternateButton:NSLocalizedString(@"Cancel", @"cancel button") + otherButton:nil + informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to delete the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field]]; + + [alert setAlertStyle:NSCriticalAlertStyle]; + + NSArray *buttons = [alert buttons]; + + // Change the alert's cancel button to have the key equivalent of return + [[buttons objectAtIndex:0] setKeyEquivalent:@"d"]; + [[buttons objectAtIndex:0] setKeyEquivalentModifierMask:NSCommandKeyMask]; + [[buttons objectAtIndex:1] setKeyEquivalent:@"\r"]; + + [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(removeFieldSheetDidEnd:returnCode:contextInfo:) contextInfo:(hasForeignKey) ? @"removeFieldAndForeignKey" : @"removeField"]; +} + +/** + * Process the remove field sheet closing, performing the delete if the user + * confirmed the action. + */ +- (void)removeFieldSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + // Order out current sheet to suppress overlapping of sheets + [[alert window] orderOut:nil]; + + if (returnCode == NSAlertDefaultReturn) { + [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Removing field...", @"removing field task status message")]; + + NSNumber *removeKey = [NSNumber numberWithBool:[contextInfo hasSuffix:@"AndForeignKey"]]; + + if ([NSThread isMainThread]) { + [NSThread detachNewThreadSelector:@selector(_removeFieldAndForeignKey:) toTarget:self withObject:removeKey]; + + [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; + } + else { + [self _removeFieldAndForeignKey:removeKey]; + } + } +} + +/** + * Ask the user to confirm that they really want to remove the selected index. + */ +- (IBAction)removeIndex:(id)sender +{ + if (![indexView numberOfSelectedRows]) return; + + // Check whether a save of the current fields row is required. + if (![self saveRowOnDeselect]) return; + + NSInteger index = [indexView selectedRow]; + + if ((index == -1) || (index > ([indexes count] - 1))) return; + + NSString *keyName = [[indexes objectAtIndex:index] objectForKey:@"Key_name"]; + NSString *columnName = [[indexes objectAtIndex:index] objectForKey:@"Column_name"]; + + BOOL hasForeignKey = NO; + NSString *constraintName = @""; + + // Check to see whether the user is attempting to remove an index that a foreign key constraint depends on + // thus would result in an error if not dropped before removing the index. + for (NSDictionary *constraint in [tableDataInstance getConstraints]) + { + for (NSString *column in [constraint objectForKey:@"columns"]) + { + if ([column isEqualToString:columnName]) { + hasForeignKey = YES; + constraintName = [constraint objectForKey:@"name"]; + break; + } + } + } + + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete index '%@'?", @"delete index message"), keyName] + defaultButton:NSLocalizedString(@"Delete", @"delete button") + alternateButton:NSLocalizedString(@"Cancel", @"cancel button") + otherButton:nil + informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]]; + + [alert setAlertStyle:NSCriticalAlertStyle]; + + NSArray *buttons = [alert buttons]; + + // Change the alert's cancel button to have the key equivalent of return + [[buttons objectAtIndex:0] setKeyEquivalent:@"d"]; + [[buttons objectAtIndex:0] setKeyEquivalentModifierMask:NSCommandKeyMask]; + [[buttons objectAtIndex:1] setKeyEquivalent:@"\r"]; + + [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(removeIndexSheetDidEnd:returnCode:contextInfo:) contextInfo:(hasForeignKey) ? @"removeIndexAndForeignKey" : @"removeIndex"]; +} + +/** + * Process the remove index sheet closing, performing the delete if the user + * confirmed the action. + */ +- (void)removeIndexSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + // Order out current sheet to suppress overlapping of sheets + [[alert window] orderOut:nil]; + + if (returnCode == NSAlertDefaultReturn) { + [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Removing index...", @"removing index task status message")]; + + NSNumber *removeKey = [NSNumber numberWithBool:[contextInfo hasSuffix:@"AndForeignKey"]]; + + if ([NSThread isMainThread]) { + [NSThread detachNewThreadSelector:@selector(_removeIndexAndForeignKey:) toTarget:self withObject:removeKey]; + + [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; + } + else { + [self _removeIndexAndForeignKey:removeKey]; + } + } +} + +- (IBAction)resetAutoIncrement:(id)sender +{ + + if([sender tag] == 1) { + + [resetAutoIncrementLine setHidden:YES]; + if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 0) + [resetAutoIncrementLine setHidden:NO]; + + // Begin the sheet + [NSApp beginSheet:resetAutoIncrementSheet + modalForWindow:[tableDocumentInstance parentWindow] + modalDelegate:self + didEndSelector:@selector(resetAutoincrementSheetDidEnd:returnCode:contextInfo:) + contextInfo:@"resetAutoIncrement"]; + + [resetAutoIncrementValue setStringValue:@"1"]; + } + else if([sender tag] == 2) { + [self setAutoIncrementTo:@"1"]; + } + +} + +/** + * Process the autoincrement sheet closing, resetting if the user + * confirmed the action. + */ +- (void)resetAutoincrementSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + // Order out current sheet to suppress overlapping of sheets + [theSheet orderOut:nil]; + + if (returnCode == NSAlertDefaultReturn) { + [self setAutoIncrementTo:[[resetAutoIncrementValue stringValue] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]]; + } +} + +#pragma mark - +#pragma mark Index sheet methods + +/** + * Opens the add new index sheet. + */ +- (IBAction)openIndexSheet:(id)sender +{ + NSInteger i; + + // Check whether a save of the current field row is required. + if (![self saveRowOnDeselect]) return; + + // Set sheet defaults - key type PRIMARY, key name PRIMARY and disabled, and blank indexed columns + [indexTypeField selectItemAtIndex:0]; + [indexNameField setEnabled:NO]; + [indexNameField setStringValue:@"PRIMARY"]; + [indexedColumnsField setStringValue:@""]; + [indexSheet makeFirstResponder:indexedColumnsField]; + + // Check to see whether a primary key already exists for the table, and if so select an INDEX instead + for (i = 0; i < [tableFields count]; i++) + { + if ([[[tableFields objectAtIndex:i] objectForKey:@"Key"] isEqualToString:@"PRI"]) { + [indexTypeField selectItemAtIndex:1]; + [indexNameField setEnabled:YES]; + [indexNameField setStringValue:@""]; + [indexSheet makeFirstResponder:indexNameField]; + break; + } + } + + // Begin the sheet + [NSApp beginSheet:indexSheet + modalForWindow:[tableDocumentInstance parentWindow] + modalDelegate:self + didEndSelector:@selector(addIndexSheetDidEnd:returnCode:contextInfo:) + contextInfo:@"addIndex"]; +} + +/** + * Process the new index sheet closing, adding the index if appropriate + */ +- (void)addIndexSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + [theSheet orderOut:nil]; + + if (returnCode == NSOKButton) { + [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Adding index...", @"adding index task status message")]; + + if ([NSThread isMainThread]) { + [NSThread detachNewThreadSelector:@selector(_addIndex) toTarget:self withObject:nil]; + + [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; + } + else { + [self _addIndex]; + } + } +} + +/** + * Closes the current sheet and stops the modal session + */ +- (IBAction)closeSheet:(id)sender +{ + [NSApp endSheet:[sender window] returnCode:[sender tag]]; + [[sender window] orderOut:self]; +} + +/* +invoked when user chooses an index type +*/ +- (IBAction)chooseIndexType:(id)sender +{ + if ( [[indexTypeField titleOfSelectedItem] isEqualToString:@"PRIMARY KEY"] ) { + [indexNameField setEnabled:NO]; + [indexNameField setStringValue:@"PRIMARY"]; + } else { + [indexNameField setEnabled:YES]; + if ( [[indexNameField stringValue] isEqualToString:@"PRIMARY"] ) + [indexNameField setStringValue:@""]; + } +} + +/* +reopens indexSheet after errorSheet (no columns specified) +*/ +- (void)closeAlertSheet +{ + [self openIndexSheet:self]; +} + +/* +closes the keySheet +*/ +- (IBAction)closeKeySheet:(id)sender +{ + [NSApp stopModalWithCode:[sender tag]]; +} + + +#pragma mark - +#pragma mark Additional methods + +/** + * Sets the connection (received from TableDocument) and makes things that have to be done only once + */ +- (void)setConnection:(MCPConnection *)theConnection +{ + mySQLConnection = theConnection; + + // Set up tableView + [tableSourceView registerForDraggedTypes:[NSArray arrayWithObjects:@"SequelProPasteboard", nil]]; +} + +- (void)setAutoIncrementTo:(NSString*)valueAsString +{ + + NSString *selTable = nil; + + // if selectedTable is nil try to get the name from SPTablesList + if(selectedTable == nil || ![selectedTable length]) + selTable = [tablesListInstance tableName]; + else + selTable = [NSString stringWithString:selectedTable]; + + if(selTable == nil || ![selTable length]) + return; + + if(valueAsString == nil || ![valueAsString length]) { + // reload data and bail + [tableDataInstance resetAllData]; + [extendedTableInfoInstance loadTable:selTable]; + [tableInfoInstance tableChanged:nil]; + return; + } + + NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; + [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; + NSNumber *autoIncValue = [formatter numberFromString:valueAsString]; + [formatter release]; + + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ AUTO_INCREMENT = %@", [selTable backtickQuotedString], [autoIncValue stringValue]]]; + + if ([mySQLConnection queryErrored]) { + SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), + NSLocalizedString(@"OK", @"OK button"), + nil, nil, [NSApp mainWindow], nil, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to reset AUTO_INCREMENT of table '%@'.\n\nMySQL said: %@", @"error resetting auto_increment informative message"), + selTable, [mySQLConnection getLastErrorMessage]]); + } + + // reload data + [tableDataInstance resetStatusData]; + if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 3) { + [tableDataInstance resetAllData]; + [extendedTableInfoInstance loadTable:selTable]; + } + + [tableInfoInstance tableChanged:nil]; + +} + +/** + * Converts the supplied result to an array containing a (mutable) dictionary for each row + */ +- (NSArray *)fetchResultAsArray:(MCPResult *)theResult +{ + NSUInteger numOfRows = [theResult numOfRows]; + NSMutableArray *tempResult = [NSMutableArray arrayWithCapacity:numOfRows]; + NSMutableDictionary *tempRow; + NSArray *keys; + NSInteger i; + id prefsNullValue = [prefs objectForKey:SPNullValue]; + + // Ensure table information is returned as strings to avoid problems with some server versions + [theResult setReturnDataAsStrings:YES]; + + if (numOfRows) [theResult dataSeek:0]; + for ( i = 0 ; i < numOfRows ; i++ ) { + tempRow = [NSMutableDictionary dictionaryWithDictionary:[theResult fetchRowAsDictionary]]; + + // Replace NSNull instances with the NULL string from preferences + keys = [tempRow allKeys]; + for (id theKey in keys) { + if ([[tempRow objectForKey:theKey] isNSNull]) + [tempRow setObject:prefsNullValue forKey:theKey]; + } + + // Update some fields to be more human-readable or GUI compatible + if ([[tempRow objectForKey:@"Extra"] isEqualToString:@""]) { + [tempRow setObject:@"None" forKey:@"Extra"]; + } + if ([[tempRow objectForKey:@"Null"] isEqualToString:@"YES"]) { + [tempRow setObject:@"1" forKey:@"Null"]; + } else { + [tempRow setObject:@"0" forKey:@"Null"]; + } + [tempResult addObject:tempRow]; + } + + return tempResult; +} + + +/* + * A method to be called whenever the selection changes or the table would be reloaded + * or altered; checks whether the current row is being edited, and if so attempts to save + * it. Returns YES if no save was necessary or the save was successful, and NO if a save + * was necessary but failed - also reselecting the row for re-editing. + */ +- (BOOL)saveRowOnDeselect +{ + // If no rows are currently being edited, or a save is already in progress, return success at once. + if (!isEditingRow || isSavingRow) return YES; + isSavingRow = YES; + + // Save any edits which have been made but not saved to the table yet. + [[tableDocumentInstance parentWindow] endEditingFor:nil]; + + // Attempt to save the row, and return YES if the save succeeded. + if ([self addRowToDB]) { + isSavingRow = NO; + return YES; + } + + // Saving failed - return failure. + isSavingRow = NO; + return NO; +} + +/** + * tries to write row to mysql-db + * returns YES if row written to db, otherwies NO + * returns YES if no row is beeing edited and nothing has to be written to db + */ +- (BOOL)addRowToDB; +{ + NSInteger code; + NSDictionary *theRow; + NSMutableString *queryString; + + if (!isEditingRow || currentlyEditingRow == -1) + return YES; + + if (alertSheetOpened) + return NO; + + theRow = [tableFields objectAtIndex:currentlyEditingRow]; + + if (isEditingNewRow) { + // ADD syntax + if ([[theRow objectForKey:@"Length"] isEqualToString:@""] || ![theRow objectForKey:@"Length"]) { + + queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@", + [selectedTable backtickQuotedString], + [[theRow objectForKey:@"Field"] backtickQuotedString], + [theRow objectForKey:@"Type"]]; + } + else { + queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@(%@)", + [selectedTable backtickQuotedString], + [[theRow objectForKey:@"Field"] backtickQuotedString], + [theRow objectForKey:@"Type"], + [theRow objectForKey:@"Length"]]; + } + } + else { + // CHANGE syntax + if (([[theRow objectForKey:@"Length"] isEqualToString:@""]) || + (![theRow objectForKey:@"Length"]) || + ([[theRow objectForKey:@"Type"] isEqualToString:@"datetime"])) + { + // If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue + if ([oldRow isEqualToDictionary:theRow]) return YES; + + queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ CHANGE %@ %@ %@", + [selectedTable backtickQuotedString], + [[oldRow objectForKey:@"Field"] backtickQuotedString], + [[theRow objectForKey:@"Field"] backtickQuotedString], + [theRow objectForKey:@"Type"]]; + } + else { + // If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue + if ([oldRow isEqualToDictionary:theRow]) return YES; + + queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ CHANGE %@ %@ %@(%@)", + [selectedTable backtickQuotedString], + [[oldRow objectForKey:@"Field"] backtickQuotedString], + [[theRow objectForKey:@"Field"] backtickQuotedString], + [theRow objectForKey:@"Type"], + [theRow objectForKey:@"Length"]]; + } + } + + // Field specification + if ([[theRow objectForKey:@"unsigned"] integerValue] == 1) { + [queryString appendString:@" UNSIGNED"]; + } + + if ( [[theRow objectForKey:@"zerofill"] integerValue] == 1) { + [queryString appendString:@" ZEROFILL"]; + } + + if ( [[theRow objectForKey:@"binary"] integerValue] == 1) { + [queryString appendString:@" BINARY"]; + } + + if ([[theRow objectForKey:@"Null"] integerValue] == 0) { + [queryString appendString:@" NOT NULL"]; + } else { + [queryString appendString:@" NULL"]; + } + + // Don't provide any defaults for auto-increment fields + if ([[theRow objectForKey:@"Extra"] isEqualToString:@"auto_increment"]) { + [queryString appendString:@" "]; + } + else { + // If a NULL value has been specified, and NULL is allowed, specify DEFAULT NULL + if ([[theRow objectForKey:@"Default"] isEqualToString:[prefs objectForKey:SPNullValue]]) { + if ([[theRow objectForKey:@"Null"] integerValue] == 1) { + [queryString appendString:@" DEFAULT NULL "]; + } + } + // Otherwise, if CURRENT_TIMESTAMP was specified for timestamps, use that + else if ([[theRow objectForKey:@"Type"] isEqualToString:@"timestamp"] && + [[[theRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"]) + { + [queryString appendString:@" DEFAULT CURRENT_TIMESTAMP "]; + + } + // If the field is of type BIT, permit the use of single qoutes and also don't quote the default value. + // For example, use DEFAULT b'1' as opposed to DEFAULT 'b\'1\'' which results in an error. + else if ([[theRow objectForKey:@"Type"] isEqualToString:@"bit"]) { + [queryString appendString:[NSString stringWithFormat:@" DEFAULT %@ ", [theRow objectForKey:@"Default"]]]; + } + // Otherwise, use the provided default + else { + [queryString appendString:[NSString stringWithFormat:@" DEFAULT '%@' ", [mySQLConnection prepareString:[theRow objectForKey:@"Default"]]]]; + } + } + + if (!( + [[theRow objectForKey:@"Extra"] isEqualToString:@""] || + [[theRow objectForKey:@"Extra"] isEqualToString:@"None"] + ) && + [theRow objectForKey:@"Extra"] ) + { + [queryString appendString:@" "]; + [queryString appendString:[theRow objectForKey:@"Extra"]]; + } + + if (!isEditingNewRow) { + + // Add details not provided via the SHOW COLUMNS query from the table data cache so column details aren't lost + NSDictionary *originalColumnDetails = [[tableDataInstance columns] objectAtIndex:currentlyEditingRow]; + + // Any column comments + if ([originalColumnDetails objectForKey:@"comment"] && [(NSString *)[originalColumnDetails objectForKey:@"comment"] length]) { + [queryString appendString:[NSString stringWithFormat:@" COMMENT '%@'", [mySQLConnection prepareString:[originalColumnDetails objectForKey:@"comment"]]]]; + } + + // Unparsed details - column formats, storage, reference definitions + if ([originalColumnDetails objectForKey:@"unparsed"]) { + [queryString appendString:[originalColumnDetails objectForKey:@"unparsed"]]; + } + } + + // Asks the user to add an index to query if auto_increment is set and field isn't indexed + if ([[theRow objectForKey:@"Extra"] isEqualToString:@"auto_increment"] && + ([[theRow objectForKey:@"Key"] isEqualToString:@""] || + ![theRow objectForKey:@"Key"])) + { + [chooseKeyButton selectItemAtIndex:0]; + + [NSApp beginSheet:keySheet + modalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self + didEndSelector:nil + contextInfo:nil]; + + code = [NSApp runModalForWindow:keySheet]; + + [NSApp endSheet:keySheet]; + [keySheet orderOut:nil]; + + if (code) { + // User wants to add PRIMARY KEY + if ([chooseKeyButton indexOfSelectedItem] == 0 ) { + [queryString appendString:@" PRIMARY KEY"]; + + // Add AFTER ... only if the user added a new field + if (isEditingNewRow) { + [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; + } + } + else { + // Add AFTER ... only if the user added a new field + if (isEditingNewRow) { + [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; + } + + [queryString appendString:[NSString stringWithFormat:@", ADD %@ (%@)", [chooseKeyButton titleOfSelectedItem], [[theRow objectForKey:@"Field"] backtickQuotedString]]]; + } + } + } + // Add AFTER ... only if the user added a new field + else if (isEditingNewRow) { + [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; + } + + // Execute query + [mySQLConnection queryString:queryString]; + + if (![mySQLConnection queryErrored]) { + isEditingRow = NO; + isEditingNewRow = NO; + currentlyEditingRow = -1; + + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + [self loadTable:selectedTable]; + + // Mark the content table for refresh + [tablesListInstance setContentRequiresReload:YES]; + + // Query the structure of all databases in the background + [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"forceUpdate", selectedTable, @"affectedItem", [NSNumber numberWithInt:[tablesListInstance tableType]], @"affectedItemType", nil]]; + + return YES; + } + else { + alertSheetOpened = YES; + if([mySQLConnection getLastErrorID] == 1146) { // If the current table doesn't exist anymore + SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), + NSLocalizedString(@"OK", @"OK button"), + nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to alter table '%@'.\n\nMySQL said: %@", @"error while trying to alter table message"), + selectedTable, [mySQLConnection getLastErrorMessage]]); + + isEditingRow = NO; + isEditingNewRow = NO; + currentlyEditingRow = -1; + [tableFields removeAllObjects]; + [indexes removeAllObjects]; + [tableSourceView reloadData]; + [indexView reloadData]; + [addFieldButton setEnabled:NO]; + [copyFieldButton setEnabled:NO]; + [removeFieldButton setEnabled:NO]; + [addIndexButton setEnabled:NO]; + [removeIndexButton setEnabled:NO]; + [editTableButton setEnabled:NO]; + [tablesListInstance updateTables:self]; + return NO; + } + // Problem: alert sheet doesn't respond to first click + if (isEditingNewRow) { + SPBeginAlertSheet(NSLocalizedString(@"Error adding field", @"error adding field message"), + NSLocalizedString(@"Edit row", @"Edit row button"), + NSLocalizedString(@"Discard changes", @"discard changes button"), nil, [tableDocumentInstance parentWindow], self, @selector(addRowErrorSheetDidEnd:returnCode:contextInfo:), nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred when trying to add the field '%@'.\n\nMySQL said: %@", @"error adding field informative message"), + [theRow objectForKey:@"Field"], [mySQLConnection getLastErrorMessage]]); + } + else { + SPBeginAlertSheet(NSLocalizedString(@"Error changing field", @"error changing field message"), + NSLocalizedString(@"Edit row", @"Edit row button"), + NSLocalizedString(@"Discard changes", @"discard changes button"), nil, [tableDocumentInstance parentWindow], self, @selector(addRowErrorSheetDidEnd:returnCode:contextInfo:), nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occurred when trying to change the field '%@'.\n\nMySQL said: %@", @"error changing field informative message"), + [theRow objectForKey:@"Field"], [mySQLConnection getLastErrorMessage]]); + } + + return NO; + } +} + +/** + * Perform the action requested in the Add Row error sheet. + */ +- (void)addRowErrorSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo +{ + + // Order out current sheet to suppress overlapping of sheets + [[alert window] orderOut:nil]; + + alertSheetOpened = NO; + + // Remain in edit mode - reselect the row and resume editing + if (returnCode == NSAlertDefaultReturn) { + + // Problem: reentering edit mode for first cell doesn't function + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:currentlyEditingRow] byExtendingSelection:NO]; + [tableSourceView performSelector:@selector(keyDown:) withObject:[NSEvent keyEventWithType:NSKeyDown location:NSMakePoint(0,0) modifierFlags:0 timestamp:0 windowNumber:[[tableDocumentInstance parentWindow] windowNumber] context:[NSGraphicsContext currentContext] characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:0x24] afterDelay:0.0]; + } + + // Discard changes and cancel editing + else { + if (!isEditingNewRow) { + [tableFields replaceObjectAtIndex:currentlyEditingRow + withObject:[NSMutableDictionary dictionaryWithDictionary:oldRow]]; + isEditingRow = NO; + } + else { + [tableFields removeObjectAtIndex:currentlyEditingRow]; + isEditingRow = NO; + isEditingNewRow = NO; + } + + currentlyEditingRow = -1; + } + + [tableSourceView reloadData]; +} + +/** + * A method to show an error sheet after a short delay, so that it can + * be called from within an endSheet selector. This should be called on + * the main thread. + */ +-(void)showErrorSheetWith:(NSDictionary *)errorDictionary +{ + + // If this method has been called directly, invoke a delay. Invoking the delay + // on the main thread ensures the timer fires on the main thread. + if (![errorDictionary objectForKey:@"delayed"]) { + NSMutableDictionary *delayedErrorDictionary = [NSMutableDictionary dictionaryWithDictionary:errorDictionary]; + [delayedErrorDictionary setObject:[NSNumber numberWithBool:YES] forKey:@"delayed"]; + [self performSelector:@selector(showErrorSheetWith:) withObject:delayedErrorDictionary afterDelay:0.3]; + return; + } + + // Display the error sheet + SPBeginAlertSheet([errorDictionary objectForKey:@"title"], NSLocalizedString(@"OK", @"OK button"), + nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, + [errorDictionary objectForKey:@"message"]); +} + +/** + * This method is called as part of Key Value Observing which is used to watch for preference changes which effect the interface. + */ +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + // Display table veiew vertical gridlines preference changed + if ([keyPath isEqualToString:SPDisplayTableViewVerticalGridlines]) { + [tableSourceView setGridStyleMask:([[change objectForKey:NSKeyValueChangeNewKey] boolValue]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; + [indexView setGridStyleMask:([[change objectForKey:NSKeyValueChangeNewKey] boolValue]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; + } + // Use monospaced fonts preference changed + else if ([keyPath isEqualToString:SPUseMonospacedFonts]) { + + BOOL useMonospacedFont = [[change objectForKey:NSKeyValueChangeNewKey] boolValue]; + + for (NSTableColumn *indexColumn in [indexView tableColumns]) + { + [[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } + + for (NSTableColumn *fieldColumn in [tableSourceView tableColumns]) + { + [[fieldColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } + + [tableSourceView reloadData]; + [indexView reloadData]; + } +} + +/** + * Menu validation + */ +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem +{ + // Remove field + if ([menuItem action] == @selector(removeField:)) { + return (([tableSourceView numberOfSelectedRows] == 1) && ([tableSourceView numberOfRows] > 1)); + } + + // Duplicate field + if ([menuItem action] == @selector(copyField:)) { + return ([tableSourceView numberOfSelectedRows] == 1); + } + + // Remove index + if ([menuItem action] == @selector(removeIndex:)) { + return ([indexView numberOfSelectedRows] == 1); + } + + // Reset AUTO_INCREMENT + if ([menuItem action] == @selector(resetAutoIncrement:)) { + return ([indexView numberOfSelectedRows] == 1 + && [[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] + && [[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]); + } + + return YES; +} + +#pragma mark - +#pragma mark Alert sheet methods + +/** + * Called whenever a sheet is dismissed. + */ +- (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo +{ + + // Order out current sheet to suppress overlapping of sheets + if ([sheet respondsToSelector:@selector(orderOut:)]) + [sheet orderOut:nil]; + else if ([sheet respondsToSelector:@selector(window)]) + [[sheet window] orderOut:nil]; + + alertSheetOpened = NO; +} + +#pragma mark - +#pragma mark Getter methods + +/* +get the default value for a specified field +*/ +- (NSString *)defaultValueForField:(NSString *)field +{ + if ( ![defaultValues objectForKey:field] ) { + return [prefs objectForKey:SPNullValue]; + } else if ( [[defaultValues objectForKey:field] isMemberOfClass:[NSNull class]] ) { + return [prefs objectForKey:SPNullValue]; + } else { + return [defaultValues objectForKey:field]; + } +} + +/* +returns an array containing the field names of the selected table +*/ +- (NSArray *)fieldNames +{ + NSMutableArray *tempArray = [NSMutableArray array]; + NSEnumerator *enumerator; + id field; + + //load table if not already done + if ( ![tablesListInstance structureLoaded] ) { + [self loadTable:[tablesListInstance tableName]]; + } + + //get field names + enumerator = [tableFields objectEnumerator]; + while ( (field = [enumerator nextObject]) ) { + [tempArray addObject:[field objectForKey:@"Field"]]; + } + + return [NSArray arrayWithArray:tempArray]; +} + +/* +returns a dictionary containing enum/set field names as key and possible values as array +*/ +- (NSDictionary *)enumFields +{ + return [NSDictionary dictionaryWithDictionary:enumFields]; +} + +/** + * Returns a dictionary describing the source of the table to be used for printing purposes. The object accessible + * via the key 'structure' is an array of the tables fields, where the first element is always the field names + * and each subsequent element is the field data. This is also true for the table's indexes, which are accessible + * via the key 'indexes'. + */ +- (NSDictionary *)tableSourceForPrinting +{ + NSInteger i, j; + NSMutableArray *tempResult = [NSMutableArray array]; + NSMutableArray *tempResult2 = [NSMutableArray array]; + + NSString *nullValue = [prefs stringForKey:SPNullValue]; + CFStringRef escapedNullValue = CFXMLCreateStringByEscapingEntities(NULL, ((CFStringRef)nullValue), NULL); + + MCPResult *structureQueryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@", [selectedTable backtickQuotedString]]]; + MCPResult *indexesQueryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW INDEXES FROM %@", [selectedTable backtickQuotedString]]]; + + [structureQueryResult setReturnDataAsStrings:YES]; + [indexesQueryResult setReturnDataAsStrings:YES]; + + if ([structureQueryResult numOfRows]) [structureQueryResult dataSeek:0]; + if ([indexesQueryResult numOfRows]) [indexesQueryResult dataSeek:0]; + + [tempResult addObject:[structureQueryResult fetchFieldNames]]; + + NSMutableArray *temp = [[indexesQueryResult fetchFieldNames] mutableCopy]; + + // Remove the 'table' column + [temp removeObjectAtIndex:0]; + + [tempResult2 addObject:temp]; + + [temp release]; + + for (i = 0; i < [structureQueryResult numOfRows]; i++) { + NSMutableArray *row = [[structureQueryResult fetchRowAsArray] mutableCopy]; + + // For every NULL value replace it with the user's NULL value placeholder so we can actually print it + for (j = 0; j < [row count]; j++) + { + if ([[row objectAtIndex:j] isNSNull]) { + [row replaceObjectAtIndex:j withObject:(NSString *)escapedNullValue]; + } + } + + [tempResult addObject:row]; + + [row release]; + } + + for (i = 0; i < [indexesQueryResult numOfRows]; i++) { + NSMutableArray *index = [[indexesQueryResult fetchRowAsArray] mutableCopy]; + + // Remove the 'table' column values + [index removeObjectAtIndex:0]; + + // For every NULL value replace it with the user's NULL value placeholder so we can actually print it + for (j = 0; j < [index count]; j++) + { + if ([[index objectAtIndex:j] isNSNull]) { + [index replaceObjectAtIndex:j withObject:(NSString *)escapedNullValue]; + } + } + + [tempResult2 addObject:index]; + + [index release]; + } + + CFRelease(escapedNullValue); + return [NSDictionary dictionaryWithObjectsAndKeys:tempResult, @"structure", tempResult2, @"indexes", nil]; +} + +#pragma mark - +#pragma mark Task interaction + +/** + * Disable all content interactive elements during an ongoing task. + */ +- (void) startDocumentTaskForTab:(NSNotification *)aNotification +{ + + // Only proceed if this view is selected. + if (![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure]) return; + + [tableSourceView setEnabled:NO]; + [addFieldButton setEnabled:NO]; + [removeFieldButton setEnabled:NO]; + [copyFieldButton setEnabled:NO]; + [reloadFieldsButton setEnabled:NO]; + [editTableButton setEnabled:NO]; + + [indexView setEnabled:NO]; + [addIndexButton setEnabled:NO]; + [removeIndexButton setEnabled:NO]; + [reloadIndexesButton setEnabled:NO]; +} + +/** + * Enable all content interactive elements after an ongoing task. + */ +- (void) endDocumentTaskForTab:(NSNotification *)aNotification +{ + + // Only re-enable elements if the current tab is the structure view + if (![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure]) return; + + BOOL editingEnabled = ([tablesListInstance tableType] == SPTableTypeTable); + [tableSourceView setEnabled:YES]; + [tableSourceView displayIfNeeded]; + [addFieldButton setEnabled:editingEnabled]; + if (editingEnabled && [tableSourceView numberOfSelectedRows] > 0) { + [removeFieldButton setEnabled:YES]; + [copyFieldButton setEnabled:YES]; + } + [reloadFieldsButton setEnabled:YES]; + [editTableButton setEnabled:YES]; + + [indexView setEnabled:YES]; + [indexView displayIfNeeded]; + [addIndexButton setEnabled:editingEnabled]; + if (editingEnabled && [indexView numberOfSelectedRows] > 0) + [removeIndexButton setEnabled:YES]; + [reloadIndexesButton setEnabled:YES]; +} + +#pragma mark - +#pragma mark TableView datasource methods + +- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView +{ + return (aTableView == tableSourceView) ? [tableFields count] : [indexes count]; +} + +- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + NSDictionary *theRow; + + if (aTableView == tableSourceView) { + + // Return a placeholder if the table is reloading + if (rowIndex >= [tableFields count]) return @"..."; + + theRow = [tableFields objectAtIndex:rowIndex]; + } else { + theRow = [indexes objectAtIndex:rowIndex]; + } + + return [theRow objectForKey:[aTableColumn identifier]]; +} + +- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + // Make sure that the drag operation is for the right table view + if (aTableView!=tableSourceView) return; + + if (!isEditingRow) { + [oldRow setDictionary:[tableFields objectAtIndex:rowIndex]]; + isEditingRow = YES; + currentlyEditingRow = rowIndex; + } + + [[tableFields objectAtIndex:rowIndex] setObject:(anObject) ? anObject : @"" forKey:[aTableColumn identifier]]; +} + +/** + * Confirm whether to allow editing of a row. Returns YES by default, but NO for views. + */ +- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex +{ + if ([tableDocumentInstance isWorking]) return NO; + + // Return NO for views + if ([tablesListInstance tableType] == SPTableTypeView) return NO; + + return YES; +} + +/* +Begin a drag and drop operation from the table - copy a single dragged row to the drag pasteboard. +*/ +- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rows toPasteboard:(NSPasteboard*)pboard +{ + // Make sure that the drag operation is started from the right table view + if (aTableView != tableSourceView) return NO; + + // Check whether a save of the current field row is required. + if ( ![self saveRowOnDeselect] ) return NO; + + if ([rows count] == 1) { + [pboard declareTypes:[NSArray arrayWithObject:@"SequelProPasteboard"] owner:nil]; + [pboard setString:[[NSNumber numberWithInteger:[rows firstIndex]] stringValue] forType:@"SequelProPasteboard"]; + return YES; + } else { + return NO; + } +} + +/* +Determine whether to allow a drag and drop operation on this table - for the purposes of drag reordering, +validate that the original source is of the correct type and within the same table, and that the drag +would result in a position change. +*/ +- (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id )info proposedRow:(NSInteger)row + proposedDropOperation:(NSTableViewDropOperation)operation +{ + //make sure that the drag operation is for the right table view + if (tableView!=tableSourceView) return NO; + + NSArray *pboardTypes = [[info draggingPasteboard] types]; + NSInteger originalRow; + + // Ensure the drop is of the correct type + if (operation == NSTableViewDropAbove && row != -1 && [pboardTypes containsObject:@"SequelProPasteboard"]) { + + // Ensure the drag originated within this table + if ([info draggingSource] == tableView) { + originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] integerValue]; + + if (row != originalRow && row != (originalRow+1)) { + return NSDragOperationMove; + } + } + } + + return NSDragOperationNone; +} + +/* + * Having validated a drop, perform the field/column reordering to match. + */ +- (BOOL)tableView:(NSTableView*)tableView acceptDrop:(id )info row:(NSInteger)destinationRowIndex dropOperation:(NSTableViewDropOperation)operation +{ + //make sure that the drag operation is for the right table view + if (tableView!=tableSourceView) return NO; + + NSInteger originalRowIndex; + NSMutableString *queryString; + NSDictionary *originalRow; + + // Extract the original row position from the pasteboard and retrieve the details + originalRowIndex = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] integerValue]; + originalRow = [[NSDictionary alloc] initWithDictionary:[tableFields objectAtIndex:originalRowIndex]]; + + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; + + // Begin construction of the reordering query + queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ MODIFY COLUMN %@ %@", [selectedTable backtickQuotedString], + [[originalRow objectForKey:@"Field"] backtickQuotedString], + [originalRow objectForKey:@"Type"]]; + + // Add the length parameter if necessary + if ( [originalRow objectForKey:@"Length"] && ![[originalRow objectForKey:@"Length"] isEqualToString:@""]) { + [queryString appendString:[NSString stringWithFormat:@"(%@)", [originalRow objectForKey:@"Length"]]]; + } + + // Add unsigned, zerofill, binary, not null if necessary + if ([[originalRow objectForKey:@"unsigned"] isEqualToString:@"1"]) { + [queryString appendString:@" UNSIGNED"]; + } + if ([[originalRow objectForKey:@"zerofill"] isEqualToString:@"1"]) { + [queryString appendString:@" ZEROFILL"]; + } + if ([[originalRow objectForKey:@"binary"] isEqualToString:@"1"]) { + [queryString appendString:@" BINARY"]; + } + if ([[originalRow objectForKey:@"Null"] isEqualToString:@"0"] ) { + [queryString appendString:@" NOT NULL"]; + } + if (![[originalRow objectForKey:@"Extra"] isEqualToString:@"None"] ) { + [queryString appendString:@" "]; + [queryString appendString:[[originalRow objectForKey:@"Extra"] uppercaseString]]; + } + + // Add the default value + if ([[originalRow objectForKey:@"Default"] isEqualToString:[prefs objectForKey:SPNullValue]]) { + if ([[originalRow objectForKey:@"Null"] integerValue] == 1) { + [queryString appendString:@" DEFAULT NULL"]; + } + } else if ( [[originalRow objectForKey:@"Type"] isEqualToString:@"timestamp"] && ([[[originalRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"]) ) { + [queryString appendString:@" DEFAULT CURRENT_TIMESTAMP"]; + } else { + [queryString appendString:[NSString stringWithFormat:@" DEFAULT '%@'", [mySQLConnection prepareString:[originalRow objectForKey:@"Default"]]]]; + } + + // Add details not provided via the SHOW COLUMNS query from the table data cache so column details aren't lost + NSDictionary *originalColumnDetails = [[tableDataInstance columns] objectAtIndex:originalRowIndex]; + + // Any column comments + if ([originalColumnDetails objectForKey:@"comment"] && [(NSString *)[originalColumnDetails objectForKey:@"comment"] length]) { + [queryString appendString:[NSString stringWithFormat:@" COMMENT '%@'", [mySQLConnection prepareString:[originalColumnDetails objectForKey:@"comment"]]]]; + } + + // Unparsed details - column formats, storage, reference definitions + if ([originalColumnDetails objectForKey:@"unparsed"]) { + [queryString appendString:[originalColumnDetails objectForKey:@"unparsed"]]; + } + + // Add the new location + if ( destinationRowIndex == 0 ){ + [queryString appendString:@" FIRST"]; + } else { + [queryString appendString:[NSString stringWithFormat:@" AFTER %@", + [[[tableFields objectAtIndex:destinationRowIndex-1] objectForKey:@"Field"] backtickQuotedString]]]; + } + + // Run the query; report any errors, or reload the table on success + [mySQLConnection queryString:queryString]; + if ([mySQLConnection queryErrored]) { + SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"Couldn't move field. MySQL said: %@", @"message of panel when field cannot be added in drag&drop operation"), [mySQLConnection getLastErrorMessage]]); + } else { + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + [self loadTable:selectedTable]; + + // Mark the content table cache for refresh + [tablesListInstance setContentRequiresReload:YES]; + + if ( originalRowIndex < destinationRowIndex ) { + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:destinationRowIndex-1] byExtendingSelection:NO]; + } else { + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:destinationRowIndex] byExtendingSelection:NO]; + } + } + + [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; + + [originalRow release]; + return YES; +} + +#pragma mark - +#pragma mark TableView delegate methods + +/** + * Performs various interface validation + */ +- (void)tableViewSelectionDidChange:(NSNotification *)aNotification +{ + id object = [aNotification object]; + + // Check for which table view the selection changed + if (object == tableSourceView) { + // If we are editing a row, attempt to save that row - if saving failed, reselect the edit row. + if (isEditingRow && [tableSourceView selectedRow] != currentlyEditingRow && ![self saveRowOnDeselect]) return; + + [copyFieldButton setEnabled:YES]; + + // Check if there is currently a field selected and change button state accordingly + if ([tableSourceView numberOfSelectedRows] > 0 && [tablesListInstance tableType] == SPTableTypeTable) { + [removeFieldButton setEnabled:YES]; + } else { + [removeFieldButton setEnabled:NO]; + [copyFieldButton setEnabled:NO]; + } + + // If the table only has one field, disable the remove button. This removes the need to check that the user + // is attempting to remove the last field in a table in removeField: above, but leave it in just in case. + if ([tableSourceView numberOfRows] == 1) { + [removeFieldButton setEnabled:NO]; + } + } + else if (object == indexView) { + // Check if there is currently an index selected and change button state accordingly + [removeIndexButton setEnabled:([indexView numberOfSelectedRows] > 0 && [tablesListInstance tableType] == SPTableTypeTable)]; + } +} + +/** + * Traps enter and esc and make/cancel editing without entering next row + */ +- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command +{ + NSInteger row, column; + + row = [tableSourceView editedRow]; + column = [tableSourceView editedColumn]; + + if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(insertNewline:)] || + [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) //trap enter and tab + { + //save current line + [[control window] makeFirstResponder:control]; + if ( column == 9 ) { + if ( [self addRowToDB] && [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) { + if ( row < ([tableSourceView numberOfRows] - 1) ) { + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO]; + [tableSourceView editColumn:0 row:row+1 withEvent:nil select:YES]; + } else { + [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; + [tableSourceView editColumn:0 row:0 withEvent:nil select:YES]; + } + } + } else { + if ( column == 2 ) { + [tableSourceView editColumn:column+6 row:row withEvent:nil select:YES]; + } else { + [tableSourceView editColumn:column+1 row:row withEvent:nil select:YES]; + } + } + return TRUE; + + } else if ( [[control window] methodForSelector:command] == [[control window] methodForSelector:@selector(_cancelKey:)] || + [textView methodForSelector:command] == [textView methodForSelector:@selector(complete:)] ) { + //abort editing + [control abortEditing]; + if ( isEditingRow && !isEditingNewRow ) { + isEditingRow = NO; + [tableFields replaceObjectAtIndex:row withObject:[NSMutableDictionary dictionaryWithDictionary:oldRow]]; + } else if ( isEditingNewRow ) { + isEditingRow = NO; + isEditingNewRow = NO; + [tableFields removeObjectAtIndex:row]; + [tableSourceView reloadData]; + } + currentlyEditingRow = -1; + return TRUE; + } else { + return FALSE; + } +} + + +/* + * Modify cell display by disabling table cells when a view is selected, meaning structure/index + * is uneditable. + */ +- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { + + //make sure that the message is from the right table view + if (tableView!=tableSourceView) return; + + [aCell setEnabled:([tablesListInstance tableType] == SPTableTypeTable)]; +} + +#pragma mark - +#pragma mark SplitView delegate methods + +- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview +{ + return YES; +} + +- (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset +{ + return proposedMax - 150; +} + +- (CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset +{ + return proposedMin + 150; +} + +- (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex +{ + return [structureGrabber convertRect:[structureGrabber bounds] toView:splitView]; +} + +#pragma mark - +#pragma mark Other + +// Last but not least +- (id)init +{ + if ((self = [super init])) { + tableFields = [[NSMutableArray alloc] init]; + indexes = [[NSMutableArray alloc] init]; + oldRow = [[NSMutableDictionary alloc] init]; + enumFields = [[NSMutableDictionary alloc] init]; + + currentlyEditingRow = -1; + defaultValues = nil; + selectedTable = nil; + + prefs = [NSUserDefaults standardUserDefaults]; + } + + return self; +} + +- (void)awakeFromNib +{ + // Set the structure and index view's vertical gridlines if required + [tableSourceView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; + [indexView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; + + // Set the strutcture and index view's font + BOOL useMonospacedFont = [prefs boolForKey:SPUseMonospacedFonts]; + + for (NSTableColumn *indexColumn in [indexView tableColumns]) + { + [[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } + + for (NSTableColumn *fieldColumn in [tableSourceView tableColumns]) + { + [[fieldColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; + } + + // Add observers for document task activity + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(startDocumentTaskForTab:) + name:SPDocumentTaskStartNotification + object:tableDocumentInstance]; + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(endDocumentTaskForTab:) + name:SPDocumentTaskEndNotification + object:tableDocumentInstance]; +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; + + [tableFields release]; + [indexes release]; + [oldRow release]; + [enumFields release]; + if (defaultValues) [defaultValues release]; + if (selectedTable) [selectedTable release]; + + [super dealloc]; +} + +@end + +@implementation SPTableStructure (PrivateAPI) + +/** + * Adds an index to the current table. + */ +- (void)_addIndex; +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + // Check whether a save of the current fields row is required. + if (![[self onMainThread] saveRowOnDeselect]) return; + + if (![[indexedColumnsField stringValue] isEqualToString:@""]) { + + NSString *indexName = @""; + NSMutableArray *tempIndexedColumns = [[NSMutableArray alloc] init]; + + if ([[indexNameField stringValue] isEqualToString:@"PRIMARY"]) { + indexName = @""; + } + else { + indexName = ([[indexNameField stringValue] isEqualToString:@""]) ? @"" : [[indexNameField stringValue] backtickQuotedString]; + } + + NSArray *indexedColumns = [[indexedColumnsField stringValue] componentsSeparatedByString:@","]; + + // For each column strip leading and trailing whitespace and add it to the temp array + for (NSString *column in indexedColumns) + { + [tempIndexedColumns addObject:[column stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]]; + } + + // Execute the query + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@ (%@)", + [selectedTable backtickQuotedString], [indexTypeField titleOfSelectedItem], indexName, + [tempIndexedColumns componentsJoinedAndBacktickQuoted]]]; + + // Check for errors, but only if the query wasn't cancelled + if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + SPBeginAlertSheet(NSLocalizedString(@"Unable to add index", @"add index error message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, + [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to add the index.\n\nMySQL said: %@", @"add index error informative message"), [mySQLConnection getLastErrorMessage]]); + } + else { + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + [self loadTable:selectedTable]; + } + + [tempIndexedColumns release]; + } + + [tableDocumentInstance endTask]; + + [pool drain]; +} + +/** + * Removes a field from the current table and the dependent foreign key if specified. + */ +- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + // Remove the foreign key before the field if required + if ([removeForeignKey boolValue]) { + + NSString *relationName = @""; + NSString *field = [[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"]; + + // Get the foreign key name + for (NSDictionary *constraint in [tableDataInstance getConstraints]) + { + for (NSString *column in [constraint objectForKey:@"columns"]) + { + if ([column isEqualToString:field]) { + relationName = [constraint objectForKey:@"name"]; + break; + } + } + } + + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP FOREIGN KEY %@", [selectedTable backtickQuotedString], [relationName backtickQuotedString]]]; + + // Check for errors, but only if the query wasn't cancelled + if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; + [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), relationName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [[self onMainThread] showErrorSheetWith:errorDictionary]; + } + } + + // Remove field + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP %@", + [selectedTable backtickQuotedString], [[[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"] backtickQuotedString]]]; + + // Check for errors, but only if the query wasn't cancelled + if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; + [errorDictionary setObject:NSLocalizedString(@"Error", @"error") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"Couldn't delete field %@.\nMySQL said: %@", @"message of panel when field cannot be deleted"), + [[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"], + [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [[self onMainThread] showErrorSheetWith:errorDictionary]; + } + else { + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + [self loadTable:selectedTable]; + + // Mark the content table cache for refresh + [tablesListInstance setContentRequiresReload:YES]; + } + + [tableDocumentInstance endTask]; + + [pool drain]; +} + +/** + * Removes an index from the current table and the dependent foreign key if specified. + */ +- (void)_removeIndexAndForeignKey:(NSNumber *)removeForeignKey +{ + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + + // Remove the foreign key dependency before the index if required + if ([removeForeignKey boolValue]) { + + NSString *columnName = [[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Column_name"]; + + NSString *constraintName = @""; + + // Check to see whether the user is attempting to remove an index that a foreign key constraint depends on + // thus would result in an error if not dropped before removing the index. + for (NSDictionary *constraint in [tableDataInstance getConstraints]) + { + for (NSString *column in [constraint objectForKey:@"columns"]) + { + if ([column isEqualToString:columnName]) { + constraintName = [constraint objectForKey:@"name"]; + break; + } + } + } + + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP FOREIGN KEY %@", [selectedTable backtickQuotedString], [constraintName backtickQuotedString]]]; + + // Check for errors, but only if the query wasn't cancelled + if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; + [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), constraintName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [[self onMainThread] showErrorSheetWith:errorDictionary]; + } + } + + if ([[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]) { + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP PRIMARY KEY", [selectedTable backtickQuotedString]]]; + } + else { + [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP INDEX %@", + [selectedTable backtickQuotedString], [[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] backtickQuotedString]]]; + } + + // Check for errors, but only if the query wasn't cancelled + if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { + NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; + [errorDictionary setObject:NSLocalizedString(@"Unable to delete index", @"error deleting index message") forKey:@"title"]; + [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to delete the index.\n\nMySQL said: %@", @"error deleting index informative message"), [mySQLConnection getLastErrorMessage]] forKey:@"message"]; + [[self onMainThread] showErrorSheetWith:errorDictionary]; + } + else { + [tableDataInstance resetAllData]; + [tablesListInstance setStatusRequiresReload:YES]; + [self loadTable:selectedTable]; + } + + [tableDocumentInstance endTask]; + + [pool drain]; +} + +@end diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index 5bab7b65..28885938 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -25,7 +25,7 @@ #import "SPTablesList.h" #import "TableDocument.h" -#import "TableSource.h" +#import "SPTableStructure.h" #import "TableContent.h" #import "SPTableData.h" #import "SPTableInfo.h" diff --git a/Source/TableContent.m b/Source/TableContent.m index 2aa20c07..ce24134b 100644 --- a/Source/TableContent.m +++ b/Source/TableContent.m @@ -27,7 +27,7 @@ #import "TableContent.h" #import "TableDocument.h" -#import "TableSource.h" +#import "SPTableStructure.h" #import "SPTableInfo.h" #import "SPTablesList.h" #import "SPImageView.h" diff --git a/Source/TableDocument.m b/Source/TableDocument.m index deabdc2f..b327dd7d 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -27,7 +27,7 @@ #import "TableDocument.h" #import "SPTablesList.h" -#import "TableSource.h" +#import "SPTableStructure.h" #import "TableContent.h" #import "CustomQuery.h" #import "TableDump.h" diff --git a/Source/TableDump.m b/Source/TableDump.m index 5725f0a5..6f2d77bc 100644 --- a/Source/TableDump.m +++ b/Source/TableDump.m @@ -26,7 +26,7 @@ #import "TableDump.h" #import "TableDocument.h" #import "SPTablesList.h" -#import "TableSource.h" +#import "SPTableStructure.h" #import "TableContent.h" #import "CustomQuery.h" #import "SPGrowlController.h" diff --git a/Source/TableSource.h b/Source/TableSource.h deleted file mode 100644 index 0278f282..00000000 --- a/Source/TableSource.h +++ /dev/null @@ -1,109 +0,0 @@ -// -// $Id$ -// -// TableSource.h -// sequel-pro -// -// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. -// Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. -// -// 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 - -#import -#import - -@interface TableSource : NSObject -{ - IBOutlet id tablesListInstance; - IBOutlet id tableDataInstance; - IBOutlet id tableDocumentInstance; - IBOutlet id tableInfoInstance; - IBOutlet id extendedTableInfoInstance; - - IBOutlet id indexSheet; - IBOutlet id keySheet; - IBOutlet id resetAutoIncrementSheet; - IBOutlet id resetAutoIncrementValue; - IBOutlet id resetAutoIncrementLine; - IBOutlet id tableSourceView; - IBOutlet id indexView; - IBOutlet id addFieldButton; - IBOutlet id copyFieldButton; - IBOutlet id removeFieldButton; - IBOutlet id reloadFieldsButton; - IBOutlet id addIndexButton; - IBOutlet id removeIndexButton; - IBOutlet id reloadIndexesButton; - IBOutlet id indexTypeField; - IBOutlet id indexNameField; - IBOutlet id indexedColumnsField; - IBOutlet id chooseKeyButton; - IBOutlet id structureGrabber; - IBOutlet id editTableButton; - - MCPConnection *mySQLConnection; - MCPResult *tableSourceResult; - MCPResult *indexResult; - - NSString *selectedTable; - NSMutableArray *tableFields, *indexes; - NSMutableDictionary *oldRow, *enumFields; - NSDictionary *defaultValues; - BOOL isEditingRow, isEditingNewRow, isSavingRow, alertSheetOpened; - NSInteger currentlyEditingRow; - NSUserDefaults *prefs; -} - -// Table methods -- (void)loadTable:(NSString *)aTable; -- (IBAction)reloadTable:(id)sender; -- (void) setTableDetails:(NSDictionary *)tableDetails; - -// Edit methods -- (IBAction)addField:(id)sender; -- (IBAction)copyField:(id)sender; -- (IBAction)removeField:(id)sender; -- (IBAction)removeIndex:(id)sender; -- (IBAction)resetAutoIncrement:(id)sender; - -// Index sheet methods -- (IBAction)openIndexSheet:(id)sender; -- (IBAction)closeSheet:(id)sender; -- (IBAction)chooseIndexType:(id)sender; -- (void)closeAlertSheet; - -// Key sheet methods -- (IBAction)closeKeySheet:(id)sender; - -// Additional methods -- (void)setConnection:(MCPConnection *)theConnection; -- (NSArray *)fetchResultAsArray:(MCPResult *)theResult; -- (BOOL)saveRowOnDeselect; -- (BOOL)addRowToDB; -- (void)setAutoIncrementTo:(NSString*)valueAsString; - -// Getter methods -- (NSString *)defaultValueForField:(NSString *)field; -- (NSArray *)fieldNames; -- (NSDictionary *)enumFields; -- (NSDictionary *)tableSourceForPrinting; - -// Task interaction -- (void)startDocumentTaskForTab:(NSNotification *)aNotification; -- (void)endDocumentTaskForTab:(NSNotification *)aNotification; - -@end diff --git a/Source/TableSource.m b/Source/TableSource.m deleted file mode 100644 index bc61b86d..00000000 --- a/Source/TableSource.m +++ /dev/null @@ -1,1921 +0,0 @@ -// -// $Id$ -// -// TableSource.m -// sequel-pro -// -// Created by lorenz textor (lorenz@textor.ch) on Wed May 01 2002. -// Copyright (c) 2002-2003 Lorenz Textor. All rights reserved. -// -// 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 - -#import "TableSource.h" -#import "TableDocument.h" -#import "SPTableInfo.h" -#import "SPTablesList.h" -#import "SPTableData.h" -#import "SPSQLParser.h" -#import "SPStringAdditions.h" -#import "SPArrayAdditions.h" -#import "SPConstants.h" -#import "SPAlertSheets.h" -#import "SPMainThreadTrampoline.h" - -@interface TableSource (PrivateAPI) - -- (void)_addIndex; -- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey; -- (void)_removeIndexAndForeignKey:(NSNumber *)removeForeignKey; - -@end - -@implementation TableSource - -/** - * Loads aTable, put it in an array, update the tableViewColumns and reload the tableView - */ -- (void)loadTable:(NSString *)aTable -{ - NSArray *theTableFields, *theTableIndexes; - NSMutableDictionary *theTableEnumLists = [NSMutableDictionary dictionary]; - NSArray *extrasArray; - NSMutableDictionary *tempDefaultValues; - NSInteger i; - SPSQLParser *fieldParser; - - // Check whether a save of the current row is required. - if ( ![[self onMainThread] saveRowOnDeselect] ) return; - - // If no table is selected, reset the interface and return - if (!aTable || ![aTable length]) { - [[self onMainThread] setTableDetails:nil]; - return; - } - - // Send the query started/working notification - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; - - // Retrieve the column information for this table. - // TODO: update this and indexes to use TableData at some point - tiny bit more parsing required... - tableSourceResult = [[mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@", [aTable backtickQuotedString]]] retain]; - - // If an error occurred, reset the interface and abort - if ([mySQLConnection queryErrored]) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; - [[self onMainThread] setTableDetails:nil]; - - if ([mySQLConnection isConnected]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), - nil, nil, [NSApp mainWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving information.\nMySQL said: %@", @"message of panel when retrieving information failed"), - [mySQLConnection getLastErrorMessage]]); - } - if (tableSourceResult) [tableSourceResult release]; - return; - } - - // Process the field names into a local array of dictionaries - theTableFields = [self fetchResultAsArray:tableSourceResult]; - [tableSourceResult release]; - - // Retrieve the indexes for the table - indexResult = [[mySQLConnection queryString:[NSString stringWithFormat:@"SHOW INDEX FROM %@", [aTable backtickQuotedString]]] retain]; - - // If an error occurred, reset the interface and abort - if ([mySQLConnection queryErrored]) { - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; - [[self onMainThread] setTableDetails:nil]; - - if ([mySQLConnection isConnected]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), - nil, nil, [NSApp mainWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred while retrieving information.\nMySQL said: %@", @"message of panel when retrieving information failed"), - [mySQLConnection getLastErrorMessage]]); - } - if (indexResult) [indexResult release]; - return; - } - - // Process the indexes into a local array of dictionaries - theTableIndexes = [self fetchResultAsArray:indexResult]; - [indexResult release]; - - // Process all the fields to normalise keys and add additional information - for (id theField in theTableFields) { - NSString *type; - NSString *length; - NSString *extras; - - // Set up the field parser with the type definition - fieldParser = [[SPSQLParser alloc] initWithString:[theField objectForKey:@"Type"]]; - - // Pull out the field type; if no brackets are found, this returns nil - in which case simple values can be used. - type = [fieldParser trimAndReturnStringToCharacter:'(' trimmingInclusively:YES returningInclusively:NO]; - if (!type) { - type = [NSString stringWithString:fieldParser]; - length = @""; - extras = @""; - } else { - - // Pull out the length, which may include enum/set values - length = [fieldParser trimAndReturnStringToCharacter:')' trimmingInclusively:YES returningInclusively:NO]; - if (!length) length = @""; - - // Separate any remaining extras - extras = [NSString stringWithString:fieldParser]; - if (!extras) extras = @""; - } - - [fieldParser release]; - - // Get possible values if the field is an enum or a set - if ([type isEqualToString:@"enum"] || [type isEqualToString:@"set"]) { - SPSQLParser *valueParser = [[SPSQLParser alloc] initWithString:length]; - NSMutableArray *possibleValues = [[NSMutableArray alloc] initWithArray:[valueParser splitStringByCharacter:',']]; - for (i = 0; i < [possibleValues count]; i++) { - [valueParser setString:[possibleValues objectAtIndex:i]]; - [possibleValues replaceObjectAtIndex:i withObject:[valueParser unquotedString]]; - } - [theTableEnumLists setObject:[NSArray arrayWithArray:possibleValues] forKey:[theField objectForKey:@"Field"]]; - [possibleValues release]; - [valueParser release]; - } - - // For timestamps check to see whether "on update CURRENT_TIMESTAMP" - not returned - // by SHOW COLUMNS - should be set from the table data store - if ([type isEqualToString:@"timestamp"] - && [[[tableDataInstance columnWithName:[theField objectForKey:@"Field"]] objectForKey:@"onupdatetimestamp"] integerValue]) - { - [theField setObject:@"on update CURRENT_TIMESTAMP" forKey:@"Extra"]; - } - - // Scan extras for values like unsigned, zerofill, binary - extrasArray = [extras componentsSeparatedByString:@" "]; - for (id extra in extrasArray) { - if ([extra isEqualToString:@"unsigned"]) { - [theField setObject:@"1" forKey:@"unsigned"]; - } else if ([extra isEqualToString:@"zerofill"]) { - [theField setObject:@"1" forKey:@"zerofill"]; - } else if ([extra isEqualToString:@"binary"]) { - [theField setObject:@"1" forKey:@"binary"]; - } else { - if (![extra isEqualToString:@""]) - NSLog(@"ERROR: unknown option in field definition: %@", extra); - } - } - - [theField setObject:type forKey:@"Type"]; - [theField setObject:length forKey:@"Length"]; - } - - // Set up the table details for the new table, and request an data/interface update - NSDictionary *tableDetails = [NSDictionary dictionaryWithObjectsAndKeys: - aTable, @"name", - theTableFields, @"tableFields", - theTableIndexes, @"tableIndexes", - theTableEnumLists, @"enumLists", - nil]; - [[self onMainThread] setTableDetails:tableDetails]; - - // Send the query finished/work complete notification - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; - -} - -/** - * Reloads the table (performing a new mysql-query) - */ -- (IBAction)reloadTable:(id)sender -{ - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - - // Query the structure of all databases in the background (mainly for completion) - [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"forceUpdate", nil]]; - - [self loadTable:selectedTable]; -} - -/** - * Update stored table details and update the interface to match the supplied - * table details. - * Should be called on the main thread. - */ -- (void) setTableDetails:(NSDictionary *)tableDetails -{ - NSString *newTableName = [tableDetails objectForKey:@"name"]; - NSMutableDictionary *newDefaultValues; - BOOL enableInteraction = ![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure] || ![tableDocumentInstance isWorking]; - - // Update the selected table name - if (selectedTable) [selectedTable release], selectedTable = nil; - if (newTableName) selectedTable = [[NSString alloc] initWithString:newTableName]; - - // Reset the table store and display - [enumFields removeAllObjects]; - [tableSourceView deselectAll:self]; - [indexView deselectAll:self]; - [tableFields removeAllObjects]; - [indexes removeAllObjects]; - [addFieldButton setEnabled:NO]; - [copyFieldButton setEnabled:NO]; - [removeFieldButton setEnabled:NO]; - [addIndexButton setEnabled:NO]; - [removeIndexButton setEnabled:NO]; - [editTableButton setEnabled:NO]; - - // If no table is selected, refresh the table display to blank and return - if (!selectedTable) { - [tableSourceView reloadData]; - [indexView reloadData]; - return; - } - - // Update the fields and indexes stores - [tableFields setArray:[tableDetails objectForKey:@"tableFields"]]; - [indexes setArray:[tableDetails objectForKey:@"tableIndexes"]]; - - // Update the default values array and the indexed column fields control - [indexedColumnsField removeAllItems]; - if (defaultValues) [defaultValues release], defaultValues = nil; - newDefaultValues = [NSMutableDictionary dictionaryWithCapacity:[tableFields count]]; - for (id theField in tableFields) { - [newDefaultValues setObject:[theField objectForKey:@"Default"] forKey:[theField objectForKey:@"Field"]]; - [indexedColumnsField addItemWithObjectValue:[theField objectForKey:@"Field"]]; - } - defaultValues = [[NSDictionary dictionaryWithDictionary:newDefaultValues] retain]; - - // Only show up to ten items in the indexed column fields control - if ([tableFields count] < 10) { - [indexedColumnsField setNumberOfVisibleItems:[tableFields count]]; - } else { - [indexedColumnsField setNumberOfVisibleItems:10]; - } - - // Enable the edit table button - [editTableButton setEnabled:enableInteraction]; - - // If a view is selected, disable the buttons; otherwise enable. - BOOL editingEnabled = ([tablesListInstance tableType] == SPTableTypeTable) && enableInteraction; - [addFieldButton setEnabled:editingEnabled]; - [addIndexButton setEnabled:editingEnabled]; - - // Reload the views - [indexView reloadData]; - [tableSourceView reloadData]; -} - -#pragma mark - -#pragma mark Edit methods - -/** - * Adds an empty row to the tableSource-array and goes into edit mode - */ -- (IBAction)addField:(id)sender -{ - // Check whether a save of the current row is required. - if ( ![self saveRowOnDeselect] ) return; - - NSInteger insertIndex = ([tableSourceView numberOfSelectedRows] == 0 ? [tableSourceView numberOfRows] : [tableSourceView selectedRow] + 1); - - [tableFields insertObject:[NSMutableDictionary - dictionaryWithObjects:[NSArray arrayWithObjects:@"", @"int", @"", @"0", @"0", @"0", ([prefs boolForKey:SPNewFieldsAllowNulls]) ? @"1" : @"0", @"", [prefs stringForKey:SPNullValue], @"None", nil] - forKeys:[NSArray arrayWithObjects:@"Field", @"Type", @"Length", @"unsigned", @"zerofill", @"binary", @"Null", @"Key", @"Default", @"Extra", nil]] - atIndex:insertIndex]; - - [tableSourceView reloadData]; - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:insertIndex] byExtendingSelection:NO]; - isEditingRow = YES; - isEditingNewRow = YES; - currentlyEditingRow = [tableSourceView selectedRow]; - [tableSourceView editColumn:0 row:insertIndex withEvent:nil select:YES]; -} - -/** - * Copies a field and goes in edit mode for the new field - */ -- (IBAction)copyField:(id)sender -{ - NSMutableDictionary *tempRow; - NSUInteger rowToCopy; - - // Store the row to duplicate, as saveRowOnDeselect and subsequent reloads may trigger a deselection - if ([tableSourceView numberOfSelectedRows]) { - rowToCopy = [tableSourceView selectedRow]; - } else { - rowToCopy = [tableSourceView numberOfRows]-1; - } - - // Check whether a save of the current row is required. - if ( ![self saveRowOnDeselect] ) return; - - //add copy of selected row and go in edit mode - tempRow = [NSMutableDictionary dictionaryWithDictionary:[tableFields objectAtIndex:rowToCopy]]; - [tempRow setObject:[[tempRow objectForKey:@"Field"] stringByAppendingString:@"Copy"] forKey:@"Field"]; - [tempRow setObject:@"" forKey:@"Key"]; - [tempRow setObject:@"None" forKey:@"Extra"]; - [tableFields addObject:tempRow]; - [tableSourceView reloadData]; - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:[tableSourceView numberOfRows]-1] byExtendingSelection:NO]; - isEditingRow = YES; - isEditingNewRow = YES; - currentlyEditingRow = [tableSourceView selectedRow]; - [tableSourceView editColumn:0 row:[tableSourceView numberOfRows]-1 withEvent:nil select:YES]; -} - -/** - * Ask the user to confirm that they really want to remove the selected field. - */ -- (IBAction)removeField:(id)sender -{ - if (![tableSourceView numberOfSelectedRows]) return; - - // Check whether a save of the current row is required. - if (![self saveRowOnDeselect]) return; - - NSInteger index = [tableSourceView selectedRow]; - - if ((index == -1) || (index > ([tableFields count] - 1))) return; - - // Check if the user tries to delete the last defined field in table - // Note that because of better menu item validation, this check will now never evaluate to true. - if ([tableSourceView numberOfRows] < 2) { - NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while deleting field", @"Error while deleting field") - defaultButton:NSLocalizedString(@"OK", @"OK button") - alternateButton:nil - otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"You cannot delete the last field in a table. Delete the table instead.", @"You cannot delete the last field in a table. Delete the table instead.")]; - - [alert setAlertStyle:NSCriticalAlertStyle]; - - [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"cannotremovefield"]; - - } - - NSString *field = [[tableFields objectAtIndex:index] objectForKey:@"Field"]; - - BOOL hasForeignKey = NO; - NSString *referencedTable = @""; - - // Check to see whether the user is attempting to remove a field that has foreign key constraints and thus - // would result in an error if not dropped before removing the field. - for (NSDictionary *constraint in [tableDataInstance getConstraints]) - { - for (NSString *column in [constraint objectForKey:@"columns"]) - { - if ([column isEqualToString:field]) { - hasForeignKey = YES; - referencedTable = [constraint objectForKey:@"ref_table"]; - break; - } - } - } - - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete field '%@'?", @"delete field message"), field] - defaultButton:NSLocalizedString(@"Delete", @"delete button") - alternateButton:NSLocalizedString(@"Cancel", @"cancel button") - otherButton:nil - informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"This field is part of a foreign key relationship with the table '%@'. This relationship must be removed before the field can be deleted.\n\nAre you sure you want to continue to delete the relationship and the field? This action cannot be undone.", @"delete field and foreign key informative message"), referencedTable] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the field '%@'? This action cannot be undone.", @"delete field informative message"), field]]; - - [alert setAlertStyle:NSCriticalAlertStyle]; - - NSArray *buttons = [alert buttons]; - - // Change the alert's cancel button to have the key equivalent of return - [[buttons objectAtIndex:0] setKeyEquivalent:@"d"]; - [[buttons objectAtIndex:0] setKeyEquivalentModifierMask:NSCommandKeyMask]; - [[buttons objectAtIndex:1] setKeyEquivalent:@"\r"]; - - [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(removeFieldSheetDidEnd:returnCode:contextInfo:) contextInfo:(hasForeignKey) ? @"removeFieldAndForeignKey" : @"removeField"]; -} - -/** - * Process the remove field sheet closing, performing the delete if the user - * confirmed the action. - */ -- (void)removeFieldSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - // Order out current sheet to suppress overlapping of sheets - [[alert window] orderOut:nil]; - - if (returnCode == NSAlertDefaultReturn) { - [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Removing field...", @"removing field task status message")]; - - NSNumber *removeKey = [NSNumber numberWithBool:[contextInfo hasSuffix:@"AndForeignKey"]]; - - if ([NSThread isMainThread]) { - [NSThread detachNewThreadSelector:@selector(_removeFieldAndForeignKey:) toTarget:self withObject:removeKey]; - - [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; - } - else { - [self _removeFieldAndForeignKey:removeKey]; - } - } -} - -/** - * Ask the user to confirm that they really want to remove the selected index. - */ -- (IBAction)removeIndex:(id)sender -{ - if (![indexView numberOfSelectedRows]) return; - - // Check whether a save of the current fields row is required. - if (![self saveRowOnDeselect]) return; - - NSInteger index = [indexView selectedRow]; - - if ((index == -1) || (index > ([indexes count] - 1))) return; - - NSString *keyName = [[indexes objectAtIndex:index] objectForKey:@"Key_name"]; - NSString *columnName = [[indexes objectAtIndex:index] objectForKey:@"Column_name"]; - - BOOL hasForeignKey = NO; - NSString *constraintName = @""; - - // Check to see whether the user is attempting to remove an index that a foreign key constraint depends on - // thus would result in an error if not dropped before removing the index. - for (NSDictionary *constraint in [tableDataInstance getConstraints]) - { - for (NSString *column in [constraint objectForKey:@"columns"]) - { - if ([column isEqualToString:columnName]) { - hasForeignKey = YES; - constraintName = [constraint objectForKey:@"name"]; - break; - } - } - } - - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Delete index '%@'?", @"delete index message"), keyName] - defaultButton:NSLocalizedString(@"Delete", @"delete button") - alternateButton:NSLocalizedString(@"Cancel", @"cancel button") - otherButton:nil - informativeTextWithFormat:(hasForeignKey) ? [NSString stringWithFormat:NSLocalizedString(@"The foreign key relationship '%@' has a dependency on this index. This relationship must be removed before the index can be deleted.\n\nAre you sure you want to continue to delete the relationship and the index? This action cannot be undone.", @"delete index and foreign key informative message"), constraintName] : [NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete the index '%@'? This action cannot be undone.", @"delete index informative message"), keyName]]; - - [alert setAlertStyle:NSCriticalAlertStyle]; - - NSArray *buttons = [alert buttons]; - - // Change the alert's cancel button to have the key equivalent of return - [[buttons objectAtIndex:0] setKeyEquivalent:@"d"]; - [[buttons objectAtIndex:0] setKeyEquivalentModifierMask:NSCommandKeyMask]; - [[buttons objectAtIndex:1] setKeyEquivalent:@"\r"]; - - [alert beginSheetModalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self didEndSelector:@selector(removeIndexSheetDidEnd:returnCode:contextInfo:) contextInfo:(hasForeignKey) ? @"removeIndexAndForeignKey" : @"removeIndex"]; -} - -/** - * Process the remove index sheet closing, performing the delete if the user - * confirmed the action. - */ -- (void)removeIndexSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - // Order out current sheet to suppress overlapping of sheets - [[alert window] orderOut:nil]; - - if (returnCode == NSAlertDefaultReturn) { - [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Removing index...", @"removing index task status message")]; - - NSNumber *removeKey = [NSNumber numberWithBool:[contextInfo hasSuffix:@"AndForeignKey"]]; - - if ([NSThread isMainThread]) { - [NSThread detachNewThreadSelector:@selector(_removeIndexAndForeignKey:) toTarget:self withObject:removeKey]; - - [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; - } - else { - [self _removeIndexAndForeignKey:removeKey]; - } - } -} - -- (IBAction)resetAutoIncrement:(id)sender -{ - - if([sender tag] == 1) { - - [resetAutoIncrementLine setHidden:YES]; - if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 0) - [resetAutoIncrementLine setHidden:NO]; - - // Begin the sheet - [NSApp beginSheet:resetAutoIncrementSheet - modalForWindow:[tableDocumentInstance parentWindow] - modalDelegate:self - didEndSelector:@selector(resetAutoincrementSheetDidEnd:returnCode:contextInfo:) - contextInfo:@"resetAutoIncrement"]; - - [resetAutoIncrementValue setStringValue:@"1"]; - } - else if([sender tag] == 2) { - [self setAutoIncrementTo:@"1"]; - } - -} - -/** - * Process the autoincrement sheet closing, resetting if the user - * confirmed the action. - */ -- (void)resetAutoincrementSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - // Order out current sheet to suppress overlapping of sheets - [theSheet orderOut:nil]; - - if (returnCode == NSAlertDefaultReturn) { - [self setAutoIncrementTo:[[resetAutoIncrementValue stringValue] stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]]; - } -} - -#pragma mark - -#pragma mark Index sheet methods - -/** - * Opens the add new index sheet. - */ -- (IBAction)openIndexSheet:(id)sender -{ - NSInteger i; - - // Check whether a save of the current field row is required. - if (![self saveRowOnDeselect]) return; - - // Set sheet defaults - key type PRIMARY, key name PRIMARY and disabled, and blank indexed columns - [indexTypeField selectItemAtIndex:0]; - [indexNameField setEnabled:NO]; - [indexNameField setStringValue:@"PRIMARY"]; - [indexedColumnsField setStringValue:@""]; - [indexSheet makeFirstResponder:indexedColumnsField]; - - // Check to see whether a primary key already exists for the table, and if so select an INDEX instead - for (i = 0; i < [tableFields count]; i++) - { - if ([[[tableFields objectAtIndex:i] objectForKey:@"Key"] isEqualToString:@"PRI"]) { - [indexTypeField selectItemAtIndex:1]; - [indexNameField setEnabled:YES]; - [indexNameField setStringValue:@""]; - [indexSheet makeFirstResponder:indexNameField]; - break; - } - } - - // Begin the sheet - [NSApp beginSheet:indexSheet - modalForWindow:[tableDocumentInstance parentWindow] - modalDelegate:self - didEndSelector:@selector(addIndexSheetDidEnd:returnCode:contextInfo:) - contextInfo:@"addIndex"]; -} - -/** - * Process the new index sheet closing, adding the index if appropriate - */ -- (void)addIndexSheetDidEnd:(NSWindow *)theSheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - [theSheet orderOut:nil]; - - if (returnCode == NSOKButton) { - [tableDocumentInstance startTaskWithDescription:NSLocalizedString(@"Adding index...", @"adding index task status message")]; - - if ([NSThread isMainThread]) { - [NSThread detachNewThreadSelector:@selector(_addIndex) toTarget:self withObject:nil]; - - [tableDocumentInstance enableTaskCancellationWithTitle:NSLocalizedString(@"Cancel", @"cancel button") callbackObject:self callbackFunction:NULL]; - } - else { - [self _addIndex]; - } - } -} - -/** - * Closes the current sheet and stops the modal session - */ -- (IBAction)closeSheet:(id)sender -{ - [NSApp endSheet:[sender window] returnCode:[sender tag]]; - [[sender window] orderOut:self]; -} - -/* -invoked when user chooses an index type -*/ -- (IBAction)chooseIndexType:(id)sender -{ - if ( [[indexTypeField titleOfSelectedItem] isEqualToString:@"PRIMARY KEY"] ) { - [indexNameField setEnabled:NO]; - [indexNameField setStringValue:@"PRIMARY"]; - } else { - [indexNameField setEnabled:YES]; - if ( [[indexNameField stringValue] isEqualToString:@"PRIMARY"] ) - [indexNameField setStringValue:@""]; - } -} - -/* -reopens indexSheet after errorSheet (no columns specified) -*/ -- (void)closeAlertSheet -{ - [self openIndexSheet:self]; -} - -/* -closes the keySheet -*/ -- (IBAction)closeKeySheet:(id)sender -{ - [NSApp stopModalWithCode:[sender tag]]; -} - - -#pragma mark - -#pragma mark Additional methods - -/** - * Sets the connection (received from TableDocument) and makes things that have to be done only once - */ -- (void)setConnection:(MCPConnection *)theConnection -{ - mySQLConnection = theConnection; - - // Set up tableView - [tableSourceView registerForDraggedTypes:[NSArray arrayWithObjects:@"SequelProPasteboard", nil]]; -} - -- (void)setAutoIncrementTo:(NSString*)valueAsString -{ - - NSString *selTable = nil; - - // if selectedTable is nil try to get the name from SPTablesList - if(selectedTable == nil || ![selectedTable length]) - selTable = [tablesListInstance tableName]; - else - selTable = [NSString stringWithString:selectedTable]; - - if(selTable == nil || ![selTable length]) - return; - - if(valueAsString == nil || ![valueAsString length]) { - // reload data and bail - [tableDataInstance resetAllData]; - [extendedTableInfoInstance loadTable:selTable]; - [tableInfoInstance tableChanged:nil]; - return; - } - - NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init]; - [formatter setNumberStyle:NSNumberFormatterDecimalStyle]; - NSNumber *autoIncValue = [formatter numberFromString:valueAsString]; - [formatter release]; - - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ AUTO_INCREMENT = %@", [selTable backtickQuotedString], [autoIncValue stringValue]]]; - - if ([mySQLConnection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), - NSLocalizedString(@"OK", @"OK button"), - nil, nil, [NSApp mainWindow], nil, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to reset AUTO_INCREMENT of table '%@'.\n\nMySQL said: %@", @"error resetting auto_increment informative message"), - selTable, [mySQLConnection getLastErrorMessage]]); - } - - // reload data - [tableDataInstance resetStatusData]; - if([[tableDocumentInstance valueForKeyPath:@"tableTabView"] indexOfTabViewItem:[[tableDocumentInstance valueForKeyPath:@"tableTabView"] selectedTabViewItem]] == 3) { - [tableDataInstance resetAllData]; - [extendedTableInfoInstance loadTable:selTable]; - } - - [tableInfoInstance tableChanged:nil]; - -} - -/** - * Converts the supplied result to an array containing a (mutable) dictionary for each row - */ -- (NSArray *)fetchResultAsArray:(MCPResult *)theResult -{ - NSUInteger numOfRows = [theResult numOfRows]; - NSMutableArray *tempResult = [NSMutableArray arrayWithCapacity:numOfRows]; - NSMutableDictionary *tempRow; - NSArray *keys; - NSInteger i; - id prefsNullValue = [prefs objectForKey:SPNullValue]; - - // Ensure table information is returned as strings to avoid problems with some server versions - [theResult setReturnDataAsStrings:YES]; - - if (numOfRows) [theResult dataSeek:0]; - for ( i = 0 ; i < numOfRows ; i++ ) { - tempRow = [NSMutableDictionary dictionaryWithDictionary:[theResult fetchRowAsDictionary]]; - - // Replace NSNull instances with the NULL string from preferences - keys = [tempRow allKeys]; - for (id theKey in keys) { - if ([[tempRow objectForKey:theKey] isNSNull]) - [tempRow setObject:prefsNullValue forKey:theKey]; - } - - // Update some fields to be more human-readable or GUI compatible - if ([[tempRow objectForKey:@"Extra"] isEqualToString:@""]) { - [tempRow setObject:@"None" forKey:@"Extra"]; - } - if ([[tempRow objectForKey:@"Null"] isEqualToString:@"YES"]) { - [tempRow setObject:@"1" forKey:@"Null"]; - } else { - [tempRow setObject:@"0" forKey:@"Null"]; - } - [tempResult addObject:tempRow]; - } - - return tempResult; -} - - -/* - * A method to be called whenever the selection changes or the table would be reloaded - * or altered; checks whether the current row is being edited, and if so attempts to save - * it. Returns YES if no save was necessary or the save was successful, and NO if a save - * was necessary but failed - also reselecting the row for re-editing. - */ -- (BOOL)saveRowOnDeselect -{ - // If no rows are currently being edited, or a save is already in progress, return success at once. - if (!isEditingRow || isSavingRow) return YES; - isSavingRow = YES; - - // Save any edits which have been made but not saved to the table yet. - [[tableDocumentInstance parentWindow] endEditingFor:nil]; - - // Attempt to save the row, and return YES if the save succeeded. - if ([self addRowToDB]) { - isSavingRow = NO; - return YES; - } - - // Saving failed - return failure. - isSavingRow = NO; - return NO; -} - -/** - * tries to write row to mysql-db - * returns YES if row written to db, otherwies NO - * returns YES if no row is beeing edited and nothing has to be written to db - */ -- (BOOL)addRowToDB; -{ - NSInteger code; - NSDictionary *theRow; - NSMutableString *queryString; - - if (!isEditingRow || currentlyEditingRow == -1) - return YES; - - if (alertSheetOpened) - return NO; - - theRow = [tableFields objectAtIndex:currentlyEditingRow]; - - if (isEditingNewRow) { - // ADD syntax - if ([[theRow objectForKey:@"Length"] isEqualToString:@""] || ![theRow objectForKey:@"Length"]) { - - queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@", - [selectedTable backtickQuotedString], - [[theRow objectForKey:@"Field"] backtickQuotedString], - [theRow objectForKey:@"Type"]]; - } - else { - queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@(%@)", - [selectedTable backtickQuotedString], - [[theRow objectForKey:@"Field"] backtickQuotedString], - [theRow objectForKey:@"Type"], - [theRow objectForKey:@"Length"]]; - } - } - else { - // CHANGE syntax - if (([[theRow objectForKey:@"Length"] isEqualToString:@""]) || - (![theRow objectForKey:@"Length"]) || - ([[theRow objectForKey:@"Type"] isEqualToString:@"datetime"])) - { - // If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue - if ([oldRow isEqualToDictionary:theRow]) return YES; - - queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ CHANGE %@ %@ %@", - [selectedTable backtickQuotedString], - [[oldRow objectForKey:@"Field"] backtickQuotedString], - [[theRow objectForKey:@"Field"] backtickQuotedString], - [theRow objectForKey:@"Type"]]; - } - else { - // If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue - if ([oldRow isEqualToDictionary:theRow]) return YES; - - queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ CHANGE %@ %@ %@(%@)", - [selectedTable backtickQuotedString], - [[oldRow objectForKey:@"Field"] backtickQuotedString], - [[theRow objectForKey:@"Field"] backtickQuotedString], - [theRow objectForKey:@"Type"], - [theRow objectForKey:@"Length"]]; - } - } - - // Field specification - if ([[theRow objectForKey:@"unsigned"] integerValue] == 1) { - [queryString appendString:@" UNSIGNED"]; - } - - if ( [[theRow objectForKey:@"zerofill"] integerValue] == 1) { - [queryString appendString:@" ZEROFILL"]; - } - - if ( [[theRow objectForKey:@"binary"] integerValue] == 1) { - [queryString appendString:@" BINARY"]; - } - - if ([[theRow objectForKey:@"Null"] integerValue] == 0) { - [queryString appendString:@" NOT NULL"]; - } else { - [queryString appendString:@" NULL"]; - } - - // Don't provide any defaults for auto-increment fields - if ([[theRow objectForKey:@"Extra"] isEqualToString:@"auto_increment"]) { - [queryString appendString:@" "]; - } - else { - // If a NULL value has been specified, and NULL is allowed, specify DEFAULT NULL - if ([[theRow objectForKey:@"Default"] isEqualToString:[prefs objectForKey:SPNullValue]]) { - if ([[theRow objectForKey:@"Null"] integerValue] == 1) { - [queryString appendString:@" DEFAULT NULL "]; - } - } - // Otherwise, if CURRENT_TIMESTAMP was specified for timestamps, use that - else if ([[theRow objectForKey:@"Type"] isEqualToString:@"timestamp"] && - [[[theRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"]) - { - [queryString appendString:@" DEFAULT CURRENT_TIMESTAMP "]; - - } - // If the field is of type BIT, permit the use of single qoutes and also don't quote the default value. - // For example, use DEFAULT b'1' as opposed to DEFAULT 'b\'1\'' which results in an error. - else if ([[theRow objectForKey:@"Type"] isEqualToString:@"bit"]) { - [queryString appendString:[NSString stringWithFormat:@" DEFAULT %@ ", [theRow objectForKey:@"Default"]]]; - } - // Otherwise, use the provided default - else { - [queryString appendString:[NSString stringWithFormat:@" DEFAULT '%@' ", [mySQLConnection prepareString:[theRow objectForKey:@"Default"]]]]; - } - } - - if (!( - [[theRow objectForKey:@"Extra"] isEqualToString:@""] || - [[theRow objectForKey:@"Extra"] isEqualToString:@"None"] - ) && - [theRow objectForKey:@"Extra"] ) - { - [queryString appendString:@" "]; - [queryString appendString:[theRow objectForKey:@"Extra"]]; - } - - if (!isEditingNewRow) { - - // Add details not provided via the SHOW COLUMNS query from the table data cache so column details aren't lost - NSDictionary *originalColumnDetails = [[tableDataInstance columns] objectAtIndex:currentlyEditingRow]; - - // Any column comments - if ([originalColumnDetails objectForKey:@"comment"] && [(NSString *)[originalColumnDetails objectForKey:@"comment"] length]) { - [queryString appendString:[NSString stringWithFormat:@" COMMENT '%@'", [mySQLConnection prepareString:[originalColumnDetails objectForKey:@"comment"]]]]; - } - - // Unparsed details - column formats, storage, reference definitions - if ([originalColumnDetails objectForKey:@"unparsed"]) { - [queryString appendString:[originalColumnDetails objectForKey:@"unparsed"]]; - } - } - - // Asks the user to add an index to query if auto_increment is set and field isn't indexed - if ([[theRow objectForKey:@"Extra"] isEqualToString:@"auto_increment"] && - ([[theRow objectForKey:@"Key"] isEqualToString:@""] || - ![theRow objectForKey:@"Key"])) - { - [chooseKeyButton selectItemAtIndex:0]; - - [NSApp beginSheet:keySheet - modalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self - didEndSelector:nil - contextInfo:nil]; - - code = [NSApp runModalForWindow:keySheet]; - - [NSApp endSheet:keySheet]; - [keySheet orderOut:nil]; - - if (code) { - // User wants to add PRIMARY KEY - if ([chooseKeyButton indexOfSelectedItem] == 0 ) { - [queryString appendString:@" PRIMARY KEY"]; - - // Add AFTER ... only if the user added a new field - if (isEditingNewRow) { - [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; - } - } - else { - // Add AFTER ... only if the user added a new field - if (isEditingNewRow) { - [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; - } - - [queryString appendString:[NSString stringWithFormat:@", ADD %@ (%@)", [chooseKeyButton titleOfSelectedItem], [[theRow objectForKey:@"Field"] backtickQuotedString]]]; - } - } - } - // Add AFTER ... only if the user added a new field - else if (isEditingNewRow) { - [queryString appendString:[NSString stringWithFormat:@" AFTER %@", [[[tableFields objectAtIndex:(currentlyEditingRow -1)] objectForKey:@"Field"] backtickQuotedString]]]; - } - - // Execute query - [mySQLConnection queryString:queryString]; - - if (![mySQLConnection queryErrored]) { - isEditingRow = NO; - isEditingNewRow = NO; - currentlyEditingRow = -1; - - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - [self loadTable:selectedTable]; - - // Mark the content table for refresh - [tablesListInstance setContentRequiresReload:YES]; - - // Query the structure of all databases in the background - [NSThread detachNewThreadSelector:@selector(queryDbStructureWithUserInfo:) toTarget:mySQLConnection withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:YES], @"forceUpdate", selectedTable, @"affectedItem", [NSNumber numberWithInt:[tablesListInstance tableType]], @"affectedItemType", nil]]; - - return YES; - } - else { - alertSheetOpened = YES; - if([mySQLConnection getLastErrorID] == 1146) { // If the current table doesn't exist anymore - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), - NSLocalizedString(@"OK", @"OK button"), - nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to alter table '%@'.\n\nMySQL said: %@", @"error while trying to alter table message"), - selectedTable, [mySQLConnection getLastErrorMessage]]); - - isEditingRow = NO; - isEditingNewRow = NO; - currentlyEditingRow = -1; - [tableFields removeAllObjects]; - [indexes removeAllObjects]; - [tableSourceView reloadData]; - [indexView reloadData]; - [addFieldButton setEnabled:NO]; - [copyFieldButton setEnabled:NO]; - [removeFieldButton setEnabled:NO]; - [addIndexButton setEnabled:NO]; - [removeIndexButton setEnabled:NO]; - [editTableButton setEnabled:NO]; - [tablesListInstance updateTables:self]; - return NO; - } - // Problem: alert sheet doesn't respond to first click - if (isEditingNewRow) { - SPBeginAlertSheet(NSLocalizedString(@"Error adding field", @"error adding field message"), - NSLocalizedString(@"Edit row", @"Edit row button"), - NSLocalizedString(@"Discard changes", @"discard changes button"), nil, [tableDocumentInstance parentWindow], self, @selector(addRowErrorSheetDidEnd:returnCode:contextInfo:), nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred when trying to add the field '%@'.\n\nMySQL said: %@", @"error adding field informative message"), - [theRow objectForKey:@"Field"], [mySQLConnection getLastErrorMessage]]); - } - else { - SPBeginAlertSheet(NSLocalizedString(@"Error changing field", @"error changing field message"), - NSLocalizedString(@"Edit row", @"Edit row button"), - NSLocalizedString(@"Discard changes", @"discard changes button"), nil, [tableDocumentInstance parentWindow], self, @selector(addRowErrorSheetDidEnd:returnCode:contextInfo:), nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occurred when trying to change the field '%@'.\n\nMySQL said: %@", @"error changing field informative message"), - [theRow objectForKey:@"Field"], [mySQLConnection getLastErrorMessage]]); - } - - return NO; - } -} - -/** - * Perform the action requested in the Add Row error sheet. - */ -- (void)addRowErrorSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo -{ - - // Order out current sheet to suppress overlapping of sheets - [[alert window] orderOut:nil]; - - alertSheetOpened = NO; - - // Remain in edit mode - reselect the row and resume editing - if (returnCode == NSAlertDefaultReturn) { - - // Problem: reentering edit mode for first cell doesn't function - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:currentlyEditingRow] byExtendingSelection:NO]; - [tableSourceView performSelector:@selector(keyDown:) withObject:[NSEvent keyEventWithType:NSKeyDown location:NSMakePoint(0,0) modifierFlags:0 timestamp:0 windowNumber:[[tableDocumentInstance parentWindow] windowNumber] context:[NSGraphicsContext currentContext] characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:0x24] afterDelay:0.0]; - } - - // Discard changes and cancel editing - else { - if (!isEditingNewRow) { - [tableFields replaceObjectAtIndex:currentlyEditingRow - withObject:[NSMutableDictionary dictionaryWithDictionary:oldRow]]; - isEditingRow = NO; - } - else { - [tableFields removeObjectAtIndex:currentlyEditingRow]; - isEditingRow = NO; - isEditingNewRow = NO; - } - - currentlyEditingRow = -1; - } - - [tableSourceView reloadData]; -} - -/** - * A method to show an error sheet after a short delay, so that it can - * be called from within an endSheet selector. This should be called on - * the main thread. - */ --(void)showErrorSheetWith:(NSDictionary *)errorDictionary -{ - - // If this method has been called directly, invoke a delay. Invoking the delay - // on the main thread ensures the timer fires on the main thread. - if (![errorDictionary objectForKey:@"delayed"]) { - NSMutableDictionary *delayedErrorDictionary = [NSMutableDictionary dictionaryWithDictionary:errorDictionary]; - [delayedErrorDictionary setObject:[NSNumber numberWithBool:YES] forKey:@"delayed"]; - [self performSelector:@selector(showErrorSheetWith:) withObject:delayedErrorDictionary afterDelay:0.3]; - return; - } - - // Display the error sheet - SPBeginAlertSheet([errorDictionary objectForKey:@"title"], NSLocalizedString(@"OK", @"OK button"), - nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [errorDictionary objectForKey:@"message"]); -} - -/** - * This method is called as part of Key Value Observing which is used to watch for preference changes which effect the interface. - */ -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context -{ - // Display table veiew vertical gridlines preference changed - if ([keyPath isEqualToString:SPDisplayTableViewVerticalGridlines]) { - [tableSourceView setGridStyleMask:([[change objectForKey:NSKeyValueChangeNewKey] boolValue]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; - [indexView setGridStyleMask:([[change objectForKey:NSKeyValueChangeNewKey] boolValue]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; - } - // Use monospaced fonts preference changed - else if ([keyPath isEqualToString:SPUseMonospacedFonts]) { - - BOOL useMonospacedFont = [[change objectForKey:NSKeyValueChangeNewKey] boolValue]; - - for (NSTableColumn *indexColumn in [indexView tableColumns]) - { - [[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - } - - for (NSTableColumn *fieldColumn in [tableSourceView tableColumns]) - { - [[fieldColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - } - - [tableSourceView reloadData]; - [indexView reloadData]; - } -} - -/** - * Menu validation - */ -- (BOOL)validateMenuItem:(NSMenuItem *)menuItem -{ - // Remove field - if ([menuItem action] == @selector(removeField:)) { - return (([tableSourceView numberOfSelectedRows] == 1) && ([tableSourceView numberOfRows] > 1)); - } - - // Duplicate field - if ([menuItem action] == @selector(copyField:)) { - return ([tableSourceView numberOfSelectedRows] == 1); - } - - // Remove index - if ([menuItem action] == @selector(removeIndex:)) { - return ([indexView numberOfSelectedRows] == 1); - } - - // Reset AUTO_INCREMENT - if ([menuItem action] == @selector(resetAutoIncrement:)) { - return ([indexView numberOfSelectedRows] == 1 - && [[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] - && [[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]); - } - - return YES; -} - -#pragma mark - -#pragma mark Alert sheet methods - -/** - * Called whenever a sheet is dismissed. - */ -- (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo -{ - - // Order out current sheet to suppress overlapping of sheets - if ([sheet respondsToSelector:@selector(orderOut:)]) - [sheet orderOut:nil]; - else if ([sheet respondsToSelector:@selector(window)]) - [[sheet window] orderOut:nil]; - - alertSheetOpened = NO; -} - -#pragma mark - -#pragma mark Getter methods - -/* -get the default value for a specified field -*/ -- (NSString *)defaultValueForField:(NSString *)field -{ - if ( ![defaultValues objectForKey:field] ) { - return [prefs objectForKey:SPNullValue]; - } else if ( [[defaultValues objectForKey:field] isMemberOfClass:[NSNull class]] ) { - return [prefs objectForKey:SPNullValue]; - } else { - return [defaultValues objectForKey:field]; - } -} - -/* -returns an array containing the field names of the selected table -*/ -- (NSArray *)fieldNames -{ - NSMutableArray *tempArray = [NSMutableArray array]; - NSEnumerator *enumerator; - id field; - - //load table if not already done - if ( ![tablesListInstance structureLoaded] ) { - [self loadTable:[tablesListInstance tableName]]; - } - - //get field names - enumerator = [tableFields objectEnumerator]; - while ( (field = [enumerator nextObject]) ) { - [tempArray addObject:[field objectForKey:@"Field"]]; - } - - return [NSArray arrayWithArray:tempArray]; -} - -/* -returns a dictionary containing enum/set field names as key and possible values as array -*/ -- (NSDictionary *)enumFields -{ - return [NSDictionary dictionaryWithDictionary:enumFields]; -} - -/** - * Returns a dictionary describing the source of the table to be used for printing purposes. The object accessible - * via the key 'structure' is an array of the tables fields, where the first element is always the field names - * and each subsequent element is the field data. This is also true for the table's indexes, which are accessible - * via the key 'indexes'. - */ -- (NSDictionary *)tableSourceForPrinting -{ - NSInteger i, j; - NSMutableArray *tempResult = [NSMutableArray array]; - NSMutableArray *tempResult2 = [NSMutableArray array]; - - NSString *nullValue = [prefs stringForKey:SPNullValue]; - CFStringRef escapedNullValue = CFXMLCreateStringByEscapingEntities(NULL, ((CFStringRef)nullValue), NULL); - - MCPResult *structureQueryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW COLUMNS FROM %@", [selectedTable backtickQuotedString]]]; - MCPResult *indexesQueryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW INDEXES FROM %@", [selectedTable backtickQuotedString]]]; - - [structureQueryResult setReturnDataAsStrings:YES]; - [indexesQueryResult setReturnDataAsStrings:YES]; - - if ([structureQueryResult numOfRows]) [structureQueryResult dataSeek:0]; - if ([indexesQueryResult numOfRows]) [indexesQueryResult dataSeek:0]; - - [tempResult addObject:[structureQueryResult fetchFieldNames]]; - - NSMutableArray *temp = [[indexesQueryResult fetchFieldNames] mutableCopy]; - - // Remove the 'table' column - [temp removeObjectAtIndex:0]; - - [tempResult2 addObject:temp]; - - [temp release]; - - for (i = 0; i < [structureQueryResult numOfRows]; i++) { - NSMutableArray *row = [[structureQueryResult fetchRowAsArray] mutableCopy]; - - // For every NULL value replace it with the user's NULL value placeholder so we can actually print it - for (j = 0; j < [row count]; j++) - { - if ([[row objectAtIndex:j] isNSNull]) { - [row replaceObjectAtIndex:j withObject:(NSString *)escapedNullValue]; - } - } - - [tempResult addObject:row]; - - [row release]; - } - - for (i = 0; i < [indexesQueryResult numOfRows]; i++) { - NSMutableArray *index = [[indexesQueryResult fetchRowAsArray] mutableCopy]; - - // Remove the 'table' column values - [index removeObjectAtIndex:0]; - - // For every NULL value replace it with the user's NULL value placeholder so we can actually print it - for (j = 0; j < [index count]; j++) - { - if ([[index objectAtIndex:j] isNSNull]) { - [index replaceObjectAtIndex:j withObject:(NSString *)escapedNullValue]; - } - } - - [tempResult2 addObject:index]; - - [index release]; - } - - CFRelease(escapedNullValue); - return [NSDictionary dictionaryWithObjectsAndKeys:tempResult, @"structure", tempResult2, @"indexes", nil]; -} - -#pragma mark - -#pragma mark Task interaction - -/** - * Disable all content interactive elements during an ongoing task. - */ -- (void) startDocumentTaskForTab:(NSNotification *)aNotification -{ - - // Only proceed if this view is selected. - if (![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure]) return; - - [tableSourceView setEnabled:NO]; - [addFieldButton setEnabled:NO]; - [removeFieldButton setEnabled:NO]; - [copyFieldButton setEnabled:NO]; - [reloadFieldsButton setEnabled:NO]; - [editTableButton setEnabled:NO]; - - [indexView setEnabled:NO]; - [addIndexButton setEnabled:NO]; - [removeIndexButton setEnabled:NO]; - [reloadIndexesButton setEnabled:NO]; -} - -/** - * Enable all content interactive elements after an ongoing task. - */ -- (void) endDocumentTaskForTab:(NSNotification *)aNotification -{ - - // Only re-enable elements if the current tab is the structure view - if (![[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableStructure]) return; - - BOOL editingEnabled = ([tablesListInstance tableType] == SPTableTypeTable); - [tableSourceView setEnabled:YES]; - [tableSourceView displayIfNeeded]; - [addFieldButton setEnabled:editingEnabled]; - if (editingEnabled && [tableSourceView numberOfSelectedRows] > 0) { - [removeFieldButton setEnabled:YES]; - [copyFieldButton setEnabled:YES]; - } - [reloadFieldsButton setEnabled:YES]; - [editTableButton setEnabled:YES]; - - [indexView setEnabled:YES]; - [indexView displayIfNeeded]; - [addIndexButton setEnabled:editingEnabled]; - if (editingEnabled && [indexView numberOfSelectedRows] > 0) - [removeIndexButton setEnabled:YES]; - [reloadIndexesButton setEnabled:YES]; -} - -#pragma mark - -#pragma mark TableView datasource methods - -- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView -{ - return (aTableView == tableSourceView) ? [tableFields count] : [indexes count]; -} - -- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex -{ - NSDictionary *theRow; - - if (aTableView == tableSourceView) { - - // Return a placeholder if the table is reloading - if (rowIndex >= [tableFields count]) return @"..."; - - theRow = [tableFields objectAtIndex:rowIndex]; - } else { - theRow = [indexes objectAtIndex:rowIndex]; - } - - return [theRow objectForKey:[aTableColumn identifier]]; -} - -- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex -{ - // Make sure that the drag operation is for the right table view - if (aTableView!=tableSourceView) return; - - if (!isEditingRow) { - [oldRow setDictionary:[tableFields objectAtIndex:rowIndex]]; - isEditingRow = YES; - currentlyEditingRow = rowIndex; - } - - [[tableFields objectAtIndex:rowIndex] setObject:(anObject) ? anObject : @"" forKey:[aTableColumn identifier]]; -} - -/** - * Confirm whether to allow editing of a row. Returns YES by default, but NO for views. - */ -- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex -{ - if ([tableDocumentInstance isWorking]) return NO; - - // Return NO for views - if ([tablesListInstance tableType] == SPTableTypeView) return NO; - - return YES; -} - -/* -Begin a drag and drop operation from the table - copy a single dragged row to the drag pasteboard. -*/ -- (BOOL)tableView:(NSTableView *)aTableView writeRowsWithIndexes:(NSIndexSet *)rows toPasteboard:(NSPasteboard*)pboard -{ - // Make sure that the drag operation is started from the right table view - if (aTableView != tableSourceView) return NO; - - // Check whether a save of the current field row is required. - if ( ![self saveRowOnDeselect] ) return NO; - - if ([rows count] == 1) { - [pboard declareTypes:[NSArray arrayWithObject:@"SequelProPasteboard"] owner:nil]; - [pboard setString:[[NSNumber numberWithInteger:[rows firstIndex]] stringValue] forType:@"SequelProPasteboard"]; - return YES; - } else { - return NO; - } -} - -/* -Determine whether to allow a drag and drop operation on this table - for the purposes of drag reordering, -validate that the original source is of the correct type and within the same table, and that the drag -would result in a position change. -*/ -- (NSDragOperation)tableView:(NSTableView*)tableView validateDrop:(id )info proposedRow:(NSInteger)row - proposedDropOperation:(NSTableViewDropOperation)operation -{ - //make sure that the drag operation is for the right table view - if (tableView!=tableSourceView) return NO; - - NSArray *pboardTypes = [[info draggingPasteboard] types]; - NSInteger originalRow; - - // Ensure the drop is of the correct type - if (operation == NSTableViewDropAbove && row != -1 && [pboardTypes containsObject:@"SequelProPasteboard"]) { - - // Ensure the drag originated within this table - if ([info draggingSource] == tableView) { - originalRow = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] integerValue]; - - if (row != originalRow && row != (originalRow+1)) { - return NSDragOperationMove; - } - } - } - - return NSDragOperationNone; -} - -/* - * Having validated a drop, perform the field/column reordering to match. - */ -- (BOOL)tableView:(NSTableView*)tableView acceptDrop:(id )info row:(NSInteger)destinationRowIndex dropOperation:(NSTableViewDropOperation)operation -{ - //make sure that the drag operation is for the right table view - if (tableView!=tableSourceView) return NO; - - NSInteger originalRowIndex; - NSMutableString *queryString; - NSDictionary *originalRow; - - // Extract the original row position from the pasteboard and retrieve the details - originalRowIndex = [[[info draggingPasteboard] stringForType:@"SequelProPasteboard"] integerValue]; - originalRow = [[NSDictionary alloc] initWithDictionary:[tableFields objectAtIndex:originalRowIndex]]; - - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryWillBePerformed" object:tableDocumentInstance]; - - // Begin construction of the reordering query - queryString = [NSMutableString stringWithFormat:@"ALTER TABLE %@ MODIFY COLUMN %@ %@", [selectedTable backtickQuotedString], - [[originalRow objectForKey:@"Field"] backtickQuotedString], - [originalRow objectForKey:@"Type"]]; - - // Add the length parameter if necessary - if ( [originalRow objectForKey:@"Length"] && ![[originalRow objectForKey:@"Length"] isEqualToString:@""]) { - [queryString appendString:[NSString stringWithFormat:@"(%@)", [originalRow objectForKey:@"Length"]]]; - } - - // Add unsigned, zerofill, binary, not null if necessary - if ([[originalRow objectForKey:@"unsigned"] isEqualToString:@"1"]) { - [queryString appendString:@" UNSIGNED"]; - } - if ([[originalRow objectForKey:@"zerofill"] isEqualToString:@"1"]) { - [queryString appendString:@" ZEROFILL"]; - } - if ([[originalRow objectForKey:@"binary"] isEqualToString:@"1"]) { - [queryString appendString:@" BINARY"]; - } - if ([[originalRow objectForKey:@"Null"] isEqualToString:@"0"] ) { - [queryString appendString:@" NOT NULL"]; - } - if (![[originalRow objectForKey:@"Extra"] isEqualToString:@"None"] ) { - [queryString appendString:@" "]; - [queryString appendString:[[originalRow objectForKey:@"Extra"] uppercaseString]]; - } - - // Add the default value - if ([[originalRow objectForKey:@"Default"] isEqualToString:[prefs objectForKey:SPNullValue]]) { - if ([[originalRow objectForKey:@"Null"] integerValue] == 1) { - [queryString appendString:@" DEFAULT NULL"]; - } - } else if ( [[originalRow objectForKey:@"Type"] isEqualToString:@"timestamp"] && ([[[originalRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"]) ) { - [queryString appendString:@" DEFAULT CURRENT_TIMESTAMP"]; - } else { - [queryString appendString:[NSString stringWithFormat:@" DEFAULT '%@'", [mySQLConnection prepareString:[originalRow objectForKey:@"Default"]]]]; - } - - // Add details not provided via the SHOW COLUMNS query from the table data cache so column details aren't lost - NSDictionary *originalColumnDetails = [[tableDataInstance columns] objectAtIndex:originalRowIndex]; - - // Any column comments - if ([originalColumnDetails objectForKey:@"comment"] && [(NSString *)[originalColumnDetails objectForKey:@"comment"] length]) { - [queryString appendString:[NSString stringWithFormat:@" COMMENT '%@'", [mySQLConnection prepareString:[originalColumnDetails objectForKey:@"comment"]]]]; - } - - // Unparsed details - column formats, storage, reference definitions - if ([originalColumnDetails objectForKey:@"unparsed"]) { - [queryString appendString:[originalColumnDetails objectForKey:@"unparsed"]]; - } - - // Add the new location - if ( destinationRowIndex == 0 ){ - [queryString appendString:@" FIRST"]; - } else { - [queryString appendString:[NSString stringWithFormat:@" AFTER %@", - [[[tableFields objectAtIndex:destinationRowIndex-1] objectForKey:@"Field"] backtickQuotedString]]]; - } - - // Run the query; report any errors, or reload the table on success - [mySQLConnection queryString:queryString]; - if ([mySQLConnection queryErrored]) { - SPBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"Couldn't move field. MySQL said: %@", @"message of panel when field cannot be added in drag&drop operation"), [mySQLConnection getLastErrorMessage]]); - } else { - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - [self loadTable:selectedTable]; - - // Mark the content table cache for refresh - [tablesListInstance setContentRequiresReload:YES]; - - if ( originalRowIndex < destinationRowIndex ) { - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:destinationRowIndex-1] byExtendingSelection:NO]; - } else { - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:destinationRowIndex] byExtendingSelection:NO]; - } - } - - [[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:tableDocumentInstance]; - - [originalRow release]; - return YES; -} - -#pragma mark - -#pragma mark TableView delegate methods - -/** - * Performs various interface validation - */ -- (void)tableViewSelectionDidChange:(NSNotification *)aNotification -{ - id object = [aNotification object]; - - // Check for which table view the selection changed - if (object == tableSourceView) { - // If we are editing a row, attempt to save that row - if saving failed, reselect the edit row. - if (isEditingRow && [tableSourceView selectedRow] != currentlyEditingRow && ![self saveRowOnDeselect]) return; - - [copyFieldButton setEnabled:YES]; - - // Check if there is currently a field selected and change button state accordingly - if ([tableSourceView numberOfSelectedRows] > 0 && [tablesListInstance tableType] == SPTableTypeTable) { - [removeFieldButton setEnabled:YES]; - } else { - [removeFieldButton setEnabled:NO]; - [copyFieldButton setEnabled:NO]; - } - - // If the table only has one field, disable the remove button. This removes the need to check that the user - // is attempting to remove the last field in a table in removeField: above, but leave it in just in case. - if ([tableSourceView numberOfRows] == 1) { - [removeFieldButton setEnabled:NO]; - } - } - else if (object == indexView) { - // Check if there is currently an index selected and change button state accordingly - [removeIndexButton setEnabled:([indexView numberOfSelectedRows] > 0 && [tablesListInstance tableType] == SPTableTypeTable)]; - } -} - -/** - * Traps enter and esc and make/cancel editing without entering next row - */ -- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)command -{ - NSInteger row, column; - - row = [tableSourceView editedRow]; - column = [tableSourceView editedColumn]; - - if ( [textView methodForSelector:command] == [textView methodForSelector:@selector(insertNewline:)] || - [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) //trap enter and tab - { - //save current line - [[control window] makeFirstResponder:control]; - if ( column == 9 ) { - if ( [self addRowToDB] && [textView methodForSelector:command] == [textView methodForSelector:@selector(insertTab:)] ) { - if ( row < ([tableSourceView numberOfRows] - 1) ) { - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:row+1] byExtendingSelection:NO]; - [tableSourceView editColumn:0 row:row+1 withEvent:nil select:YES]; - } else { - [tableSourceView selectRowIndexes:[NSIndexSet indexSetWithIndex:0] byExtendingSelection:NO]; - [tableSourceView editColumn:0 row:0 withEvent:nil select:YES]; - } - } - } else { - if ( column == 2 ) { - [tableSourceView editColumn:column+6 row:row withEvent:nil select:YES]; - } else { - [tableSourceView editColumn:column+1 row:row withEvent:nil select:YES]; - } - } - return TRUE; - - } else if ( [[control window] methodForSelector:command] == [[control window] methodForSelector:@selector(_cancelKey:)] || - [textView methodForSelector:command] == [textView methodForSelector:@selector(complete:)] ) { - //abort editing - [control abortEditing]; - if ( isEditingRow && !isEditingNewRow ) { - isEditingRow = NO; - [tableFields replaceObjectAtIndex:row withObject:[NSMutableDictionary dictionaryWithDictionary:oldRow]]; - } else if ( isEditingNewRow ) { - isEditingRow = NO; - isEditingNewRow = NO; - [tableFields removeObjectAtIndex:row]; - [tableSourceView reloadData]; - } - currentlyEditingRow = -1; - return TRUE; - } else { - return FALSE; - } -} - - -/* - * Modify cell display by disabling table cells when a view is selected, meaning structure/index - * is uneditable. - */ -- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex { - - //make sure that the message is from the right table view - if (tableView!=tableSourceView) return; - - [aCell setEnabled:([tablesListInstance tableType] == SPTableTypeTable)]; -} - -#pragma mark - -#pragma mark SplitView delegate methods - -- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview -{ - return YES; -} - -- (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset -{ - return proposedMax - 150; -} - -- (CGFloat)splitView:(NSSplitView *)sender constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset -{ - return proposedMin + 150; -} - -- (NSRect)splitView:(NSSplitView *)splitView additionalEffectiveRectOfDividerAtIndex:(NSInteger)dividerIndex -{ - return [structureGrabber convertRect:[structureGrabber bounds] toView:splitView]; -} - -#pragma mark - -#pragma mark Other - -// Last but not least -- (id)init -{ - if ((self = [super init])) { - tableFields = [[NSMutableArray alloc] init]; - indexes = [[NSMutableArray alloc] init]; - oldRow = [[NSMutableDictionary alloc] init]; - enumFields = [[NSMutableDictionary alloc] init]; - - currentlyEditingRow = -1; - defaultValues = nil; - selectedTable = nil; - - prefs = [NSUserDefaults standardUserDefaults]; - } - - return self; -} - -- (void)awakeFromNib -{ - // Set the structure and index view's vertical gridlines if required - [tableSourceView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; - [indexView setGridStyleMask:([prefs boolForKey:SPDisplayTableViewVerticalGridlines]) ? NSTableViewSolidVerticalGridLineMask : NSTableViewGridNone]; - - // Set the strutcture and index view's font - BOOL useMonospacedFont = [prefs boolForKey:SPUseMonospacedFonts]; - - for (NSTableColumn *indexColumn in [indexView tableColumns]) - { - [[indexColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - } - - for (NSTableColumn *fieldColumn in [tableSourceView tableColumns]) - { - [[fieldColumn dataCell] setFont:(useMonospacedFont) ? [NSFont fontWithName:SPDefaultMonospacedFontName size:[NSFont smallSystemFontSize]] : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]]; - } - - // Add observers for document task activity - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(startDocumentTaskForTab:) - name:SPDocumentTaskStartNotification - object:tableDocumentInstance]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(endDocumentTaskForTab:) - name:SPDocumentTaskEndNotification - object:tableDocumentInstance]; -} - -- (void)dealloc -{ - [[NSNotificationCenter defaultCenter] removeObserver:self]; - - [tableFields release]; - [indexes release]; - [oldRow release]; - [enumFields release]; - if (defaultValues) [defaultValues release]; - if (selectedTable) [selectedTable release]; - - [super dealloc]; -} - -@end - -@implementation TableSource (PrivateAPI) - -/** - * Adds an index to the current table. - */ -- (void)_addIndex; -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - // Check whether a save of the current fields row is required. - if (![[self onMainThread] saveRowOnDeselect]) return; - - if (![[indexedColumnsField stringValue] isEqualToString:@""]) { - - NSString *indexName = @""; - NSMutableArray *tempIndexedColumns = [[NSMutableArray alloc] init]; - - if ([[indexNameField stringValue] isEqualToString:@"PRIMARY"]) { - indexName = @""; - } - else { - indexName = ([[indexNameField stringValue] isEqualToString:@""]) ? @"" : [[indexNameField stringValue] backtickQuotedString]; - } - - NSArray *indexedColumns = [[indexedColumnsField stringValue] componentsSeparatedByString:@","]; - - // For each column strip leading and trailing whitespace and add it to the temp array - for (NSString *column in indexedColumns) - { - [tempIndexedColumns addObject:[column stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]]]; - } - - // Execute the query - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ %@ (%@)", - [selectedTable backtickQuotedString], [indexTypeField titleOfSelectedItem], indexName, - [tempIndexedColumns componentsJoinedAndBacktickQuoted]]]; - - // Check for errors, but only if the query wasn't cancelled - if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { - SPBeginAlertSheet(NSLocalizedString(@"Unable to add index", @"add index error message"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, - [NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to add the index.\n\nMySQL said: %@", @"add index error informative message"), [mySQLConnection getLastErrorMessage]]); - } - else { - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - [self loadTable:selectedTable]; - } - - [tempIndexedColumns release]; - } - - [tableDocumentInstance endTask]; - - [pool drain]; -} - -/** - * Removes a field from the current table and the dependent foreign key if specified. - */ -- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - // Remove the foreign key before the field if required - if ([removeForeignKey boolValue]) { - - NSString *relationName = @""; - NSString *field = [[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"]; - - // Get the foreign key name - for (NSDictionary *constraint in [tableDataInstance getConstraints]) - { - for (NSString *column in [constraint objectForKey:@"columns"]) - { - if ([column isEqualToString:field]) { - relationName = [constraint objectForKey:@"name"]; - break; - } - } - } - - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP FOREIGN KEY %@", [selectedTable backtickQuotedString], [relationName backtickQuotedString]]]; - - // Check for errors, but only if the query wasn't cancelled - if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { - NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), relationName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; - [[self onMainThread] showErrorSheetWith:errorDictionary]; - } - } - - // Remove field - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP %@", - [selectedTable backtickQuotedString], [[[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"] backtickQuotedString]]]; - - // Check for errors, but only if the query wasn't cancelled - if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { - NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Error", @"error") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"Couldn't delete field %@.\nMySQL said: %@", @"message of panel when field cannot be deleted"), - [[tableFields objectAtIndex:[tableSourceView selectedRow]] objectForKey:@"Field"], - [mySQLConnection getLastErrorMessage]] forKey:@"message"]; - [[self onMainThread] showErrorSheetWith:errorDictionary]; - } - else { - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - [self loadTable:selectedTable]; - - // Mark the content table cache for refresh - [tablesListInstance setContentRequiresReload:YES]; - } - - [tableDocumentInstance endTask]; - - [pool drain]; -} - -/** - * Removes an index from the current table and the dependent foreign key if specified. - */ -- (void)_removeIndexAndForeignKey:(NSNumber *)removeForeignKey -{ - NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - - // Remove the foreign key dependency before the index if required - if ([removeForeignKey boolValue]) { - - NSString *columnName = [[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Column_name"]; - - NSString *constraintName = @""; - - // Check to see whether the user is attempting to remove an index that a foreign key constraint depends on - // thus would result in an error if not dropped before removing the index. - for (NSDictionary *constraint in [tableDataInstance getConstraints]) - { - for (NSString *column in [constraint objectForKey:@"columns"]) - { - if ([column isEqualToString:columnName]) { - constraintName = [constraint objectForKey:@"name"]; - break; - } - } - } - - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP FOREIGN KEY %@", [selectedTable backtickQuotedString], [constraintName backtickQuotedString]]]; - - // Check for errors, but only if the query wasn't cancelled - if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { - NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete relation", @"error deleting relation message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to delete the relation '%@'.\n\nMySQL said: %@", @"error deleting relation informative message"), constraintName, [mySQLConnection getLastErrorMessage]] forKey:@"message"]; - [[self onMainThread] showErrorSheetWith:errorDictionary]; - } - } - - if ([[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] isEqualToString:@"PRIMARY"]) { - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP PRIMARY KEY", [selectedTable backtickQuotedString]]]; - } - else { - [mySQLConnection queryString:[NSString stringWithFormat:@"ALTER TABLE %@ DROP INDEX %@", - [selectedTable backtickQuotedString], [[[indexes objectAtIndex:[indexView selectedRow]] objectForKey:@"Key_name"] backtickQuotedString]]]; - } - - // Check for errors, but only if the query wasn't cancelled - if ([mySQLConnection queryErrored] && ![mySQLConnection queryCancelled]) { - NSMutableDictionary *errorDictionary = [NSMutableDictionary dictionary]; - [errorDictionary setObject:NSLocalizedString(@"Unable to delete index", @"error deleting index message") forKey:@"title"]; - [errorDictionary setObject:[NSString stringWithFormat:NSLocalizedString(@"An error occured while trying to delete the index.\n\nMySQL said: %@", @"error deleting index informative message"), [mySQLConnection getLastErrorMessage]] forKey:@"message"]; - [[self onMainThread] showErrorSheetWith:errorDictionary]; - } - else { - [tableDataInstance resetAllData]; - [tablesListInstance setStatusRequiresReload:YES]; - [self loadTable:selectedTable]; - } - - [tableDocumentInstance endTask]; - - [pool drain]; -} - -@end diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 00a57940..1e93cb14 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -98,7 +98,7 @@ 17E641590EF01EF6001BC333 /* TableContent.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6414F0EF01EF6001BC333 /* TableContent.m */; }; 17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641510EF01EF6001BC333 /* TableDocument.m */; }; 17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641530EF01EF6001BC333 /* TableDump.m */; }; - 17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* TableSource.m */; }; + 17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641550EF01EF6001BC333 /* SPTableStructure.m */; }; 17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E6415F0EF01F15001BC333 /* SPTableInfo.m */; }; 17E641650EF01F15001BC333 /* SPTablesList.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641610EF01F15001BC333 /* SPTablesList.m */; }; 17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 17E641690EF01F37001BC333 /* ImageAndTextCell.m */; }; @@ -525,8 +525,8 @@ 17E641510EF01EF6001BC333 /* TableDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableDocument.m; sourceTree = ""; }; 17E641520EF01EF6001BC333 /* TableDump.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableDump.h; sourceTree = ""; }; 17E641530EF01EF6001BC333 /* TableDump.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableDump.m; sourceTree = ""; }; - 17E641540EF01EF6001BC333 /* TableSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TableSource.h; sourceTree = ""; }; - 17E641550EF01EF6001BC333 /* TableSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TableSource.m; sourceTree = ""; }; + 17E641540EF01EF6001BC333 /* SPTableStructure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableStructure.h; sourceTree = ""; }; + 17E641550EF01EF6001BC333 /* SPTableStructure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableStructure.m; sourceTree = ""; }; 17E6415E0EF01F15001BC333 /* SPTableInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTableInfo.h; sourceTree = ""; }; 17E6415F0EF01F15001BC333 /* SPTableInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPTableInfo.m; sourceTree = ""; }; 17E641600EF01F15001BC333 /* SPTablesList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPTablesList.h; sourceTree = ""; }; @@ -1017,8 +1017,8 @@ 17E641510EF01EF6001BC333 /* TableDocument.m */, 17E641520EF01EF6001BC333 /* TableDump.h */, 17E641530EF01EF6001BC333 /* TableDump.m */, - 17E641540EF01EF6001BC333 /* TableSource.h */, - 17E641550EF01EF6001BC333 /* TableSource.m */, + 17E641540EF01EF6001BC333 /* SPTableStructure.h */, + 17E641550EF01EF6001BC333 /* SPTableStructure.m */, 1792C28910AE1C7200ABE758 /* Controller Categories */, ); name = "Main View Controllers"; @@ -2034,7 +2034,7 @@ 17E641590EF01EF6001BC333 /* TableContent.m in Sources */, 17E6415A0EF01EF6001BC333 /* TableDocument.m in Sources */, 17E6415B0EF01EF6001BC333 /* TableDump.m in Sources */, - 17E6415C0EF01EF6001BC333 /* TableSource.m in Sources */, + 17E6415C0EF01EF6001BC333 /* SPTableStructure.m in Sources */, 17E641640EF01F15001BC333 /* SPTableInfo.m in Sources */, 17E641650EF01F15001BC333 /* SPTablesList.m in Sources */, 17E6416C0EF01F37001BC333 /* ImageAndTextCell.m in Sources */, -- cgit v1.2.3