Final feature work on the SPMySQL branch before merging:

 - Add a ping keepalive managing object to prevent retain cycles from the NSTimer
 - Add -[SPMySQLConnection copy] support
 - Refactor Hans-Jörg Bibiko's database structure retrieval, moving it out of the MySQL framework and building it around a copy of the connection.  This reduces the amount of connections-over-time used by Sequel Pro to two constant connections (addressing Issue #1097) and improves robustness.
 - Use the database structure retrieval connection for faster query cancellation without an extra connection required, if possible

1 files changed, 57 insertions, 0 deletions

diff --git a/Source/SPDatabaseStructure.h b/Source/SPDatabaseStructure.h
new file mode 100644
index 00000000..2b2d6977
--- /dev/null
+++ b/Source/SPDatabaseStructure.h
@@ -0,0 +1,57 @@
+//
+//  $Id$
+//
+//  SPDatabaseStructure.h
+//  sequel-pro
+//
+//  Created by Hans-Jörg Bibiko on March 25, 2010
+//  Copyright (c) 2010 Hans-Jörg Bibiko. All rights reserved.
+//
+//  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://code.google.com/p/sequel-pro/>
+
+@class SPMySQLConnection, SPDatabaseDocument;
+
+@interface SPDatabaseStructure : NSObject {
+	SPDatabaseDocument *delegate;
+	SPMySQLConnection *mySQLConnection;
+
+	NSMutableDictionary *structure;
+	NSMutableArray *allKeysofDbStructure;
+
+	NSMutableArray *structureRetrievalThreads;
+
+	pthread_mutex_t threadManagementLock;
+	pthread_mutex_t dataLock;
+	pthread_mutex_t connectionCheckLock;
+}
+
+// Setup
+- (id)initWithDelegate:(SPDatabaseDocument *)theDelegate;
+- (void)setConnectionToClone:(SPMySQLConnection *)aConnection;
+
+// Information
+- (SPMySQLConnection *)connection;
+
+// Structure retrieval from the server
+- (void)queryDbStructureWithUserInfo:(NSDictionary*)userInfo;
+- (BOOL)isQueryingDatabaseStructure;
+
+// Structure information
+- (NSDictionary *)structure;
+- (NSArray *)allStructureKeys;
+
+@end