aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib67
-rw-r--r--Source/TableDump.h1
-rw-r--r--Source/TableDump.m27
3 files changed, 72 insertions, 23 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 0d7a4ae2..94d37f02 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8,6 +8,7 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="6126"/>
<integer value="22"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -6768,6 +6769,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 17}, {418, 140}}</string>
<reference key="NSSuperview" ref="597878738"/>
+ <reference key="NSNextKeyView" ref="292088665"/>
<reference key="NSDocView" ref="292088665"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -6801,6 +6803,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 0}, {418, 17}}</string>
<reference key="NSSuperview" ref="597878738"/>
+ <reference key="NSNextKeyView" ref="50612883"/>
<reference key="NSDocView" ref="50612883"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -6809,6 +6812,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{-1, 22}, {420, 158}}</string>
<reference key="NSSuperview" ref="778680541"/>
+ <reference key="NSNextKeyView" ref="811595075"/>
<int key="NSsFlags">514</int>
<reference key="NSVScroller" ref="4739239"/>
<reference key="NSHScroller" ref="87044874"/>
@@ -6949,7 +6953,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{18, 56}, {343, 20}}</string>
<reference key="NSSuperview" ref="525490268"/>
- <reference key="NSWindow"/>
<int key="NSpiFlags">16394</int>
<double key="NSMaxValue">1.000000e+02</double>
</object>
@@ -6958,7 +6961,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{59, 84}, {300, 17}}</string>
<reference key="NSSuperview" ref="525490268"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="111654334">
<int key="NSCellFlags">67239488</int>
@@ -6981,7 +6983,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{279, 12}, {83, 32}}</string>
<reference key="NSSuperview" ref="525490268"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="851386817">
<int key="NSCellFlags">67239424</int>
@@ -7007,7 +7008,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{59, 104}, {300, 17}}</string>
<reference key="NSSuperview" ref="525490268"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="853525811">
<int key="NSCellFlags">67239488</int>
@@ -7040,7 +7040,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 87}, {32, 32}}</string>
<reference key="NSSuperview" ref="525490268"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="102730194">
<int key="NSCellFlags">130560</int>
@@ -7059,7 +7058,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrameSize">{379, 139}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{213, 72}</string>
@@ -7450,6 +7448,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrameSize">{667, 370}</string>
<reference key="NSSuperview" ref="533559056"/>
+ <reference key="NSNextKeyView" ref="283256023"/>
<reference key="NSDocView" ref="283256023"/>
<reference key="NSBGColor" ref="449903125"/>
<reference key="NSCursor" ref="32917531"/>
@@ -7479,6 +7478,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{0, 39}, {667, 370}}</string>
<reference key="NSSuperview" ref="999543752"/>
+ <reference key="NSNextKeyView" ref="106608808"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="945638943"/>
<reference key="NSHScroller" ref="685320182"/>
@@ -7592,6 +7592,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrameSize">{667, 370}</string>
<reference key="NSSuperview" ref="1020679422"/>
+ <reference key="NSNextKeyView" ref="1011820278"/>
<reference key="NSDocView" ref="1011820278"/>
<reference key="NSBGColor" ref="449903125"/>
<reference key="NSCursor" ref="32917531"/>
@@ -7621,6 +7622,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{0, 39}, {667, 370}}</string>
<reference key="NSSuperview" ref="999543752"/>
+ <reference key="NSNextKeyView" ref="134546146"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="435247014"/>
<reference key="NSHScroller" ref="767953750"/>
@@ -7746,7 +7748,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {370, 204}}</string>
<reference key="NSSuperview" ref="271089627"/>
- <reference key="NSNextKeyView" ref="405634773"/>
<reference key="NSDocView" ref="405634773"/>
<reference key="NSBGColor" ref="449903125"/>
<reference key="NSCursor" ref="32917531"/>
@@ -7776,7 +7777,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{-1, 35}, {383, 206}}</string>
<reference key="NSSuperview" ref="1052076676"/>
- <reference key="NSNextKeyView" ref="240408862"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="850107135"/>
<reference key="NSHScroller" ref="937090729"/>
@@ -7930,6 +7930,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 17}, {399, 251}}</string>
<reference key="NSSuperview" ref="294857516"/>
+ <reference key="NSNextKeyView" ref="460727716"/>
<reference key="NSDocView" ref="460727716"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -7963,6 +7964,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 0}, {399, 17}}</string>
<reference key="NSSuperview" ref="294857516"/>
+ <reference key="NSNextKeyView" ref="74674217"/>
<reference key="NSDocView" ref="74674217"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -7971,6 +7973,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{-1, 39}, {412, 269}}</string>
<reference key="NSSuperview" ref="226131408"/>
+ <reference key="NSNextKeyView" ref="841219743"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="297298990"/>
<reference key="NSHScroller" ref="857738313"/>
@@ -8054,7 +8057,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{120, 100}</string>
<object class="NSView" key="NSWindowView" id="661948784">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8063,7 +8066,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{180, -1}, {81, 27}}</string>
<reference key="NSSuperview" ref="661948784"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="BWTransparentButtonCell" key="NSCell" id="295636063">
<int key="NSCellFlags">67239424</int>
@@ -8094,7 +8096,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">6418</int>
<string key="NSFrameSize">{266, 144}</string>
<reference key="NSSuperview" ref="856231100"/>
- <reference key="NSWindow"/>
<object class="NSTextContainer" key="NSTextContainer" id="649289743">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -8340,7 +8341,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrameSize">{266, 121}</string>
<reference key="NSSuperview" ref="992507944"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="852390500"/>
<reference key="NSDocView" ref="852390500"/>
<reference key="NSBGColor" ref="449903125"/>
@@ -8352,7 +8352,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{266, 0}, {12, 121}}</string>
<reference key="NSSuperview" ref="992507944"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<int key="NSArrowsLoc">2</int>
<reference key="NSTarget" ref="992507944"/>
@@ -8364,7 +8363,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-100, -100}, {574, 15}}</string>
<reference key="NSSuperview" ref="992507944"/>
- <reference key="NSWindow"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="992507944"/>
<string key="NSAction">_doScroller:</string>
@@ -8374,7 +8372,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 34}, {278, 121}}</string>
<reference key="NSSuperview" ref="661948784"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="856231100"/>
<int key="NSsFlags">592</int>
<reference key="NSVScroller" ref="775434024"/>
@@ -8383,8 +8380,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{280, 162}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{120, 119}</string>
@@ -8487,6 +8482,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {352, 178}}</string>
<reference key="NSSuperview" ref="972781700"/>
+ <reference key="NSNextKeyView" ref="347971361"/>
<reference key="NSDocView" ref="347971361"/>
<reference key="NSBGColor" ref="449903125"/>
<reference key="NSCursor" ref="32917531"/>
@@ -8516,6 +8512,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 45}, {365, 180}}</string>
<reference key="NSSuperview" ref="860968037"/>
+ <reference key="NSNextKeyView" ref="158897172"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="84024470"/>
<reference key="NSHScroller" ref="761598270"/>
@@ -8967,7 +8964,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{350, 250}</string>
<object class="NSView" key="NSWindowView" id="1024486775">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8986,6 +8983,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{128, 16}, {100, 26}}</string>
<reference key="NSSuperview" ref="573332983"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="691314210">
<int key="NSCellFlags">-2076049856</int>
@@ -9018,6 +9016,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 22}, {109, 17}}</string>
<reference key="NSSuperview" ref="573332983"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1059848808">
<int key="NSCellFlags">68288064</int>
@@ -9032,10 +9031,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 1}, {465, 60}}</string>
<reference key="NSSuperview" ref="908136938"/>
+ <reference key="NSWindow"/>
</object>
</object>
<string key="NSFrame">{{-1, 233}, {467, 62}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -9073,12 +9074,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{423, 141}</string>
<reference key="NSSuperview" ref="68425806"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="568493807">
<reference key="NSNextResponder" ref="256453894"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{423, 17}</string>
<reference key="NSSuperview" ref="256453894"/>
+ <reference key="NSWindow"/>
<reference key="NSTableView" ref="134631251"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="639896268">
@@ -9086,6 +9089,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
<reference key="NSSuperview" ref="1041893843"/>
+ <reference key="NSWindow"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -9161,6 +9165,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 17}, {423, 141}}</string>
<reference key="NSSuperview" ref="1041893843"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="134631251"/>
<reference key="NSDocView" ref="134631251"/>
<reference key="NSBGColor" ref="1024678221"/>
@@ -9171,6 +9176,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{413, 18}, {11, 140}}</string>
<reference key="NSSuperview" ref="1041893843"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="1041893843"/>
<string key="NSAction">_doScroller:</string>
@@ -9181,6 +9187,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-100, -100}, {227, 11}}</string>
<reference key="NSSuperview" ref="1041893843"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="1041893843"/>
<string key="NSAction">_doScroller:</string>
@@ -9195,6 +9202,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{1, 0}, {423, 17}}</string>
<reference key="NSSuperview" ref="1041893843"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="568493807"/>
<reference key="NSDocView" ref="568493807"/>
<reference key="NSBGColor" ref="1024678221"/>
@@ -9204,6 +9212,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string key="NSFrame">{{20, 45}, {425, 159}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="68425806"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="99652168"/>
@@ -9218,6 +9227,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 211}, {151, 13}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="879803695">
<int key="NSCellFlags">67239424</int>
@@ -9234,6 +9244,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{286, 6}, {82, 32}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="688110794">
<int key="NSCellFlags">67239424</int>
@@ -9259,6 +9270,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{368, 6}, {83, 32}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="469479462">
@@ -9282,6 +9294,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{20, 11}, {32, 24}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="249886123">
<int key="NSCellFlags">604110336</int>
@@ -9306,6 +9319,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{51, 11}, {32, 24}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="468691156">
@@ -9332,6 +9346,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">292</int>
<string key="NSFrame">{{88, 16}, {98, 14}}</string>
<reference key="NSSuperview" ref="1024486775"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="179332122">
<int key="NSCellFlags">68288064</int>
@@ -9345,6 +9360,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{465, 294}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSMinSize">{350, 272}</string>
@@ -15124,6 +15141,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<int key="connectionID">6237</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">singleProgressTitle</string>
+ <reference key="source" ref="225526897"/>
+ <reference key="destination" ref="522843969"/>
+ </object>
+ <int key="connectionID">6238</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -24664,7 +24689,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">6237</int>
+ <int key="maxID">6238</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -25462,7 +25487,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addDatabaseButton</string>
<string>chooseDatabaseButton</string>
- <string>connectionController</string>
<string>contentViewSplitter</string>
<string>createTableSyntaxWindow</string>
<string>customQueryInstance</string>
@@ -25499,7 +25523,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
- <string>id</string>
<string>NSSplitView</string>
<string>NSWindow</string>
<string>id</string>
@@ -25627,6 +25650,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>singleProgressBar</string>
<string>singleProgressSheet</string>
<string>singleProgressText</string>
+ <string>singleProgressTitle</string>
<string>tableContentInstance</string>
<string>tableDataInstance</string>
<string>tableDocumentInstance</string>
@@ -25689,6 +25713,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Source/TableDump.h b/Source/TableDump.h
index 3419465c..d43912c3 100644
--- a/Source/TableDump.h
+++ b/Source/TableDump.h
@@ -83,6 +83,7 @@
IBOutlet id errorsView;
IBOutlet id singleProgressSheet;
IBOutlet id singleProgressBar;
+ IBOutlet id singleProgressTitle;
IBOutlet id singleProgressText;
IBOutlet id fieldMappingSheet;
diff --git a/Source/TableDump.m b/Source/TableDump.m
index 32e40700..cf90eb1a 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -442,6 +442,8 @@
// reset interface
[errorsView setString:@""];
[errorsView displayIfNeeded];
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Starting import...", @"text showing that the application has started importing")];
+ [singleProgressTitle displayIfNeeded];
[singleProgressText setStringValue:NSLocalizedString(@"Reading...", @"text showing that app is reading dump")];
[singleProgressText displayIfNeeded];
[singleProgressBar setDoubleValue:0];
@@ -473,6 +475,7 @@
[singleProgressBar stopAnimation:self];
[singleProgressBar setUsesThreadedAnimation:NO];
[singleProgressBar setIndeterminate:NO];
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Importing SQL", @"text showing that the application is importing SQL")];
[singleProgressText setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Executing %d statements...", @"text showing that app is executing x statements"), queryCount]];
NSCharacterSet *whitespaceAndNewline = [NSCharacterSet whitespaceAndNewlineCharacterSet];
@@ -545,6 +548,7 @@
didEndSelector:nil
contextInfo:nil];
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Importing CSV", @"text showing that the application is importing CSV")];
[singleProgressSheet makeKeyWindow];
[singleProgressBar setIndeterminate:YES];
[singleProgressBar setUsesThreadedAnimation:YES];
@@ -652,6 +656,8 @@
contextInfo:nil];
[singleProgressSheet makeKeyWindow];
+ [singleProgressText setStringValue:NSLocalizedString(@"Creating rows...", @"text showing that app is importing rows from CSV")];
+ [singleProgressText displayIfNeeded];
// get fields to be imported
for (i = 0; i < [fieldMappingArray count] ; i++ ) {
@@ -849,9 +855,10 @@
// Reset the interface
[errorsView setString:@""];
[errorsView displayIfNeeded];
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Exporting SQL", @"text showing that the application is exporting SQL")];
+ [singleProgressTitle displayIfNeeded];
[singleProgressText setStringValue:NSLocalizedString(@"Dumping...", @"text showing that app is writing dump")];
[singleProgressText displayIfNeeded];
- //progressBarWidth = (int)[singleProgressBar bounds].size.width;
[singleProgressBar setDoubleValue:0];
[singleProgressBar displayIfNeeded];
@@ -1151,6 +1158,8 @@
NSString *previousConnectionEncoding;
BOOL previousConnectionEncodingViaLatin1;
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Exporting Dot file", @"text showing that the application is exporting a Dot file")];
+ [singleProgressTitle displayIfNeeded];
[singleProgressText setStringValue:NSLocalizedString(@"Dumping...", @"text showing that app is writing dump")];
[singleProgressText displayIfNeeded];
progressBarWidth = (int)[singleProgressBar bounds].size.width;
@@ -1344,6 +1353,7 @@
if ( !silently ) {
// Set the progress text
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Exporting CSV", @"text showing that the application is exporting a CSV")];
[singleProgressText setStringValue:NSLocalizedString(@"Exporting...", @"text showing that app is exporting to text file")];
// [singleProgressText displayIfNeeded];
@@ -1681,6 +1691,8 @@
if ( !silently ) {
// Set the progress text
+ [singleProgressTitle setStringValue:NSLocalizedString(@"Exporting XML", @"text showing that the application is exporting XML")];
+ [singleProgressTitle displayIfNeeded];
[singleProgressText setStringValue:NSLocalizedString(@"Writing...", @"text showing that app is writing text file")];
[singleProgressText displayIfNeeded];
@@ -1815,6 +1827,7 @@
// Reset the interface
[errorsView setString:@""];
[errorsView displayIfNeeded];
+ [singleProgressTitle setStringValue:[NSString stringWithFormat:NSLocalizedString(@"Exporting %@", @"text showing that the application is importing a supplied format"), [type uppercaseString]]];
[singleProgressText setStringValue:NSLocalizedString(@"Writing...", @"text showing that app is writing text file")];
[singleProgressText displayIfNeeded];
[singleProgressBar setDoubleValue:0];
@@ -1875,8 +1888,18 @@
[fileHandle writeData:[[NSString stringWithFormat:@"Table %@%@%@", tableName, csvLineEnd, csvLineEnd] dataUsingEncoding:connectionEncoding]];
}
+ // Determine whether this table is a table or a view via the create table command, and get the table details
+ queryResult = [mySQLConnection queryString:[NSString stringWithFormat:@"SHOW CREATE TABLE %@", [tableName backtickQuotedString]]];
+ if ( [queryResult numOfRows] ) {
+ tableDetails = [NSDictionary dictionaryWithDictionary:[queryResult fetchRowAsDictionary]];
+ if ([tableDetails objectForKey:@"Create View"]) {
+ tableDetails = [NSDictionary dictionaryWithDictionary:[tableDataInstance informationForView:tableName]];
+ } else {
+ tableDetails = [NSDictionary dictionaryWithDictionary:[tableDataInstance informationForTable:tableName]];
+ }
+ }
+
// Retrieve the table details via the data class, and use it to build an array containing column numeric status
- tableDetails = [NSDictionary dictionaryWithDictionary:[tableDataInstance informationForTable:tableName]];
tableColumnNumericStatus = [NSMutableArray array];
for ( j = 0; j < [[tableDetails objectForKey:@"columns"] count] ; j++ ) {
tableColumnTypeGrouping = [[[tableDetails objectForKey:@"columns"] objectAtIndex:j] objectForKey:@"typegrouping"];
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 18:43:28 +0000