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

diff --git a/Frameworks/MCPKit/MCPEntrepriseKit/MCPClassDescription+MCPEntreprise.m b/Frameworks/MCPKit/MCPEntrepriseKit/MCPClassDescription+MCPEntreprise.m
new file mode 100644
index 00000000..4c912a1f
--- /dev/null
+++ b/Frameworks/MCPKit/MCPEntrepriseKit/MCPClassDescription+MCPEntreprise.m
@@ -0,0 +1,186 @@
+//
+//  $Id: MCPClassDescription+MCPEntreprise.m 927 2009-06-24 10:53:07Z stuart02 $
+//
+//  MCPClassDescription+MCPEntreprise.m
+//  MCPKit
+//
+//  Created by Serge Cohen (serge.cohen@m4x.org) on 01/11/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 "MCPClassDescription+MCPEntreprise.h"
+
+#import "MCPAttribute.h"
+#import "MCPRelation.h"
+
+@implementation MCPClassDescription (MCPEntreprise)
+
+#pragma mark Pseudo getters (for NSClassDescription overload)
+- (NSArray *) attributeKeys
+{
+	NSArray				*theRet;
+   NSMutableArray		*theKeys =[[NSMutableArray alloc] init];
+   unsigned int		i;
+
+	for (i=0; i != [self countOfAttributes]; ++i) {
+		[theKeys insertObject:[(MCPAttribute *)[self objectInAttributesAtIndex:i] name] atIndex:i];
+	}
+	theRet = [NSArray arrayWithArray:theKeys];
+	[theKeys release];
+	return theRet;	
+}
+
+- (NSString *) inverseRelationshipKey:(NSString *) relationshipKey
+{
+	unsigned int		index = [self indexOfRelation:relationshipKey];
+
+	if (NSNotFound != index) {
+		MCPRelation			*theRelation;
+
+		theRelation = (MCPRelation *)[self objectInRelationsAtIndex:index];
+		return [[theRelation inverseRelation] name];
+	}
+	return nil;
+}
+
+- (NSArray *) toManyRelationshipKeys
+{
+	NSArray				*theRet;
+	NSMutableArray		*theToManyRel = [[NSMutableArray alloc] init];
+	unsigned int		i, j;
+
+	j=0;
+	for (i=0; i != [self countOfRelations]; ++i) {
+		MCPRelation		*theRelation = (MCPRelation *)[self objectInRelationsAtIndex:i];
+
+		if ([theRelation isToMany]) {
+			[theToManyRel insertObject:[theRelation name] atIndex:j];
+			++j;
+		}
+	}
+	theRet = [NSArray arrayWithArray:theToManyRel];
+	[theToManyRel release];
+	return theRet;
+}
+
+- (NSArray *) toOneRelationshipKeys;
+{
+	NSArray				*theRet;
+	NSMutableArray		*theToOneRel = [[NSMutableArray alloc] init];
+	unsigned int		i, j;
+	
+	j=0;
+	for (i=0; i != [self countOfRelations]; ++i) {
+		MCPRelation		*theRelation = (MCPRelation *)[self objectInRelationsAtIndex:i];
+		
+		if (! [theRelation isToMany]) {
+			[theToOneRel insertObject:[theRelation name] atIndex:j];
+			++j;
+		}
+	}
+	theRet = [NSArray arrayWithArray:theToOneRel];
+	[theToOneRel release];
+	return theRet;
+}
+
+#pragma mark Specifics for MCPObject
+- (NSArray *) primaryKeyAttributes
+{
+	NSMutableArray		*theRet = [NSMutableArray array];
+	unsigned int		i, j;
+
+	j = 0;
+	for (i=0; i != [self countOfAttributes]; ++i) {
+		MCPAttribute	*theAttribute = (MCPAttribute *)[self objectInAttributesAtIndex:i];
+
+		if ([theAttribute isPartOfKey]) {
+			[theRet insertObject:theAttribute atIndex:j];
+			++j;
+		}
+	}
+	return (NSArray *)theRet;
+}
+
+- (NSArray *) identityAttributes
+{
+	NSMutableArray		*theRet = [NSMutableArray array];
+	unsigned int		i, j;
+	
+	j = 0;
+	for (i=0; i != [self countOfAttributes]; ++i) {
+		MCPAttribute	*theAttribute = (MCPAttribute *)[self objectInAttributesAtIndex:i];
+		
+		if ([theAttribute isPartOfIdentity]) {
+			[theRet insertObject:theAttribute atIndex:j];
+			++j;
+		}
+	}
+	return (NSArray *)theRet;
+}
+
+- (MCPAttribute *) attributeWithName: (NSString *) iName
+{
+// This type of implementation is NOT working : most likely the isEqual method is called on iName rather than on the objects of the array
+/*
+	unsigned int		index = [self indexOfAttribute:iName];
+
+	return (NSNotFound != index) ? (MCPAttribute *)[self objectInAttributesAtIndex:index] : nil ;
+*/
+	unsigned int		i;
+	
+	for (i = 0; [attributes count] != i; ++i) {
+		if ([[(MCPAttribute *)[attributes objectAtIndex:i] name] isEqualToString:iName]) {
+			return (MCPAttribute *)[attributes objectAtIndex:i];
+		}
+	}
+	return nil;
+}
+
+- (MCPRelation *) relationWithName:(NSString *) iRelationName
+{
+// This type of implementation is NOT working : most likely the isEqual method is called on iName rather than on the objects of the array
+/*	unsigned int		index = [relations indexOfObject:iRelationName];
+	
+	return (NSNotFound != index) ? (MCPRelation *)[relations objectAtIndex:index] : nil;
+*/
+	unsigned int		i;
+
+	for (i = 0; [relations count] != i; ++i) {
+		if ([[(MCPRelation *)[relations objectAtIndex:i] name] isEqualToString:iRelationName]) {
+			return (MCPRelation *)[relations objectAtIndex:i];
+		}
+	}
+	return nil;
+}
+
+- (BOOL) singleIntAutoGenKey
+{
+	NSArray		*theKeys = [self primaryKeyAttributes];
+
+	if (1 == [theKeys count]) {
+		MCPAttribute		*theSingleKey = (MCPAttribute *)[theKeys objectAtIndex:0];
+
+		return [theSingleKey autoGenerated] && [[theSingleKey externalType] isEqualToString:@"INT"];
+	}
+	return NO;
+}
+
+@end