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

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPResult.h b/Frameworks/MCPKit/MCPFoundationKit/MCPResult.h
new file mode 100644
index 00000000..b833e0ca
--- /dev/null
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPResult.h
@@ -0,0 +1,85 @@
+//
+//  $Id: MCPResult.h 1065 2009-07-19 10:58:17Z stuart02 $
+//
+//  MCPResult.h
+//  MCPKit
+//
+//  Created by Serge Cohen (serge.cohen@m4x.org) on 08/12/2002.
+//  Copyright (c) 2001 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 <Foundation/Foundation.h>
+#import "MCPConstants.h"
+
+#import "mysql.h"
+
+#define MAGIC_BINARY_CHARSET_NR 63
+
+@interface MCPResult : NSObject 
+{
+	MYSQL_RES		 *mResult;		 /* The MYSQL_RES structure of the C API. */
+	NSArray			 *mNames;		 /* An NSArray holding the name of the columns. */
+	NSDictionary	 *mMySQLLocales; /* A Locales dictionary to define the locales of MySQL. */
+	NSStringEncoding mEncoding;		 /* The encoding used by MySQL server, to ISO-1 default. */
+	unsigned int	 mNumOfFields;	 /* The number of fields in the result. */
+	NSTimeZone		 *mTimeZone;	 /* The time zone of the connection when the query was made. */
+}
+
+// Initialization
+- (id)initWithMySQLPtr:(MYSQL *)mySQLPtr encoding:(NSStringEncoding)theEncoding timeZone:(NSTimeZone *)iTimeZone;
+- (id)initWithResPtr:(MYSQL_RES *)mySQLResPtr encoding:(NSStringEncoding)theEncoding timeZone:(NSTimeZone *)iTimeZone;
+
+// Result info
+- (my_ulonglong)numOfRows;
+- (unsigned int)numOfFields;
+
+// Rows
+- (void)dataSeek:(my_ulonglong)row;
+- (id)fetchRowAsType:(MCPReturnType) aType;
+- (NSArray *)fetchRowAsArray;
+- (NSDictionary *)fetchRowAsDictionary;
+
+// Columns
+- (NSArray *)fetchFieldNames;
+- (id)fetchTypesAsType:(MCPReturnType)aType;
+- (NSArray *)fetchTypesAsArray;
+- (NSDictionary *)fetchTypesAsDictionary;
+- (NSArray *)fetchResultFieldsStructure;
+
+- (unsigned int)fetchFlagsAtIndex:(unsigned int)index;
+- (unsigned int)fetchFlagsForKey:(NSString *)key;
+
+- (BOOL)isBlobAtIndex:(unsigned int)index;
+- (BOOL)isBlobForKey:(NSString *)key;
+
+// Conversion
+- (NSString *)stringWithText:(NSData *)theTextData;
+- (const char *)cStringFromString:(NSString *)theString;
+- (NSString *)stringWithCString:(const char *)theCString;
+
+// Other
+- (NSString *)mysqlTypeToStringForType:(unsigned int)type withCharsetNr:(unsigned int)charsetnr withFlags:(unsigned int)flags withLength:(unsigned long long)length;
+- (NSString *)mysqlTypeToGroupForType:(unsigned int)type withCharsetNr:(unsigned int)charsetnr withFlags:(unsigned int)flags;
+- (NSString *)findCharsetName:(unsigned int)charsetnr;
+- (NSString *)findCharsetCollation:(unsigned int)charsetnr;
+- (unsigned int)findCharsetMaxByteLengthPerChar:(unsigned int)charsetnr;
+
+@end