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

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPFastQueries.m b/Frameworks/MCPKit/MCPFoundationKit/MCPFastQueries.m
new file mode 100644
index 00000000..951d29af
--- /dev/null
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPFastQueries.m
@@ -0,0 +1,113 @@
+//
+//  $Id: MCPFastQueries.m 1056 2009-07-18 10:42:29Z stuart02 $
+//
+//  MCPFastQueries.m
+//  MCPKit
+//
+//  Created by Serge Cohen (serge.cohen@m4x.org) on 03/06/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 "MCPFastQueries.h"
+#import "MCPResultPlus.h"
+
+/**
+ * This actegory is made up to keep the extra methods out or the core of the framework.
+ *
+ * Basicly this is the place to add methods which are useful, but are just wrappers to the methods of the 
+ * core (MCPConnection, MCPResult). The purpous being to have a single line call available for current tasks 
+ * which otherwise would need a couple of lines and object defined.
+ */
+@implementation MCPConnection (MCPFastQueries)
+
+/**
+ * Send the query aQuery to the server and retrieve the row id if the table have a autoincrement column.
+ * Returns 0 if nothing have been inserted.
+ */
+- (my_ulonglong)insertQuery:(NSString *)query
+{	
+	[self queryString:query];
+	
+    return [self insertId];
+}
+
+/**
+ * Send the query aQuery to the server and retrieve the number of affected rows (should work with !{update}, 
+ * !{delete}, !{insert} and !{select} type of queries).
+ *
+ * NB: This can also be used with a !{select} query if you are only interested in the number of row complying 
+ * with the query; you'll get no chance to get the result from the query, except by sending the query 
+ * again (with !{queryString:})
+ */
+- (my_ulonglong)updateQuery:(NSString *)query
+{	
+	[self queryString:query];
+	
+    return [self affectedRows];
+}
+
+/**
+ * Get the first field of the first row of the result from the query (aQuery). Should return nil if no object 
+ * at all are selected.
+ */
+- (id)getFirstFieldFromQuery:(NSString *)query
+{	
+    return [[[self queryString:query] fetchRowAsType:MCPTypeArray] objectAtIndex:0];
+}
+
+/**
+ * Get the firdst row of the result from the query aQuery, in a collection of type determined by aType 
+ * (MCPTypeArray or MCPTypeDictionary)
+ */
+- (id) getFirstRowFromQuery:(NSString *)query asType:(MCPReturnType)type
+{	
+    return [[self queryString:query] fetchRowAsType:type];
+}
+
+/**
+ * Get a bidimensional table of the whole rows of the result from the query aQuery. The type of the result is 
+ * choosen by aType, it can be (MCPTypeArray, MCPTypeDictionary, MCPTypeFlippedArray & MCPTypeFlippedDictionary). 
+ * Description of the types can be found in method !{fetch2DResultAsType:}.
+ */
+- (id)getAllRowsFromQuery:(NSString *)query asType:(MCPReturnType)type
+
+{   
+	return [[self queryString:query] fetch2DResultAsType:type];
+}
+
+/**
+ * Get a column (as an NSArray) of the result from the query aQuery. The column is choosen from it's index, 
+ * starting from 0.
+ */
+- (NSArray *)getQuery:(NSString *)query colWithIndex:(unsigned int)col
+{    
+	return [[self queryString:query] fetchColAtIndex:col];
+}
+
+/**
+ * Get a column (as an NSArray) of the result from the query aQuery. The column is choosen from it's name.
+ */
+- (NSArray *)getQuery:(NSString *)query colWithName:(NSString *)colName
+{    
+	return [[self queryString:query] fetchColWithName:colName];
+}
+
+@end