aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-02-25 22:46:54 +0000
committerBibiko <bibiko@eva.mpg.de>2010-02-25 22:46:54 +0000
commit947cb3e7725ee0e67cd0b2a22c34c5c1122d6cc3 (patch)
treea651086f83f8c98d96c72b3b624d56bd0608e4db
parent429879a5060d5fe0a27794a1e53b131ab04dba91 (diff)
downloadsequelpro-947cb3e7725ee0e67cd0b2a22c34c5c1122d6cc3.tar.gz
sequelpro-947cb3e7725ee0e67cd0b2a22c34c5c1122d6cc3.tar.bz2
sequelpro-947cb3e7725ee0e67cd0b2a22c34c5c1122d6cc3.zip
• Query Favorites:
- added snippet variable $SP_SELECTED_TABLES which inserts `table1`,`table2`, etc. (ONLY tables) • improved "Check Table" - now one can select more than one table to execute "CHECK TABLE table1,table2,… ; if all tables passed successfully alert OK, if not show the result as accessory table in the sheet note: OPTIMIZE, REPAIR, FLUSH, CHECKSUM, ANALYZE follow
-rw-r--r--Interfaces/English.lproj/DBView.xib988
-rw-r--r--Source/CMTextView.m13
-rw-r--r--Source/CustomQuery.h1
-rw-r--r--Source/TableDocument.h5
-rw-r--r--Source/TableDocument.m108
-rw-r--r--Source/TablesList.h2
-rw-r--r--Source/TablesList.m34
7 files changed, 1007 insertions, 144 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 1abd20f6..68f621b8 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,8 +23,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="6885"/>
<integer value="6180"/>
- <integer value="1246"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -63,7 +63,7 @@
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{780, 480}</string>
<object class="NSView" key="NSWindowView" id="579726586">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3834,29 +3834,6 @@
<object class="NSTextView" id="69074373">
<reference key="NSNextResponder" ref="78677381"/>
<int key="NSvFlags">2322</int>
- <object class="NSMutableSet" key="NSDragTypes">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="set.sortedObjects">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>Apple HTML pasteboard type</string>
- <string>Apple PDF pasteboard type</string>
- <string>Apple PICT pasteboard type</string>
- <string>Apple PNG pasteboard type</string>
- <string>Apple URL pasteboard type</string>
- <string>CorePasteboardFlavorType 0x6D6F6F76</string>
- <string>NSColor pasteboard type</string>
- <string>NSFilenamesPboardType</string>
- <string>NSStringPboardType</string>
- <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
- <string>NeXT RTFD pasteboard type</string>
- <string>NeXT Rich Text Format v1.0 pasteboard type</string>
- <string>NeXT TIFF v4.0 pasteboard type</string>
- <string>NeXT font pasteboard type</string>
- <string>NeXT ruler pasteboard type</string>
- <string>WebURLsWithTitlesPboardType</string>
- <string>public.url</string>
- </object>
- </object>
<string key="NSFrameSize">{542, 14}</string>
<reference key="NSSuperview" ref="78677381"/>
<object class="NSTextContainer" key="NSTextContainer" id="708157837">
@@ -5492,7 +5469,6 @@
</object>
</object>
<string key="NSFrameSize">{944, 550}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{780, 502}</string>
@@ -8749,7 +8725,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="860968037">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8758,6 +8734,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">264</int>
<string key="NSFrame">{{20, 233}, {140, 14}}</string>
<reference key="NSSuperview" ref="860968037"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="326519111">
<int key="NSCellFlags">67239424</int>
@@ -8784,6 +8761,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{352, 14}</string>
<reference key="NSSuperview" ref="158897172"/>
+ <reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="197710090">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -8833,6 +8811,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {352, 178}}</string>
<reference key="NSSuperview" ref="972781700"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="347971361"/>
<reference key="NSDocView" ref="347971361"/>
<reference key="NSBGColor" ref="449903125"/>
@@ -8844,6 +8823,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{353, 1}, {11, 178}}</string>
<reference key="NSSuperview" ref="972781700"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="972781700"/>
<string key="NSAction">_doScroller:</string>
@@ -8854,6 +8834,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="972781700"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="972781700"/>
<string key="NSAction">_doScroller:</string>
@@ -8863,6 +8844,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 45}, {365, 180}}</string>
<reference key="NSSuperview" ref="860968037"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="158897172"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="84024470"/>
@@ -8874,6 +8856,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{314, 13}, {76, 28}}</string>
<reference key="NSSuperview" ref="860968037"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="693776804">
<int key="NSCellFlags">67239424</int>
@@ -8895,6 +8878,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">257</int>
<string key="NSFrame">{{350, -130}, {80, 28}}</string>
<reference key="NSSuperview" ref="860968037"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="725784088">
<int key="NSCellFlags">67239424</int>
@@ -8913,6 +8897,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{405, 267}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -11439,97 +11425,226 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSFrameSize">{110, 20}</string>
<string key="NSClassName">NSView</string>
</object>
- <object class="NSCustomView" id="532635418">
- <nil key="NSNextResponder"/>
- <int key="NSvFlags">4364</int>
+ <object class="NSCustomView" id="260025442">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSSearchField" id="57646700">
- <reference key="NSNextResponder" ref="532635418"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{20, 1}, {176, 19}}</string>
- <reference key="NSSuperview" ref="532635418"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSearchFieldCell" key="NSCell" id="1072338815">
- <int key="NSCellFlags">343014976</int>
- <int key="NSCellFlags2">272794624</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="26"/>
- <string key="NSPlaceholderString">Filter</string>
- <reference key="NSControlView" ref="57646700"/>
- <bool key="NSDrawsBackground">YES</bool>
- <int key="NSTextBezelStyle">1</int>
- <reference key="NSBackgroundColor" ref="480189472"/>
- <reference key="NSTextColor" ref="454249633"/>
- <object class="NSButtonCell" key="NSSearchButtonCell">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">search</string>
- <reference key="NSControlView" ref="57646700"/>
- <string key="NSAction">_searchFieldSearch:</string>
- <reference key="NSTarget" ref="1072338815"/>
- <int key="NSButtonFlags">138690815</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- <object class="NSButtonCell" key="NSCancelButtonCell">
- <int key="NSCellFlags">130560</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">clear</string>
- <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <object class="NSScrollView" id="880498064">
+ <reference key="NSNextResponder" ref="260025442"/>
+ <int key="NSvFlags">274</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSClipView" id="361281463">
+ <reference key="NSNextResponder" ref="880498064"/>
+ <int key="NSvFlags">2304</int>
+ <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableDictionary">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>AXDescription</string>
- <string>NSAccessibilityEncodedAttributesValueType</string>
+ <object class="NSTableView" id="999861934">
+ <reference key="NSNextResponder" ref="361281463"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{358, 117}</string>
+ <reference key="NSSuperview" ref="361281463"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTableHeaderView" key="NSHeaderView" id="956714173">
+ <reference key="NSNextResponder" ref="107516071"/>
+ <int key="NSvFlags">256</int>
+ <string key="NSFrameSize">{358, 17}</string>
+ <reference key="NSSuperview" ref="107516071"/>
+ <reference key="NSTableView" ref="999861934"/>
</object>
- <object class="NSMutableArray" key="dict.values">
+ <object class="_NSCornerView" key="NSCornerView" id="907428034">
+ <reference key="NSNextResponder" ref="880498064"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{344, 0}, {16, 17}}</string>
+ <reference key="NSSuperview" ref="880498064"/>
+ </object>
+ <object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>cancel</string>
- <integer value="1"/>
+ <object class="NSTableColumn" id="213743804">
+ <string key="NSIdentifier">table_name</string>
+ <double key="NSWidth">101</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Item</string>
+ <reference key="NSSupport" ref="26"/>
+ <object class="NSColor" key="NSBackgroundColor" id="960642700">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="222976159"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="924386780">
+ <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Text Cell</string>
+ <reference key="NSSupport" ref="244931163"/>
+ <reference key="NSControlView" ref="999861934"/>
+ <reference key="NSBackgroundColor" ref="1024678221"/>
+ <reference key="NSTextColor" ref="454249633"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="999861934"/>
+ </object>
+ <object class="NSTableColumn" id="400624193">
+ <string key="NSIdentifier">msg_status</string>
+ <double key="NSWidth">69</double>
+ <double key="NSMinWidth">40</double>
+ <double key="NSMaxWidth">1000</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Status</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSBackgroundColor" ref="960642700"/>
+ <reference key="NSTextColor" ref="222976159"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="229315620">
+ <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Text Cell</string>
+ <reference key="NSSupport" ref="244931163"/>
+ <reference key="NSControlView" ref="999861934"/>
+ <reference key="NSBackgroundColor" ref="1024678221"/>
+ <reference key="NSTextColor" ref="454249633"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="999861934"/>
+ </object>
+ <object class="NSTableColumn" id="140803099">
+ <string key="NSIdentifier">msg_text</string>
+ <double key="NSWidth">179</double>
+ <double key="NSMinWidth">10</double>
+ <double key="NSMaxWidth">3.4028234663852886e+38</double>
+ <object class="NSTableHeaderCell" key="NSHeaderCell">
+ <int key="NSCellFlags">75628096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Message</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSBackgroundColor" ref="299403355"/>
+ <reference key="NSTextColor" ref="222976159"/>
+ </object>
+ <object class="NSTextFieldCell" key="NSDataCell" id="635109389">
+ <int key="NSCellFlags">337772096</int>
+ <int key="NSCellFlags2">2048</int>
+ <string key="NSContents">Text Cell</string>
+ <reference key="NSSupport" ref="244931163"/>
+ <reference key="NSControlView" ref="999861934"/>
+ <reference key="NSBackgroundColor" ref="1024678221"/>
+ <reference key="NSTextColor" ref="454249633"/>
+ </object>
+ <int key="NSResizingMask">3</int>
+ <bool key="NSIsResizeable">YES</bool>
+ <reference key="NSTableView" ref="999861934"/>
+ </object>
+ </object>
+ <double key="NSIntercellSpacingWidth">3</double>
+ <double key="NSIntercellSpacingHeight">2</double>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">_sourceListBackgroundColor</string>
+ <object class="NSColor" key="NSColor">
+ <int key="NSColorSpace">1</int>
+ <bytes key="NSRGB">MC44MzkyMTU2OTU5IDAuODY2NjY2Njc0NiAwLjg5ODAzOTIyMTgAA</bytes>
+ </object>
</object>
+ <reference key="NSGridColor" ref="864903678"/>
+ <double key="NSRowHeight">17</double>
+ <int key="NSTvFlags">1388314624</int>
+ <reference key="NSDelegate"/>
+ <reference key="NSDataSource"/>
+ <int key="NSGridStyleMask">1</int>
+ <int key="NSColumnAutoresizingStyle">4</int>
+ <int key="NSDraggingSourceMaskForLocal">15</int>
+ <int key="NSDraggingSourceMaskForNonLocal">0</int>
+ <bool key="NSAllowsTypeSelect">YES</bool>
+ <int key="NSTableViewSelectionHighlightStyle">1</int>
+ <int key="NSTableViewDraggingDestinationStyle">1</int>
</object>
</object>
- <reference key="NSControlView" ref="57646700"/>
- <string key="NSAction">_searchFieldCancel:</string>
- <reference key="NSTarget" ref="1072338815"/>
- <int key="NSButtonFlags">138690815</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
+ <string key="NSFrame">{{1, 17}, {358, 117}}</string>
+ <reference key="NSSuperview" ref="880498064"/>
+ <reference key="NSNextKeyView" ref="999861934"/>
+ <reference key="NSDocView" ref="999861934"/>
+ <reference key="NSBGColor" ref="1024678221"/>
+ <int key="NScvFlags">4</int>
</object>
- <string key="NSRecentsAutosaveName">SPQueryFavoriteSearchField</string>
- <int key="NSMaximumRecents">10</int>
- <bytes key="NSSearchFieldFlags">CAAAAA</bytes>
- </object>
- </object>
- </object>
- <string key="NSFrameSize">{217, 20}</string>
+ <object class="NSScroller" id="710144066">
+ <reference key="NSNextResponder" ref="880498064"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{344, 17}, {15, 102}}</string>
+ <reference key="NSSuperview" ref="880498064"/>
+ <reference key="NSTarget" ref="880498064"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSPercent">0.87179487943649292</double>
+ </object>
+ <object class="NSScroller" id="786626704">
+ <reference key="NSNextResponder" ref="880498064"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{1, 119}, {344, 15}}</string>
+ <reference key="NSSuperview" ref="880498064"/>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="880498064"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.89276808500289917</double>
+ </object>
+ <object class="NSClipView" id="107516071">
+ <reference key="NSNextResponder" ref="880498064"/>
+ <int key="NSvFlags">2304</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="956714173"/>
+ </object>
+ <string key="NSFrame">{{1, 0}, {358, 17}}</string>
+ <reference key="NSSuperview" ref="880498064"/>
+ <reference key="NSNextKeyView" ref="956714173"/>
+ <reference key="NSDocView" ref="956714173"/>
+ <reference key="NSBGColor" ref="1024678221"/>
+ <int key="NScvFlags">4</int>
+ </object>
+ <reference ref="907428034"/>
+ </object>
+ <string key="NSFrameSize">{360, 135}</string>
+ <reference key="NSSuperview" ref="260025442"/>
+ <reference key="NSNextKeyView" ref="361281463"/>
+ <int key="NSsFlags">562</int>
+ <reference key="NSVScroller" ref="710144066"/>
+ <reference key="NSHScroller" ref="786626704"/>
+ <reference key="NSContentView" ref="361281463"/>
+ <reference key="NSHeaderClipView" ref="107516071"/>
+ <reference key="NSCornerView" ref="907428034"/>
+ <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+ </object>
+ </object>
+ <string key="NSFrameSize">{360, 135}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
- <object class="NSCustomView" id="456635389">
+ <object class="NSCustomView" id="532635418">
<nil key="NSNextResponder"/>
<int key="NSvFlags">4364</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSSearchField" id="388856443">
- <reference key="NSNextResponder" ref="456635389"/>
+ <object class="NSSearchField" id="57646700">
+ <reference key="NSNextResponder" ref="532635418"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 1}, {176, 19}}</string>
- <reference key="NSSuperview" ref="456635389"/>
+ <reference key="NSSuperview" ref="532635418"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSSearchFieldCell" key="NSCell" id="292622292">
+ <object class="NSSearchFieldCell" key="NSCell" id="1072338815">
<int key="NSCellFlags">343014976</int>
<int key="NSCellFlags2">272794624</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="26"/>
<string key="NSPlaceholderString">Filter</string>
- <reference key="NSControlView" ref="388856443"/>
+ <reference key="NSControlView" ref="57646700"/>
<bool key="NSDrawsBackground">YES</bool>
<int key="NSTextBezelStyle">1</int>
<reference key="NSBackgroundColor" ref="480189472"/>
@@ -11538,9 +11653,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">search</string>
- <reference key="NSControlView" ref="388856443"/>
+ <reference key="NSControlView" ref="57646700"/>
<string key="NSAction">_searchFieldSearch:</string>
- <reference key="NSTarget" ref="292622292"/>
+ <reference key="NSTarget" ref="1072338815"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
@@ -11567,16 +11682,16 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
</object>
- <reference key="NSControlView" ref="388856443"/>
+ <reference key="NSControlView" ref="57646700"/>
<string key="NSAction">_searchFieldCancel:</string>
- <reference key="NSTarget" ref="292622292"/>
+ <reference key="NSTarget" ref="1072338815"/>
<int key="NSButtonFlags">138690815</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
- <string key="NSRecentsAutosaveName">SPQueryHistorySearchField</string>
+ <string key="NSRecentsAutosaveName">SPQueryFavoriteSearchField</string>
<int key="NSMaximumRecents">10</int>
<bytes key="NSSearchFieldFlags">CAAAAA</bytes>
</object>
@@ -11819,6 +11934,79 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
</object>
+ <object class="NSCustomView" id="456635389">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">4364</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSSearchField" id="388856443">
+ <reference key="NSNextResponder" ref="456635389"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{20, 1}, {176, 19}}</string>
+ <reference key="NSSuperview" ref="456635389"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSSearchFieldCell" key="NSCell" id="292622292">
+ <int key="NSCellFlags">343014976</int>
+ <int key="NSCellFlags2">272794624</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="26"/>
+ <string key="NSPlaceholderString">Filter</string>
+ <reference key="NSControlView" ref="388856443"/>
+ <bool key="NSDrawsBackground">YES</bool>
+ <int key="NSTextBezelStyle">1</int>
+ <reference key="NSBackgroundColor" ref="480189472"/>
+ <reference key="NSTextColor" ref="454249633"/>
+ <object class="NSButtonCell" key="NSSearchButtonCell">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">search</string>
+ <reference key="NSControlView" ref="388856443"/>
+ <string key="NSAction">_searchFieldSearch:</string>
+ <reference key="NSTarget" ref="292622292"/>
+ <int key="NSButtonFlags">138690815</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" key="NSCancelButtonCell">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">clear</string>
+ <object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMutableDictionary">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>AXDescription</string>
+ <string>NSAccessibilityEncodedAttributesValueType</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>cancel</string>
+ <integer value="1"/>
+ </object>
+ </object>
+ </object>
+ <reference key="NSControlView" ref="388856443"/>
+ <string key="NSAction">_searchFieldCancel:</string>
+ <reference key="NSTarget" ref="292622292"/>
+ <int key="NSButtonFlags">138690815</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <string key="NSRecentsAutosaveName">SPQueryHistorySearchField</string>
+ <int key="NSMaximumRecents">10</int>
+ <bytes key="NSSearchFieldFlags">CAAAAA</bytes>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{217, 20}</string>
+ <string key="NSClassName">NSView</string>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -15912,6 +16100,46 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<int key="connectionID">6883</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">tablesListInstance</string>
+ <reference key="source" ref="601471102"/>
+ <reference key="destination" ref="438574515"/>
+ </object>
+ <int key="connectionID">6884</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">statusTableAccessoryView</string>
+ <reference key="source" ref="427689665"/>
+ <reference key="destination" ref="260025442"/>
+ </object>
+ <int key="connectionID">6897</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">statusTableView</string>
+ <reference key="source" ref="427689665"/>
+ <reference key="destination" ref="999861934"/>
+ </object>
+ <int key="connectionID">6898</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">dataSource</string>
+ <reference key="source" ref="999861934"/>
+ <reference key="destination" ref="427689665"/>
+ </object>
+ <int key="connectionID">6899</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">delegate</string>
+ <reference key="source" ref="999861934"/>
+ <reference key="destination" ref="427689665"/>
+ </object>
+ <int key="connectionID">6900</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -21230,30 +21458,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="parent" ref="766637184"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">6447</int>
- <reference key="object" ref="456635389"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="388856443"/>
- </object>
- <reference key="parent" ref="0"/>
- <string key="objectName">Query History Search</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6448</int>
- <reference key="object" ref="388856443"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="292622292"/>
- </object>
- <reference key="parent" ref="456635389"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6449</int>
- <reference key="object" ref="292622292"/>
- <reference key="parent" ref="388856443"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">6460</int>
<reference key="object" ref="635467451"/>
<reference key="parent" ref="60735230"/>
@@ -22394,6 +22598,120 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="object" ref="757535829"/>
<reference key="parent" ref="71975986"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6885</int>
+ <reference key="object" ref="260025442"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="880498064"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">statusTable Accessory View</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6447</int>
+ <reference key="object" ref="456635389"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="388856443"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Query History Search</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6448</int>
+ <reference key="object" ref="388856443"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="292622292"/>
+ </object>
+ <reference key="parent" ref="456635389"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6449</int>
+ <reference key="object" ref="292622292"/>
+ <reference key="parent" ref="388856443"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6886</int>
+ <reference key="object" ref="880498064"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="710144066"/>
+ <reference ref="786626704"/>
+ <reference ref="999861934"/>
+ <reference ref="956714173"/>
+ </object>
+ <reference key="parent" ref="260025442"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6887</int>
+ <reference key="object" ref="710144066"/>
+ <reference key="parent" ref="880498064"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6888</int>
+ <reference key="object" ref="786626704"/>
+ <reference key="parent" ref="880498064"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6889</int>
+ <reference key="object" ref="999861934"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="213743804"/>
+ <reference ref="400624193"/>
+ <reference ref="140803099"/>
+ </object>
+ <reference key="parent" ref="880498064"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6890</int>
+ <reference key="object" ref="956714173"/>
+ <reference key="parent" ref="880498064"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6891</int>
+ <reference key="object" ref="213743804"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="924386780"/>
+ </object>
+ <reference key="parent" ref="999861934"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6892</int>
+ <reference key="object" ref="400624193"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="229315620"/>
+ </object>
+ <reference key="parent" ref="999861934"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6893</int>
+ <reference key="object" ref="229315620"/>
+ <reference key="parent" ref="400624193"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6894</int>
+ <reference key="object" ref="924386780"/>
+ <reference key="parent" ref="213743804"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6895</int>
+ <reference key="object" ref="140803099"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="635109389"/>
+ </object>
+ <reference key="parent" ref="999861934"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">6896</int>
+ <reference key="object" ref="635109389"/>
+ <reference key="parent" ref="140803099"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -23757,6 +24075,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>6879.IBNumberFormatterBehaviorMetadataKey</string>
<string>6879.IBNumberFormatterLocalizesFormatMetadataKey</string>
<string>6879.IBPluginDependency</string>
+ <string>6885.IBEditorWindowLastContentRect</string>
+ <string>6885.IBPluginDependency</string>
+ <string>6886.IBPluginDependency</string>
+ <string>6887.IBPluginDependency</string>
+ <string>6888.IBPluginDependency</string>
+ <string>6889.IBPluginDependency</string>
+ <string>6890.IBPluginDependency</string>
+ <string>6891.IBPluginDependency</string>
+ <string>6892.IBPluginDependency</string>
+ <string>6893.IBPluginDependency</string>
+ <string>6894.IBPluginDependency</string>
<string>69.ImportedFromIB2</string>
<string>711.IBPluginDependency</string>
<string>711.ImportedFromIB2</string>
@@ -24567,11 +24896,11 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{51, 274}, {944, 550}}</string>
+ <string>{{51, 206}, {944, 550}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<boolean value="NO"/>
- <string>{{51, 274}, {944, 550}}</string>
+ <string>{{51, 206}, {944, 550}}</string>
<integer value="1"/>
<integer value="1"/>
<string>{{62, 352}, {845, 504}}</string>
@@ -25737,6 +26066,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<integer value="1040"/>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{92, 444}, {360, 135}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
@@ -25881,7 +26221,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">6883</int>
+ <int key="maxID">6900</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -27490,6 +27830,176 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.1+">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string key="className">CustomQuery</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>chooseQueryFavorite:</string>
+ <string>chooseQueryHistory:</string>
+ <string>clearQueryHistory:</string>
+ <string>closeSheet:</string>
+ <string>copyQueryHistory:</string>
+ <string>filterQueryFavorites:</string>
+ <string>filterQueryHistory:</string>
+ <string>gearMenuItemSelected:</string>
+ <string>helpSearchFindNextInPage:</string>
+ <string>helpSearchFindPreviousInPage:</string>
+ <string>helpSegmentDispatcher:</string>
+ <string>helpSelectHelpTargetMySQL:</string>
+ <string>helpSelectHelpTargetPage:</string>
+ <string>helpSelectHelpTargetWeb:</string>
+ <string>helpTargetDispatcher:</string>
+ <string>runAllQueries:</string>
+ <string>runSelectedQueries:</string>
+ <string>saveQueryHistory:</string>
+ <string>showAutoHelpForCurrentWord:</string>
+ <string>showHelpForCurrentWord:</string>
+ <string>showHelpForSearchString:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>affectedRowsText</string>
+ <string>autohelpMenuItem</string>
+ <string>autoindentMenuItem</string>
+ <string>autopairMenuItem</string>
+ <string>autouppercaseKeywordsMenuItem</string>
+ <string>clearHistoryMenuItem</string>
+ <string>commentCurrentQueryMenuItem</string>
+ <string>commentLineOrSelectionMenuItem</string>
+ <string>completionListMenuItem</string>
+ <string>copyHistoryMenuItem</string>
+ <string>customQueryScrollView</string>
+ <string>customQueryView</string>
+ <string>editorFontMenuItem</string>
+ <string>encodingPopUp</string>
+ <string>errorText</string>
+ <string>helpNavigator</string>
+ <string>helpSearchField</string>
+ <string>helpSearchFieldCell</string>
+ <string>helpTargetSelector</string>
+ <string>helpWebView</string>
+ <string>helpWebViewWindow</string>
+ <string>multipleLineEditingButton</string>
+ <string>nextHistoryMenuItem</string>
+ <string>previousHistoryMenuItem</string>
+ <string>queryFavoriteNameTextField</string>
+ <string>queryFavoritesButton</string>
+ <string>queryFavoritesSaveAllMenuItem</string>
+ <string>queryFavoritesSaveAsMenuItem</string>
+ <string>queryFavoritesSearchField</string>
+ <string>queryFavoritesSearchFieldView</string>
+ <string>queryFavoritesSearchMenuItem</string>
+ <string>queryFavoritesSheet</string>
+ <string>queryHistoryButton</string>
+ <string>queryHistorySearchField</string>
+ <string>queryHistorySearchFieldView</string>
+ <string>queryHistorySearchMenuItem</string>
+ <string>runAllButton</string>
+ <string>runAllMenuItem</string>
+ <string>runSelectionButton</string>
+ <string>runSelectionMenuItem</string>
+ <string>saveHistoryMenuItem</string>
+ <string>saveQueryFavoriteButton</string>
+ <string>saveQueryFavoriteGlobal</string>
+ <string>shiftLeftMenuItem</string>
+ <string>shiftRightMenuItem</string>
+ <string>tableDocumentInstance</string>
+ <string>tableWindow</string>
+ <string>tablesListInstance</string>
+ <string>textView</string>
+ <string>valueSheet</string>
+ <string>valueTextField</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSScrollView</string>
+ <string>CMCopyTable</string>
+ <string>NSMenuItem</string>
+ <string>NSPopUpButton</string>
+ <string>id</string>
+ <string>NSSegmentedControl</string>
+ <string>NSSearchField</string>
+ <string>NSSearchFieldCell</string>
+ <string>NSSegmentedControl</string>
+ <string>WebView</string>
+ <string>NSWindow</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSTextField</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSSearchField</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSWindow</string>
+ <string>id</string>
+ <string>NSSearchField</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSButton</string>
+ <string>id</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>CMTextView</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../Source/CustomQuery.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">toggleCollapse:</string>
@@ -27689,6 +28199,230 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">TableDocument</string>
+ <string key="superclassName">NSDocument</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addConnectionToFavorites:</string>
+ <string>addDatabase:</string>
+ <string>analyzeTable:</string>
+ <string>backForwardInHistory:</string>
+ <string>cancelTask:</string>
+ <string>checkTable:</string>
+ <string>checksumTable:</string>
+ <string>chooseDatabase:</string>
+ <string>chooseEncoding:</string>
+ <string>closeErrorConnectionSheet:</string>
+ <string>closePanelSheet:</string>
+ <string>closePasswordSheet:</string>
+ <string>closeSheet:</string>
+ <string>copyCreateTableSyntax:</string>
+ <string>copyCreateTableSyntaxFromSheet:</string>
+ <string>export:</string>
+ <string>exportMultipleTables:</string>
+ <string>exportTable:</string>
+ <string>flushPrivileges:</string>
+ <string>flushTable:</string>
+ <string>import:</string>
+ <string>openCurrentConnectionInNewWindow:</string>
+ <string>optimizeTable:</string>
+ <string>removeDatabase:</string>
+ <string>repairTable:</string>
+ <string>saveConnectionSheet:</string>
+ <string>saveCreateSyntax:</string>
+ <string>setDatabases:</string>
+ <string>showConsole:</string>
+ <string>showCreateTableSyntax:</string>
+ <string>showMySQLHelp:</string>
+ <string>showServerProcesses:</string>
+ <string>showServerVariables:</string>
+ <string>showUserManager:</string>
+ <string>validateSaveConnectionAccessory:</string>
+ <string>viewContent:</string>
+ <string>viewQuery:</string>
+ <string>viewRelations:</string>
+ <string>viewStatus:</string>
+ <string>viewStructure:</string>
+ <string>viewTriggers:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>addDatabaseButton</string>
+ <string>chooseDatabaseButton</string>
+ <string>connectionErrorDialog</string>
+ <string>contentViewSplitter</string>
+ <string>createTableSyntaxTextField</string>
+ <string>createTableSyntaxTextView</string>
+ <string>createTableSyntaxWindow</string>
+ <string>customQueryInstance</string>
+ <string>customQueryTextView</string>
+ <string>databaseDataInstance</string>
+ <string>databaseEncodingButton</string>
+ <string>databaseNameField</string>
+ <string>databaseSheet</string>
+ <string>dbTablesTableView</string>
+ <string>encodingPopUp</string>
+ <string>exportControllerInstance</string>
+ <string>extendedTableInfoInstance</string>
+ <string>favoritesButton</string>
+ <string>historyControl</string>
+ <string>inputTextWindow</string>
+ <string>inputTextWindowHeader</string>
+ <string>inputTextWindowMessage</string>
+ <string>inputTextWindowSecureTextField</string>
+ <string>listFilterField</string>
+ <string>queryProgressBar</string>
+ <string>saveConnectionAccessory</string>
+ <string>saveConnectionAutoConnect</string>
+ <string>saveConnectionEncrypt</string>
+ <string>saveConnectionEncryptString</string>
+ <string>saveConnectionIncludeData</string>
+ <string>saveConnectionIncludeQuery</string>
+ <string>saveConnectionSavePassword</string>
+ <string>saveConnectionSavePasswordAlert</string>
+ <string>sidebarGrabber</string>
+ <string>spHistoryControllerInstance</string>
+ <string>statusTableAccessoryView</string>
+ <string>statusTableView</string>
+ <string>tableContentInstance</string>
+ <string>tableDataInstance</string>
+ <string>tableDumpInstance</string>
+ <string>tableInfoCollapseButton</string>
+ <string>tableInfoTable</string>
+ <string>tableListSplitter</string>
+ <string>tableRelationsInstance</string>
+ <string>tableSourceInstance</string>
+ <string>tableTabView</string>
+ <string>tableTriggersInstance</string>
+ <string>tableWindow</string>
+ <string>tablesListInstance</string>
+ <string>taskCancelButton</string>
+ <string>taskCancellationCallbackObject</string>
+ <string>taskDescriptionText</string>
+ <string>taskProgressIndicator</string>
+ <string>taskProgressLayer</string>
+ <string>titleAccessoryView</string>
+ <string>titleImageView</string>
+ <string>titleStringView</string>
+ <string>userManagerInstance</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>NSWindow</string>
+ <string>NSSplitView</string>
+ <string>NSTextField</string>
+ <string>NSTextView</string>
+ <string>NSWindow</string>
+ <string>id</string>
+ <string>NSTextView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSTableView</string>
+ <string>NSPopUpButton</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSSearchField</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSSecureTextField</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSButton</string>
+ <string>NSTableView</string>
+ <string>NSSplitView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSTabView</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSButton</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>NSBox</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>SPUserManager</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBDocumentRelativeSource</string>
+ <string key="minorKey">../../Source/TableDocument.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">TableSource</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
diff --git a/Source/CMTextView.m b/Source/CMTextView.m
index 582df6c2..7d140ccb 100644
--- a/Source/CMTextView.m
+++ b/Source/CMTextView.m
@@ -32,6 +32,7 @@
#import "SPConstants.h"
#import "SPQueryController.h"
#import "SPTooltip.h"
+#import "TablesList.h"
#pragma mark -
#pragma mark lex init
@@ -1182,6 +1183,18 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse)
if ([[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKey:@"selectedDatabase"] != nil)
currentDb = [[[[self window] delegate] valueForKeyPath:@"tablesListInstance"] valueForKeyPath:@"selectedDatabase"];
+ while([theHintString isMatchedByRegex:@"(?<!\\\\)\\$SP_SELECTED_TABLES"]) {
+ r = [theHintString rangeOfRegex:@"(?<!\\\\)\\$SP_SELECTED_TABLES"];
+ if(r.length) {
+ NSArray *selTables = [[[self delegate] valueForKeyPath:@"tablesListInstance"] selectedTableNames];
+ if([selTables count])
+ [theHintString replaceCharactersInRange:r withString:[selTables componentsJoinedAndBacktickQuoted]];
+ else
+ [theHintString replaceCharactersInRange:r withString:@"<tables>"];
+ }
+ [theHintString flushCachedRegexData];
+ }
+
while([theHintString isMatchedByRegex:@"(?<!\\\\)\\$SP_SELECTED_TABLE"]) {
r = [theHintString rangeOfRegex:@"(?<!\\\\)\\$SP_SELECTED_TABLE"];
if(r.length) {
diff --git a/Source/CustomQuery.h b/Source/CustomQuery.h
index 6650ee79..e73f70da 100644
--- a/Source/CustomQuery.h
+++ b/Source/CustomQuery.h
@@ -54,6 +54,7 @@
@interface CustomQuery : NSObject
{
IBOutlet id tableDocumentInstance;
+ IBOutlet id tablesListInstance;
IBOutlet id tableWindow;
IBOutlet id queryFavoritesButton;
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 6c03e01a..74aa3402 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -50,6 +50,9 @@
IBOutlet id spHistoryControllerInstance;
IBOutlet id exportControllerInstance;
+ IBOutlet id statusTableAccessoryView;
+ IBOutlet id statusTableView;
+
IBOutlet SPUserManager *userManagerInstance;
IBOutlet NSSearchField *listFilterField;
@@ -157,6 +160,8 @@
NSMutableDictionary *spfDocData;
NSString *keyChainID;
+
+ id statusValues;
}
- (NSString *)getHTMLforPrint;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 4d5c5a77..d940e39a 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -108,6 +108,8 @@
taskCancellationCallbackSelector = NULL;
keyChainID = nil;
+
+ statusValues = nil;
}
return self;
@@ -1168,6 +1170,10 @@
[chooseDatabaseButton selectItemAtIndex:0];
}
}
+ // Close error status sheet for OPTIMIZE, CHECK, REPAIR etc.
+ else if ([contextInfo isEqualToString:@"statusError"]) {
+ if(statusValues) [statusValues release]; statusValues = nil;
+ }
}
@@ -1853,17 +1859,26 @@
*/
- (IBAction)checkTable:(id)sender
{
- MCPResult *theResult = [mySQLConnection queryString:[NSString stringWithFormat:@"CHECK TABLE %@", [[self table] backtickQuotedString]]];
+
+ NSArray *selectedItems = [tablesListInstance selectedTableItems];
+ id message = nil;
+
+ if([selectedItems count] == 0) return;
+
+ MCPResult *theResult = [mySQLConnection queryString:[NSString stringWithFormat:@"CHECK TABLE %@", [selectedItems componentsJoinedAndBacktickQuoted]]];
+
+ NSString *what = ([selectedItems count]>1) ? NSLocalizedString(@"selected items", @"selected items") : [NSString stringWithFormat:@"%@ '%@'", NSLocalizedString(@"table", @"table"), [self table]];
// Check for errors, only displaying if the connection hasn't been terminated
if (![[mySQLConnection getLastErrorMessage] isEqualToString:@""]) {
+ NSString *mText = ([selectedItems count]>1) ? NSLocalizedString(@"Unable to check selected items", @"unable to check selected items message") : NSLocalizedString(@"Unable to check table", @"unable to check table message");
if ([mySQLConnection isConnected]) {
- [[NSAlert alertWithMessageText:@"Unable to check table"
+ [[NSAlert alertWithMessageText:mText
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
- informativeTextWithFormat:[NSString stringWithFormat:@"An error occurred while trying to check the table '%@'. Please try again.\n\n%@", [self table], [mySQLConnection getLastErrorMessage]]]
+ informativeTextWithFormat:[NSString stringWithFormat:NSLocalizedString(@"An error occurred while trying to check the %@.\n\nMySQL said:%@",@"an error occurred while trying to check the %@.\n\nMySQL said:%@"), what, [mySQLConnection getLastErrorMessage]]]
beginSheetModalForWindow:tableWindow
modalDelegate:self
didEndSelector:NULL
@@ -1873,24 +1888,49 @@
return;
}
+ NSDictionary *result = [theResult fetch2DResultAsType:MCPTypeDictionary];
+ BOOL statusOK = YES;
+ for(id res in result) {
+ if(![[res objectForKey:@"Msg_type"] isEqualToString:@"status"]) {
+ statusOK = NO;
+ break;
+ }
+ }
+
// Process result
- NSDictionary *result = [[theResult fetch2DResultAsType:MCPTypeDictionary] lastObject];
+ if([selectedItems count] == 1) {
+ message = @"";
- NSString *message = @"";
+ NSDictionary *lastresult = [[theResult fetch2DResultAsType:MCPTypeDictionary] lastObject];
- message = ([[result objectForKey:@"Msg_type"] isEqualToString:@"status"]) ? @"Check table successfully passed." : @"Check table failed.";
+ message = ([[lastresult objectForKey:@"Msg_type"] isEqualToString:@"status"]) ? NSLocalizedString(@"Check table successfully passed.",@"check table successfully passed message") : NSLocalizedString(@"Check table failed.", @"check table failed message");
+
+ message = [NSString stringWithFormat:@"%@\n\nMySQL said: %@", message, [lastresult objectForKey:@"Msg_text"]];
+ } else if(statusOK) {
+ message = NSLocalizedString(@"Check of all selected items successfully passed.",@"check of all selected items successfully passed message");
+ }
+
+ if(message) {
+ [[NSAlert alertWithMessageText:[NSString stringWithFormat:@"Check %@", what]
+ defaultButton:@"OK"
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:message]
+ beginSheetModalForWindow:tableWindow
+ modalDelegate:self
+ didEndSelector:NULL
+ contextInfo:NULL];
+ } else {
+ message = NSLocalizedString(@"MySQL said:",@"mysql said message");
+ statusValues = [result retain];
+ NSAlert *alert = [[NSAlert new] autorelease];
+ [alert setInformativeText:message];
+ [alert setMessageText:NSLocalizedString(@"Error while checking selected items", @"error while checking selected items message")];
+ [alert setAccessoryView:statusTableAccessoryView];
+ [alert beginSheetModalForWindow:tableWindow modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"statusError"];
+ }
- message = [NSString stringWithFormat:@"%@\n\nMySQL said: %@", message, [result objectForKey:@"Msg_text"]];
- [[NSAlert alertWithMessageText:[NSString stringWithFormat:@"Check table '%@'", [self table]]
- defaultButton:@"OK"
- alternateButton:nil
- otherButton:nil
- informativeTextWithFormat:message]
- beginSheetModalForWindow:tableWindow
- modalDelegate:self
- didEndSelector:NULL
- contextInfo:NULL];
}
/**
@@ -2945,7 +2985,6 @@
// table menu items
if ([menuItem action] == @selector(showCreateTableSyntax:) ||
[menuItem action] == @selector(copyCreateTableSyntax:) ||
- [menuItem action] == @selector(checkTable:) ||
[menuItem action] == @selector(analyzeTable:) ||
[menuItem action] == @selector(optimizeTable:) ||
[menuItem action] == @selector(repairTable:) ||
@@ -2955,6 +2994,10 @@
return ([self table] != nil && [[self table] isNotEqualTo:@""]);
}
+ if ([menuItem action] == @selector(checkTable:)) {
+ return ([[[tablesListInstance valueForKeyPath:@"tablesListView"] selectedRowIndexes] count]) ? YES:NO;
+ }
+
if ([menuItem action] == @selector(addConnectionToFavorites:)) {
return ([connectionController selectedFavorite] ? NO : YES);
}
@@ -3689,6 +3732,37 @@
}
#pragma mark -
+#pragma mark Datasource methods
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+ if(statusTableView && aTableView == statusTableView)
+ return [statusValues count];
+ return 0;
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ if(statusTableView && aTableView == statusTableView && rowIndex < [statusValues count]) {
+ if ([[aTableColumn identifier] isEqualToString:@"table_name"]) {
+ return [[statusValues objectAtIndex:rowIndex] objectForKey:@"Table"];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"msg_status"]) {
+ return [[statusValues objectAtIndex:rowIndex] objectForKey:@"Msg_type"];
+ }
+ else if ([[aTableColumn identifier] isEqualToString:@"msg_text"]) {
+ return [[statusValues objectAtIndex:rowIndex] objectForKey:@"Msg_text"];
+ }
+ }
+ return nil;
+}
+
+- (BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+ return NO;
+}
+
+#pragma mark -
/**
* Dealloc
diff --git a/Source/TablesList.h b/Source/TablesList.h
index a730fcf4..aa87dbe0 100644
--- a/Source/TablesList.h
+++ b/Source/TablesList.h
@@ -126,6 +126,8 @@ enum sp_table_types
- (void)selectTableAtIndex:(NSNumber *)row;
// Getters
+- (NSArray *)selectedTableNames;
+- (NSArray *)selectedTableItems;
- (NSString *)tableName;
- (NSInteger)tableType;
- (NSArray *)tables;
diff --git a/Source/TablesList.m b/Source/TablesList.m
index af7f6fdc..3ca55f43 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -822,6 +822,10 @@
[separatorTableMenuItem setHidden:YES];
[separatorTableContextMenuItem setHidden:YES];
+ NSMenu *tableSubMenu = [[[NSApp mainMenu] itemWithTitle:@"Table"] submenu];
+ [[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Check Selected Items", @"check selected items menu item")];
+
+
// set window title
[tableWindow setTitle:[tableDocumentInstance displaySPName]];
@@ -980,6 +984,36 @@
#pragma mark -
#pragma mark Getter methods
+
+- (NSArray *)selectedTableNames
+{
+ NSIndexSet *indexes = [tablesListView selectedRowIndexes];
+
+ NSUInteger currentIndex = [indexes firstIndex];
+ NSMutableArray *selTables = [NSMutableArray array];
+
+ while (currentIndex != NSNotFound) {
+ if([[filteredTableTypes objectAtIndex:currentIndex] integerValue] == SP_TABLETYPE_TABLE)
+ [selTables addObject:[filteredTables objectAtIndex:currentIndex]];
+ currentIndex = [indexes indexGreaterThanIndex:currentIndex];
+ }
+ return selTables;
+}
+
+- (NSArray *)selectedTableItems
+{
+ NSIndexSet *indexes = [tablesListView selectedRowIndexes];
+
+ NSUInteger currentIndex = [indexes firstIndex];
+ NSMutableArray *selTables = [NSMutableArray array];
+
+ while (currentIndex != NSNotFound) {
+ [selTables addObject:[filteredTables objectAtIndex:currentIndex]];
+ currentIndex = [indexes indexGreaterThanIndex:currentIndex];
+ }
+ return selTables;
+}
+
/**
* Returns the currently selected table or nil if no table or mulitple tables are selected
*/