Permalink
Browse files

Merge SPDatabaseDocument (part of #2789)

  • Loading branch information...
dmoagx committed Dec 27, 2017
1 parent e86375a commit b7830d694092ba3418b803448798f9b7d9687bde
View
@@ -50,7 +50,6 @@
#import "SPCopyTable.h"
#import "SPSyntaxParser.h"
#import "SPOSInfo.h"
#import "SPPrintController.h"
#import <PSMTabBar/PSMTabBarControl.h>
#import <Sparkle/Sparkle.h>
@@ -45,7 +45,6 @@
#import "SPFavoritesController.h"
#import "SPFavoriteNode.h"
#import "SPGeneralPreferencePane.h"
#import "SPDatabaseViewController.h"
#import "SPTreeNode.h"
#import "SPFavoritesExporter.h"
#import "SPFavoritesImporter.h"
@@ -35,7 +35,7 @@
#import "SPTreeNode.h"
#import "SPFavoriteNode.h"
#import "SPGroupNode.h"
#import "SPDatabaseViewController.h"
#import "SPDatabaseDocument.h"
#import "SPSplitView.h"
#import "SPFavoriteColorSupport.h"
#import "SPColorSelectorView.h"

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -66,7 +66,7 @@
#import <pthread.h>
#import <SPMySQL/SPMySQL.h>
@interface SPCustomQuery (PrivateAPI)
@interface SPCustomQuery ()
- (id)_resultDataItemAtRow:(NSInteger)row columnIndex:(NSUInteger)column preserveNULLs:(BOOL)preserveNULLs asPreview:(BOOL)asPreview;
+ (NSString *)linkToHelpTopic:(NSString *)aTopic;
View
@@ -31,7 +31,6 @@
#import "SPDataImport.h"
#import "SPDatabaseDocument.h"
#import "SPDatabaseViewController.h"
#import "SPTablesList.h"
#import "SPTableStructure.h"
#import "SPDatabaseStructure.h"
@@ -291,7 +291,7 @@
int64_t instanceId;
}
@property (assign) NSTableView *dbTablesTableView;
@property (nonatomic, assign) NSTableView *dbTablesTableView;
#ifdef SP_CODA /* ivars */
@property (assign) SPDatabaseData* databaseDataInstance;
@@ -537,4 +537,45 @@
#endif
#pragma mark - SPDatabaseViewController
// Accessors
- (NSString *)table;
- (SPTableType)tableType;
- (BOOL)structureLoaded;
- (BOOL)contentLoaded;
- (BOOL)statusLoaded;
#ifndef SP_CODA /* method decls */
// Tab view control
- (IBAction)viewStructure:(id)sender;
- (IBAction)viewContent:(id)sender;
- (IBAction)viewQuery:(id)sender;
- (IBAction)viewStatus:(id)sender;
- (IBAction)viewRelations:(id)sender;
- (IBAction)viewTriggers:(id)sender;
#endif
- (void)setStructureRequiresReload:(BOOL)reload;
- (void)setContentRequiresReload:(BOOL)reload;
- (void)setStatusRequiresReload:(BOOL)reload;
- (void)setRelationsRequiresReload:(BOOL)reload;
// Table control
- (void)loadTable:(NSString *)aTable ofType:(SPTableType)aTableType;
#ifndef SP_CODA /* method decls */
- (NSView *)databaseView;
#endif
#pragma mark - SPPrintController
- (void)startPrintDocumentOperation;
- (void)generateHTMLForPrinting;
- (void)generateTableInfoHTMLForPrinting;
- (NSArray *)columnNames;
- (NSMutableDictionary *)connectionInformation;
@end
Oops, something went wrong.

0 comments on commit b7830d6

Please sign in to comment.