Merge framework integration branch back to trunk. Summary of changes:

- Includes all custom code from subclasses CMMCPConnection and CMMCPResult, meaning they have subsequently been removed from the project.
- All previous Sequel Pro specific code in the above subclasses has been removed in favour of the delegate (currently set to TableDocumet) informing the framework of such information.
- All references to CMMCPConnection and CMMCPResult have subsequently been changed to MCPConnection and MCPResult.
- Framework includes MySQL 5.1.36 client libraries and source headers.
- Framework is now built as a 4-way (32/64 bit, i386/PPC arch) binary.
- All import references to <MCPKit_bundled/MCPKit_bundled.h> have been changed to <MCPKit/MCPKit.h>.
- New script 'build-mysql-client.sh' can be used to build the MySQL client libraries from the MySQL source. See the script's header for a list of available options or run it with no arguments to display it's usage.

Note that there are still a few changes to be made to the framework with regard to removing Sequel Pro specific calls to the delegate. These however can be made later on as they have no effect on functionality and are merely design changes. 

Also, note that any future development done on the framework should be made to be as 'generic' as possible, with no Sequel Pro specific references. This should allow the framework to be integrated into another project without the need for SP specific code.

1 files changed, 230 insertions, 0 deletions

diff --git a/Frameworks/MCPKit/MCPEntrepriseKit/MCPModel.m b/Frameworks/MCPKit/MCPEntrepriseKit/MCPModel.m
new file mode 100644
index 00000000..8f9393f2
--- /dev/null
+++ b/Frameworks/MCPKit/MCPEntrepriseKit/MCPModel.m
@@ -0,0 +1,230 @@
+//
+//  $Id: MCPModel.m 545 2009-04-10 14:49:45Z stuart02 $
+//
+//  MCPModel.m
+//  MCPKit
+//
+//  Created by Serge Cohen (serge.cohen@m4x.org) on 09/08/04.
+//  Copyright (c) 2004 Serge Cohen. All rights reserved.
+//
+//  Forked by the Sequel Pro team (sequelpro.com), April 2009
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://mysql-cocoa.sourceforge.net/>
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import "MCPModel.h"
+
+#import "MCPEntrepriseNotifications.h"
+
+#import "MCPClassDescription.h"
+#import "MCPAttribute.h"
+#import "MCPRelation.h"
+
+@implementation MCPModel
+
+#pragma mark Class methods
++ (void) initialize
+{
+	if (self = [MCPModel class]) {
+		[self setVersion:010101]; // Ma.Mi.Re -> MaMiRe
+	}
+	return;
+}
+
+#pragma mark Life cycle
+- (id) initWithName:(NSString *) iName
+{
+	self = [super init];
+	if (self) {
+		[self setName:iName];
+		classDescriptions = [[NSMutableArray alloc] init];
+	}
+	
+	return self;
+}
+
+- (void) dealloc
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	[name release];
+	[classDescriptions release];
+	[super dealloc];
+}
+
+#pragma mark NSCoding protocol
+- (id) initWithCoder:(NSCoder *) decoder
+{
+	self = [super init];
+	if ((self) && ([decoder allowsKeyedCoding])) {
+		[self setName:[decoder decodeObjectForKey:@"MCPname"]];
+		[self setClassDescriptions:[decoder decodeObjectForKey:@"MCPclassDescriptions"]];
+		[self setUsesInnoDBTables:[decoder decodeBoolForKey:@"MCPusesInnoDBTables"]];
+	}
+	else {
+		NSLog(@"For some reason, unable to decode MCPModel from the coder!!!");
+	}
+
+	return self;
+}
+
+- (void) encodeWithCoder:(NSCoder *) encoder
+{
+	if (! [encoder allowsKeyedCoding]) {
+		NSLog(@"In MCPModel -encodeWithCoder : Unable to encode to a non-keyed encoder!!, will not perform encoding!!");
+		return;
+	}
+//   [super encodeWithCoder:encoder];
+	[encoder encodeObject:[self name] forKey:@"MCPname"];
+	[encoder encodeObject:[self classDescriptions] forKey:@"MCPclassDescriptions"];
+	[encoder encodeBool:[self usesInnoDBTables] forKey:@"MCPusesInnoDBTables"];
+	[encoder encodeObject:@"1.1.1" forKey:@"MCPversion"];
+	return;
+}
+
+#pragma mark Making new class description
+- (MCPClassDescription *) addNewClassDescriptionWithName:(NSString *) iName inPosition:(int) index;
+{
+	MCPClassDescription		*theClassDescription = [[MCPClassDescription alloc] initInModel:self withName:iName];
+	
+//	[self addClassDescription:theClassDescription];
+	[self insertObject:theClassDescription inClassDescriptionsAtIndex:(index < 0) ? ([self countOfClassDescriptions] + index + 1) : index];
+	[theClassDescription release];
+	return theClassDescription;
+}
+
+#pragma mark Setters
+- (void) setName:(NSString *) iName
+{
+	if (iName != name) {
+		[name release];
+		name = [iName retain];
+		[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+	}
+}
+
+- (void) setClassDescriptions:(NSArray *) iClassDescriptions
+{
+	if (iClassDescriptions != classDescriptions) {
+		[classDescriptions release];
+		classDescriptions = [[NSMutableArray alloc] initWithArray:iClassDescriptions];
+		[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+	}
+}
+
+- (void) insertObject:(MCPClassDescription *) iClassDescription inClassDescriptionsAtIndex:(unsigned int) index
+{
+	[classDescriptions insertObject:iClassDescription atIndex:index];
+	[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];	
+}
+
+- (void) removeObjectFromClassDescriptionsAtIndex:(unsigned int) index
+{
+	[classDescriptions removeObjectAtIndex:index];
+	[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+}
+
+- (void) setUsesInnoDBTables:(BOOL) iUsesInnoDB
+{
+	usesInnoDBTables = iUsesInnoDB;
+	[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+}
+
+// Deprecated : non KVC
+/*
+- (void) removeClassDescription:(MCPClassDescription *) iClassDescription
+{
+	[classDescriptions removeObject:iClassDescription];
+	[[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+}
+
+ - (void) addClassDescription:(MCPClassDescription *) iClassDescription
+ {
+	 [classDescriptions addObject:iClassDescription];
+	 [[NSNotificationCenter defaultCenter] postNotificationName:MCPModelChangedNotification object:self];
+ }
+ 
+ */
+
+#pragma mark Getters
+- (NSString *) name
+{
+	return name;
+//   return [NSString stringWithString:name];
+}
+
+- (NSArray *) classDescriptions
+{
+	return [NSArray arrayWithArray:classDescriptions];
+}
+
+- (unsigned int) countOfClassDescriptions
+{
+	return [classDescriptions count];
+}
+
+- (MCPClassDescription *) objectInClassDescriptionsAtIndex:(unsigned int) index
+{
+	return (MCPClassDescription *)((NSNotFound != index) ? [classDescriptions objectAtIndex:index] : nil);
+}
+
+- (MCPClassDescription *) classDescriptionWithClassName:(NSString *) iClassDescriptionClassName
+{
+// Given the implementation of isEqual: for the MCPClassDescription, one should be able to use NSArray method directly:
+	/*   unsigned int      i;
+	
+	for (i=0; ([classDescriptions count] != i) && (! [iClassDescriptionClassName isEqualToString:[(MCPClassDescription *) [classDescriptions objectAtIndex:i] className]]); ++i ) {
+	}
+	return (i == [classDescriptions count]) ? nil : (MCPClassDescription *)[classDescriptions objectAtIndex:i];
+	*/
+	unsigned int   theIndex = [classDescriptions indexOfObject:iClassDescriptionClassName];
+	return (NSNotFound == theIndex) ? nil : [classDescriptions objectAtIndex:theIndex];
+}
+
+- (unsigned int) indexOfClassDescription:(id) iClassDescription
+{
+	return [classDescriptions indexOfObject:iClassDescription];
+}
+
+- (BOOL) usesInnoDBTables
+{
+	return usesInnoDBTables;
+}
+
+// Deprecated : non KVC
+
+#pragma mark Output for logging
+- (NSString *) descriptionWithLocale:(NSDictionary *) locale
+{
+	return [NSString stringWithFormat:@"<MCPModel with name %@ : %p>", [self name], self];
+}
+
+#pragma mark For debugging the retain counting
+- (id) retain
+{
+	[super retain];
+
+	return self;
+}
+
+- (void) release
+{
+	[super release];
+
+	return;
+}
+
+@end