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, 183 insertions, 0 deletions

diff --git a/Frameworks/MCPKit/MCPEntrepriseKit/MCPJoin.m b/Frameworks/MCPKit/MCPEntrepriseKit/MCPJoin.m
new file mode 100644
index 00000000..cf202196
--- /dev/null
+++ b/Frameworks/MCPKit/MCPEntrepriseKit/MCPJoin.m
@@ -0,0 +1,183 @@
+//
+//  $Id: MCPJoin.m 545 2009-04-10 14:49:45Z stuart02 $
+//
+//  MCPJoin.m
+//  MCPKit
+//
+//  Created by Serge Cohen (serge.cohen@m4x.org) on 18/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 "MCPJoin.h"
+
+#import "MCPModel.h"
+#import "MCPClassDescription.h"
+#import "MCPAttribute.h"
+#import "MCPRelation.h"
+#import "MCPRelation.h"
+
+@implementation MCPJoin
+
+#pragma mark Class methods
++ (void) initialize
+{
+	if (self = [MCPJoin class]) {
+		[self setVersion:010101]; // Ma.Mi.Re -> MaMiRe
+	}
+	return;
+}
+
+#pragma mark Life cycle
+- (id) initForRelation:(MCPRelation *) iRelation from:(MCPAttribute *) iOrigin to:(MCPAttribute *) iDestination;
+{
+	self = [super init];
+	if (self) {
+		relation = iRelation;
+		[self setOrigin:iOrigin];
+		[self setDestination:iDestination];
+	}
+	return self;
+}
+
+- (void) invalidate
+{
+	[self retain];
+	NSLog(@"Enterring -[MCPJoin invalidate], retain count is %u (after retaining : should be 4)", [self retainCount]);
+	[origin removeObjectFromJoinsAtIndex:[origin indexOfJoinIdenticalTo:self]];
+	[destination removeObjectFromJoinsAtIndex:[destination indexOfJoinIdenticalTo:self]];
+	[relation removeObjectFromJoinsAtIndex:[relation indexOfJoinIdenticalTo:self]];
+	NSLog(@"Enterring -[MCPJoin invalidate], retain count is %u (before releasing : should be 1)", [self retainCount]);
+	[self release];
+	return;
+}
+
+- (void) dealloc
+{
+	// Nothing to release, because the attributes are NOT retained.
+	[super dealloc];
+}
+
+#pragma mark NSCoding protocol
+- (id) initWithCoder:(NSCoder *) decoder
+{
+	self = [super init];
+	if ((self) && ([decoder allowsKeyedCoding])) {
+		relation = [decoder decodeObjectForKey:@"MCPrelation"];
+		[self setOrigin:[decoder decodeObjectForKey:@"MCPorigin"]];
+		[self setDestination:[decoder decodeObjectForKey:@"MCPdestination"]];
+	}
+	else {
+		NSLog(@"For some reason, unable to decode MCPJoin from the coder!!!");
+	}
+	return self;
+}
+
+- (void) encodeWithCoder:(NSCoder *) encoder
+{
+	if (! [encoder allowsKeyedCoding]) {
+		NSLog(@"In MCPJoin -encodeWithCoder : Unable to encode to a non-keyed encoder!!, will not perform encoding!!");
+		return;
+	}
+	[encoder encodeObject:[self relation] forKey:@"MCPrelation"];
+	[encoder encodeObject:[self origin] forKey:@"MCPorigin"];
+	[encoder encodeObject:[self destination] forKey:@"MCPdestination"];
+}
+
+#pragma mark Setters
+- (void) setOrigin:(MCPAttribute *) iOrigin
+{
+	if (origin != iOrigin) {
+		if (origin) {
+			[origin removeObjectFromJoinsAtIndex:[origin indexOfJoinIdenticalTo:self]];
+		}
+		origin = iOrigin;
+		if (origin) {
+			[origin insertObject:self inJoinsAtIndex:[origin countOfJoins]];
+		}
+	}
+}
+
+- (void) setDestination:(MCPAttribute *) iDestination
+{
+	if (destination != iDestination) {
+		if (destination) {
+			[destination removeObjectFromJoinsAtIndex:[destination indexOfJoinIdenticalTo:self]];
+		}
+		destination = iDestination;
+		if (destination) {
+			[destination insertObject:self inJoinsAtIndex:[destination countOfJoins]];
+		}
+	}
+}
+
+#pragma mark Getters
+- (MCPRelation *) relation
+{
+	return relation;
+}
+
+- (MCPAttribute *) origin
+{
+	return origin;
+}
+
+- (MCPAttribute *) destination
+{
+	return destination;
+}
+
+- (unsigned int) index
+{
+	return [relation indexOfJoinIdenticalTo:self];
+}
+
+#pragma mark Some general methods:
+- (BOOL) isEqual:(id) iObject
+{
+	if ([iObject isKindOfClass:[MCPJoin class]]) {
+		MCPJoin				*theJoin = (MCPJoin *)iObject;
+		
+		return ([relation isEqual:[theJoin relation]]) && ([origin isEqual:[theJoin origin]]) && ([destination isEqual:[theJoin destination]]);
+	}
+	if ([iObject isKindOfClass:[NSDictionary class]]) {
+		NSDictionary		*theDict = (NSDictionary *)iObject;
+		
+		return ([relation isEqual:[theDict valueForKey:@"relation"]]) && ([origin isEqual:[theDict valueForKey:@"origin"]]) && ([destination isEqual:[theDict valueForKey:@"destination"]]);
+	}
+	return NO;
+}
+
+#pragma mark For debugging the retain counting
+- (id) retain
+{
+	[super retain];
+
+	return self;
+}
+
+- (void) release
+{
+	[super release];
+	
+	return;
+}
+
+@end