Skip to content

Commit a9f0edb

Browse files
committed
#2705: FULLTEXT indexes should not require a column size prefix.
1 parent 8b6dc62 commit a9f0edb

File tree

2 files changed

+84
-146
lines changed

2 files changed

+84
-146
lines changed

Source/SPIndexesController.h

+3-21
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@
3535
@class SPMySQLConnection;
3636
@class SPTableView;
3737

38-
@interface SPIndexesController : NSWindowController
39-
#ifdef SP_CODA
40-
<NSTableViewDelegate, NSTableViewDataSource>
41-
#endif
38+
@interface SPIndexesController : NSWindowController <NSTableViewDelegate, NSTableViewDataSource>
4239
{
4340
// Controllers
4441
IBOutlet SPDatabaseDocument *dbDocument;
@@ -62,7 +59,6 @@
6259
IBOutlet NSButton *addIndexedColumnButton;
6360
IBOutlet NSButton *removeIndexedColumnButton;
6461
IBOutlet NSButton *confirmAddIndexButton;
65-
#ifndef SP_CODA
6662
IBOutlet NSBox *anchoredButtonBar;
6763

6864
// Advanced options view
@@ -71,40 +67,26 @@
7167
IBOutlet NSButton *indexAdvancedOptionsViewLabelButton;
7268
IBOutlet NSPopUpButton *indexStorageTypePopUpButton;
7369
IBOutlet NSTextField *indexKeyBlockSizeTextField;
74-
#endif
7570

76-
BOOL _mainNibLoaded;
71+
BOOL mainNibLoaded;
7772
BOOL isMyISAMTable;
7873
BOOL isInnoDBTable;
7974
NSString *table;
8075

8176
NSMutableArray *fields, *indexes, *indexedFields;
8277
NSArray *supportsLength, *requiresLength;
8378

84-
#ifndef SP_CODA /* ivars */
8579
NSUserDefaults *prefs;
86-
#endif
8780

8881
SPMySQLConnection *connection;
89-
90-
#ifndef SP_CODA /* ivars */
82+
9183
BOOL showAdvancedView;
9284

9385
NSInteger heightOffset;
9486
NSUInteger windowMinWidth;
9587
NSUInteger windowMinHeigth;
96-
#endif
9788
}
9889

99-
#ifdef SP_CODA
100-
@property (assign) SPTableView* indexesTableView;
101-
@property (assign) SPTableStructure* tableStructure;
102-
@property (assign) NSButton* addIndexButton;
103-
@property (assign) NSButton* removeIndexButton;
104-
105-
- (void)setDatabaseDocument:(SPDatabaseDocument*)db;
106-
#endif
107-
10890
/**
10991
* @property table The table currently being viewed
11092
*/

0 commit comments

Comments
 (0)