merge SPQueryController (part of #2789)

sequelpro · Jan 20, 2018 · 2602f2abd70c2e83a50099fca0141c241552f68f · 2602f2a
1 parent 0b09642
commit 2602f2abd70c2e83a50099fca0141c241552f68f
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
@@ -32,7 +32,6 @@
 #import "ImageAndTextCell.h"
 #import "RegexKitLite.h"
 #import "SPQueryController.h"
-#import "SPQueryDocumentsController.h"
 #import "SPDatabaseDocument.h"
 #import "SPTableContent.h"
 #import "SPConnectionController.h"

diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
@@ -46,7 +46,6 @@
 #import "SPQueryFavoriteManager.h"
 #endif
 #import "SPQueryController.h"
-#import "SPQueryDocumentsController.h"
 #import "SPEncodingPopupAccessory.h"
 #import "SPDataStorage.h"
 #import "SPAlertSheets.h"

diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
@@ -43,7 +43,6 @@
 #import "SPExportController.h"
 #import "SPSplitView.h"
 #import "SPQueryController.h"
-#import "SPQueryDocumentsController.h"
 #import "SPWindowController.h"
 #import "SPNavigatorController.h"
 #import "SPSQLParser.h"

diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m
@@ -38,7 +38,6 @@
 #import "SPQueryController.h"
 #import "RegexKitLite.h"
 #import "SPTextView.h"
-#import "SPQueryDocumentsController.h"
 #import "SPDatabaseStructure.h"
 
 #pragma mark -

diff --git a/Source/SPQueryConsoleDataSource.h b/Source/SPQueryConsoleDataSource.h
diff --git a/Source/SPQueryConsoleDataSource.m b/Source/SPQueryConsoleDataSource.m
diff --git a/Source/SPQueryController.h b/Source/SPQueryController.h
@@ -120,4 +120,36 @@ extern NSString *SPTableViewDatabaseColumnID;
  */
 - (NSString *)sqlStringForRowIndexes:(NSIndexSet *)indexes;
 
+#pragma mark - SPQueryControllerInitializer
+
+- (NSError *)loadCompletionLists;
+
+#pragma mark - SPQueryDocumentsController
+
+- (NSURL *)registerDocumentWithFileURL:(NSURL *)fileURL andContextInfo:(NSMutableDictionary *)contextInfo;
+- (void)removeRegisteredDocumentWithFileURL:(NSURL *)fileURL;
+
+- (void)addFavorite:(NSDictionary *)favorite forFileURL:(NSURL *)fileURL;
+- (void)replaceFavoritesByArray:(NSArray *)favoritesArray forFileURL:(NSURL *)fileURL;
+- (void)removeFavoriteAtIndex:(NSUInteger)index forFileURL:(NSURL *)fileURL;
+- (void)insertFavorite:(NSDictionary *)favorite atIndex:(NSUInteger)index forFileURL:(NSURL *)fileURL;
+
+- (void)addHistory:(NSString *)history forFileURL:(NSURL *)fileURL;
+- (void)replaceHistoryByArray:(NSArray *)historyArray forFileURL:(NSURL *)fileURL;
+
+- (void)replaceContentFilterByArray:(NSArray *)contentFilterArray ofType:(NSString *)filterType forFileURL:(NSURL *)fileURL;
+
+- (NSMutableArray *)favoritesForFileURL:(NSURL *)fileURL;
+- (NSMutableArray *)historyForFileURL:(NSURL *)fileURL;
+- (NSArray *)historyMenuItemsForFileURL:(NSURL *)fileURL;
+- (NSUInteger)numberOfHistoryItemsForFileURL:(NSURL *)fileURL;
+- (NSMutableDictionary *)contentFilterForFileURL:(NSURL *)fileURL;
+
+- (NSArray *)queryFavoritesForFileURL:(NSURL *)fileURL andTabTrigger:(NSString *)tabTrigger includeGlobals:(BOOL)includeGlobals;
+
+// Completion list controller
+- (NSArray*)functionList;
+- (NSArray*)keywordList;
+- (NSString*)argumentSnippetForFunction:(NSString*)func;
+
 @end