aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/ExportDialog.xib224
-rw-r--r--Source/SPExportController.h1
-rw-r--r--Source/SPExportController.m2
-rw-r--r--Source/SPExportFileUtilities.m11
-rw-r--r--Source/SPExportInitializer.m1
-rw-r--r--Source/SPSQLExporter.h6
-rw-r--r--Source/SPSQLExporter.m9
7 files changed, 165 insertions, 89 deletions
diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib
index dc47424b..74e13c6f 100644
--- a/Interfaces/English.lproj/ExportDialog.xib
+++ b/Interfaces/English.lproj/ExportDialog.xib
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
+ <string key="IBDocument.SystemVersion">10K540</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
- <string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.AppKitVersion">1038.36</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -21,13 +21,13 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1305"/>
+ <integer value="1"/>
<integer value="1086"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.brandonwalkin.BWToolkit</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -47,13 +47,13 @@
<object class="NSWindowTemplate" id="834889278">
<int key="NSWindowStyleMask">4111</int>
<int key="NSWindowBacking">2</int>
- <string key="NSWindowRect">{{610, 291}, {517, 480}}</string>
+ <string key="NSWindowRect">{{610, 273}, {517, 498}}</string>
<int key="NSWTFlags">611845120</int>
<string key="NSWindowTitle">Export Window</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
- <string key="NSWindowContentMinSize">{517, 480}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMinSize">{517, 498}</string>
<object class="NSView" key="NSWindowView" id="13817034">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -62,7 +62,7 @@
<object class="NSTabView" id="109227463">
<reference key="NSNextResponder" ref="13817034"/>
<int key="NSvFlags">18</int>
- <string key="NSFrame">{{-8, 69}, {533, 405}}</string>
+ <string key="NSFrame">{{-8, 69}, {533, 423}}</string>
<reference key="NSSuperview" ref="13817034"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -71,7 +71,7 @@
<object class="NSView" key="NSView" id="254508059">
<reference key="NSNextResponder" ref="109227463"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 33}, {513, 359}}</string>
+ <string key="NSFrame">{{10, 33}, {513, 377}}</string>
<reference key="NSSuperview" ref="109227463"/>
</object>
<string key="NSLabel">SQL</string>
@@ -81,7 +81,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="1056664274">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<reference key="NSTabView" ref="109227463"/>
@@ -91,7 +91,7 @@
<object class="NSView" key="NSView" id="975133006">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 33}, {447, 359}}</string>
+ <string key="NSFrame">{{10, 33}, {513, 377}}</string>
</object>
<string key="NSLabel">CSV</string>
<reference key="NSColor" ref="683790803"/>
@@ -102,7 +102,7 @@
<object class="NSView" key="NSView" id="351963414">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 33}, {447, 359}}</string>
+ <string key="NSFrame">{{10, 33}, {513, 377}}</string>
</object>
<string key="NSLabel">XML</string>
<reference key="NSColor" ref="683790803"/>
@@ -113,7 +113,7 @@
<object class="NSView" key="NSView" id="622234095">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 33}, {447, 359}}</string>
+ <string key="NSFrame">{{10, 33}, {513, 377}}</string>
</object>
<string key="NSLabel">Dot</string>
<reference key="NSColor" ref="683790803"/>
@@ -444,12 +444,12 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{517, 480}</string>
+ <string key="NSFrameSize">{517, 498}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMinSize">{517, 502}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMinSize">{517, 520}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName">SPExportWindow</string>
</object>
<object class="NSWindowTemplate" id="480162967">
@@ -462,7 +462,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{213, 50}</string>
<object class="NSView" key="NSWindowView" id="217849587">
<nil key="NSNextResponder"/>
@@ -586,7 +586,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{213, 72}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSWindowTemplate" id="172544148">
<int key="NSWindowStyleMask">9</int>
@@ -598,7 +598,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="487307915">
<nil key="NSNextResponder"/>
@@ -785,7 +785,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{213, 129}</string>
- <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
+ <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSCustomView" id="1039688935">
<reference key="NSNextResponder"/>
@@ -795,7 +795,7 @@
<object class="NSPopUpButton" id="429080228">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 266}, {207, 22}}</string>
+ <string key="NSFrame">{{17, 285}, {207, 22}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="176341375">
@@ -990,14 +990,14 @@
<bool key="NSTransparent">NO</bool>
</object>
</object>
- <string key="NSFrame">{{0, 188}, {517, 108}}</string>
+ <string key="NSFrame">{{0, 207}, {517, 108}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSButton" id="93580453">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{32, 297}, {467, 28}}</string>
+ <string key="NSFrame">{{32, 316}, {467, 28}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="704057245">
@@ -1018,7 +1018,7 @@
<object class="NSButton" id="585337816">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{9, 299}, {29, 26}}</string>
+ <string key="NSFrame">{{9, 318}, {29, 26}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="240404499">
@@ -1125,7 +1125,7 @@
<object class="NSButton" id="1058029781">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">265</int>
- <string key="NSFrame">{{408, 325}, {94, 28}}</string>
+ <string key="NSFrame">{{408, 344}, {94, 28}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="808873518">
@@ -1145,7 +1145,7 @@
<object class="NSBox" id="212414565">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">10</int>
- <string key="NSFrame">{{20, 293}, {477, 5}}</string>
+ <string key="NSFrame">{{20, 312}, {477, 5}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1167,7 +1167,7 @@
<object class="NSTextField" id="412690578">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">266</int>
- <string key="NSFrame">{{73, 330}, {332, 19}}</string>
+ <string key="NSFrame">{{73, 349}, {332, 19}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="291144691">
@@ -1184,7 +1184,7 @@
<object class="NSTextField" id="85590559">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 332}, {51, 14}}</string>
+ <string key="NSFrame">{{17, 351}, {51, 14}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="869459931">
@@ -1200,7 +1200,7 @@
<object class="NSButton" id="238794017">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{226, 269}, {273, 18}}</string>
+ <string key="NSFrame">{{226, 288}, {273, 18}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="328323922">
@@ -1222,7 +1222,7 @@
<object class="NSTabView" id="683006936">
<reference key="NSNextResponder" ref="1039688935"/>
<int key="NSvFlags">17</int>
- <string key="NSFrame">{{225, 16}, {276, 249}}</string>
+ <string key="NSFrame">{{225, 16}, {276, 268}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<object class="NSMutableArray" key="NSTabViewItems">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1236,7 +1236,7 @@
<object class="NSButton" id="896448830">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{11, 176}, {233, 18}}</string>
+ <string key="NSFrame">{{11, 195}, {233, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1070796296">
@@ -1258,7 +1258,7 @@
<object class="NSTextField" id="868197026">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 200}, {233, 14}}</string>
+ <string key="NSFrame">{{12, 219}, {233, 14}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="882864517">
@@ -1274,7 +1274,7 @@
<object class="NSTextField" id="904279924">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 96}, {233, 14}}</string>
+ <string key="NSFrame">{{12, 95}, {233, 14}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="460496284">
@@ -1290,7 +1290,7 @@
<object class="NSButton" id="636989900">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 136}, {232, 18}}</string>
+ <string key="NSFrame">{{12, 135}, {232, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1026671526">
@@ -1312,7 +1312,7 @@
<object class="NSButton" id="163591590">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 116}, {232, 18}}</string>
+ <string key="NSFrame">{{12, 115}, {232, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="902213604">
@@ -1334,7 +1334,7 @@
<object class="NSButton" id="472940336">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 156}, {232, 18}}</string>
+ <string key="NSFrame">{{12, 155}, {232, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="619630097">
@@ -1356,7 +1356,7 @@
<object class="NSButton" id="771021044">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 72}, {232, 18}}</string>
+ <string key="NSFrame">{{12, 71}, {232, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="302595793">
@@ -1378,7 +1378,7 @@
<object class="NSButton" id="243826641">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 52}, {232, 18}}</string>
+ <string key="NSFrame">{{12, 51}, {232, 18}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="595529721">
@@ -1400,7 +1400,7 @@
<object class="NSTextField" id="864598499">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 32}, {233, 14}}</string>
+ <string key="NSFrame">{{12, 31}, {233, 14}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="618129698">
@@ -1416,7 +1416,7 @@
<object class="NSTextField" id="946500215">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{15, 5}, {60, 19}}</string>
+ <string key="NSFrame">{{15, 4}, {60, 19}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="754103523">
@@ -1502,7 +1502,7 @@
<object class="NSPopUpButton" id="137273930">
<reference key="NSNextResponder" ref="311280472"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{80, 2}, {117, 22}}</string>
+ <string key="NSFrame">{{80, 1}, {117, 22}}</string>
<reference key="NSSuperview" ref="311280472"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="341187036">
@@ -1554,8 +1554,30 @@
<int key="NSArrowPosition">2</int>
</object>
</object>
+ <object class="NSButton" id="855467986">
+ <reference key="NSNextResponder" ref="311280472"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{29, 175}, {215, 18}}</string>
+ <reference key="NSSuperview" ref="311280472"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="368147897">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">131072</int>
+ <string key="NSContents">Auto increment value</string>
+ <reference key="NSSupport" ref="26"/>
+ <reference key="NSControlView" ref="855467986"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <reference key="NSNormalImage" ref="191147027"/>
+ <reference key="NSAlternateImage" ref="506551266"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">SQL</string>
<reference key="NSColor" ref="683790803"/>
@@ -1571,7 +1593,7 @@
<object class="NSMatrix" id="28875144">
<reference key="NSNextResponder" ref="15125403"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{14, 116}, {106, 100}}</string>
+ <string key="NSFrame">{{14, 135}, {106, 100}}</string>
<reference key="NSSuperview" ref="15125403"/>
<bool key="NSEnabled">YES</bool>
<int key="NSNumRows">2</int>
@@ -1768,7 +1790,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="427812983">
<reference key="NSNextResponder" ref="15125403"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{33, 147}, {154, 42}}</string>
+ <string key="NSFrame">{{33, 166}, {154, 42}}</string>
<reference key="NSSuperview" ref="15125403"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="592352325">
@@ -1784,7 +1806,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="114464704">
<reference key="NSNextResponder" ref="15125403"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{33, 66}, {154, 42}}</string>
+ <string key="NSFrame">{{33, 85}, {154, 42}}</string>
<reference key="NSSuperview" ref="15125403"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="866512404">
@@ -1798,7 +1820,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">Excel</string>
<reference key="NSColor" ref="683790803"/>
@@ -1814,7 +1836,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="431819810">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{5, 178}, {240, 14}}</string>
+ <string key="NSFrame">{{5, 197}, {240, 14}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="704779797">
@@ -1830,7 +1852,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="154639832">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{5, 79}, {240, 14}}</string>
+ <string key="NSFrame">{{5, 98}, {240, 14}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="476159630">
@@ -1846,7 +1868,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="118891385">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{46, 125}, {199, 17}}</string>
+ <string key="NSFrame">{{46, 144}, {199, 17}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="677830525">
@@ -1862,7 +1884,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="897158083">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{46, 150}, {199, 17}}</string>
+ <string key="NSFrame">{{46, 169}, {199, 17}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="51337104">
@@ -1878,7 +1900,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSComboBox" id="160760073">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 149}, {36, 22}}</string>
+ <string key="NSFrame">{{8, 168}, {36, 22}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="24725207">
@@ -1979,7 +2001,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSComboBox" id="43051200">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 124}, {36, 22}}</string>
+ <string key="NSFrame">{{8, 143}, {36, 22}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="802916595">
@@ -2061,7 +2083,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSComboBox" id="1056509825">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 97}, {36, 22}}</string>
+ <string key="NSFrame">{{8, 116}, {36, 22}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="590352278">
@@ -2143,7 +2165,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="291048492">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{46, 98}, {199, 17}}</string>
+ <string key="NSFrame">{{46, 117}, {199, 17}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="725186903">
@@ -2159,7 +2181,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSComboBox" id="216687791">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 50}, {36, 22}}</string>
+ <string key="NSFrame">{{8, 69}, {36, 22}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="755941142">
@@ -2242,7 +2264,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="17832185">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{46, 51}, {199, 17}}</string>
+ <string key="NSFrame">{{46, 70}, {199, 17}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="188018483">
@@ -2258,7 +2280,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="586747972">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{5, 198}, {259, 18}}</string>
+ <string key="NSFrame">{{5, 217}, {259, 18}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="306434977">
@@ -2279,7 +2301,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="768545032">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{5, 29}, {240, 14}}</string>
+ <string key="NSFrame">{{5, 48}, {240, 14}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="112977810">
@@ -2295,7 +2317,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="445644168">
<reference key="NSNextResponder" ref="251397907"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{8, 2}, {55, 19}}</string>
+ <string key="NSFrame">{{8, 21}, {55, 19}}</string>
<reference key="NSSuperview" ref="251397907"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="95838642">
@@ -2310,7 +2332,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
<reference key="NSSuperview" ref="683006936"/>
</object>
<string key="NSLabel">CSV</string>
@@ -2322,7 +2344,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSView" key="NSView" id="701209678">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">HTML</string>
<reference key="NSColor" ref="683790803"/>
@@ -2338,7 +2360,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="65089502">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{11, 112}, {72, 14}}</string>
+ <string key="NSFrame">{{11, 131}, {72, 14}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="649072289">
@@ -2354,7 +2376,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="700877238">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{14, 85}, {55, 19}}</string>
+ <string key="NSFrame">{{14, 104}, {55, 19}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="120501725">
@@ -2371,7 +2393,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="68485429">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{11, 152}, {179, 18}}</string>
+ <string key="NSFrame">{{11, 171}, {179, 18}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="628367768">
@@ -2393,7 +2415,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="283307909">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{12, 176}, {180, 14}}</string>
+ <string key="NSFrame">{{12, 195}, {180, 14}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="442957493">
@@ -2409,7 +2431,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="542859898">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{11, 132}, {179, 18}}</string>
+ <string key="NSFrame">{{11, 151}, {179, 18}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="588899969">
@@ -2431,7 +2453,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSPopUpButton" id="132499812">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{59, 193}, {119, 22}}</string>
+ <string key="NSFrame">{{59, 212}, {119, 22}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="732046199">
@@ -2486,7 +2508,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTextField" id="875960206">
<reference key="NSNextResponder" ref="855848511"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{11, 198}, {46, 14}}</string>
+ <string key="NSFrame">{{11, 217}, {46, 14}}</string>
<reference key="NSSuperview" ref="855848511"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="713176599">
@@ -2500,7 +2522,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">XML</string>
<reference key="NSColor" ref="683790803"/>
@@ -2511,7 +2533,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSView" key="NSView" id="1016607584">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">PDF</string>
<reference key="NSColor" ref="683790803"/>
@@ -2527,7 +2549,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSButton" id="227266718">
<reference key="NSNextResponder" ref="243567307"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{2, 198}, {262, 18}}</string>
+ <string key="NSFrame">{{2, 217}, {262, 18}}</string>
<reference key="NSSuperview" ref="243567307"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="464364038">
@@ -2546,7 +2568,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
</object>
- <string key="NSFrame">{{10, 7}, {256, 229}}</string>
+ <string key="NSFrame">{{10, 7}, {256, 248}}</string>
</object>
<string key="NSLabel">Dot</string>
<reference key="NSColor" ref="683790803"/>
@@ -2576,7 +2598,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTableView" id="324452213">
<reference key="NSNextResponder" ref="475696168"/>
<int key="NSvFlags">4352</int>
- <string key="NSFrameSize">{199, 201}</string>
+ <string key="NSFrameSize">{199, 220}</string>
<reference key="NSSuperview" ref="475696168"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="181185916">
@@ -2750,7 +2772,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object>
- <string key="NSFrame">{{1, 17}, {199, 201}}</string>
+ <string key="NSFrame">{{1, 17}, {199, 220}}</string>
<reference key="NSSuperview" ref="505274803"/>
<reference key="NSNextKeyView" ref="324452213"/>
<reference key="NSDocView" ref="324452213"/>
@@ -2793,7 +2815,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<reference ref="307218216"/>
</object>
- <string key="NSFrame">{{21, 43}, {201, 219}}</string>
+ <string key="NSFrame">{{21, 43}, {201, 238}}</string>
<reference key="NSSuperview" ref="1039688935"/>
<reference key="NSNextKeyView" ref="475696168"/>
<int key="NSsFlags">530</int>
@@ -2805,7 +2827,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
</object>
- <string key="NSFrameSize">{517, 359}</string>
+ <string key="NSFrameSize">{517, 378}</string>
<reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
@@ -3480,6 +3502,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">1389</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">exportSQLIncludeAutoIncrementValueButton</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="855467986"/>
+ </object>
+ <int key="connectionID">1394</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -4166,6 +4196,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="636989900"/>
<reference ref="868197026"/>
<reference ref="896448830"/>
+ <reference ref="855467986"/>
</object>
<reference key="parent" ref="286086449"/>
</object>
@@ -5066,6 +5097,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="965845845"/>
<reference key="parent" ref="0"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1392</int>
+ <reference key="object" ref="855467986"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="368147897"/>
+ </object>
+ <reference key="parent" ref="311280472"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1393</int>
+ <reference key="object" ref="368147897"/>
+ <reference key="parent" ref="855467986"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -5152,6 +5197,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>1153.IBPluginDependency</string>
<string>1153.IBViewBoundsToFrameTransform</string>
<string>1154.IBPluginDependency</string>
+ <string>1154.IBViewBoundsToFrameTransform</string>
<string>1155.IBPluginDependency</string>
<string>1156.IBPluginDependency</string>
<string>1156.IBViewBoundsToFrameTransform</string>
@@ -5298,6 +5344,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>1376.IBPluginDependency</string>
<string>1378.IBPluginDependency</string>
<string>1379.IBPluginDependency</string>
+ <string>1392.IBPluginDependency</string>
+ <string>1393.IBPluginDependency</string>
<string>2.IBPluginDependency</string>
<string>2.IBUserGuides</string>
<string>294.IBEditorWindowLastContentRect</string>
@@ -5363,15 +5411,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{329, 286}, {517, 480}}</string>
+ <string>{{241, 268}, {517, 498}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO"/>
<boolean value="NO"/>
- <string>{{329, 286}, {517, 480}}</string>
+ <string>{{241, 268}, {517, 498}}</string>
<boolean value="NO"/>
<boolean value="YES"/>
- <string>{517, 480}</string>
- <string>{{333, 497}, {517, 359}}</string>
+ <string>{517, 498}</string>
+ <string>{{586, 259}, {517, 378}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
@@ -5500,6 +5548,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABBQAAAwywAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABBQAAAwwoAAA</bytes>
+ </object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
@@ -5737,6 +5788,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<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>
<object class="NSMutableArray">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
@@ -5824,7 +5877,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1389</int>
+ <int key="maxID">1394</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -6261,6 +6314,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>exportProgressWindow</string>
<string>exportRefreshTablesButton</string>
<string>exportSQLBLOBFieldsAsHexCheck</string>
+ <string>exportSQLIncludeAutoIncrementValueButton</string>
<string>exportSQLIncludeContentCheck</string>
<string>exportSQLIncludeDropSyntaxCheck</string>
<string>exportSQLIncludeErrorsCheck</string>
@@ -6324,6 +6378,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
+ <string>NSButton</string>
<string>NSPopUpButton</string>
<string>NSTextField</string>
<string>NSButton</string>
@@ -6382,6 +6437,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>exportProgressWindow</string>
<string>exportRefreshTablesButton</string>
<string>exportSQLBLOBFieldsAsHexCheck</string>
+ <string>exportSQLIncludeAutoIncrementValueButton</string>
<string>exportSQLIncludeContentCheck</string>
<string>exportSQLIncludeDropSyntaxCheck</string>
<string>exportSQLIncludeErrorsCheck</string>
@@ -6547,6 +6603,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">exportSQLIncludeAutoIncrementValueButton</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">exportSQLIncludeContentCheck</string>
<string key="candidateClassName">NSButton</string>
</object>
diff --git a/Source/SPExportController.h b/Source/SPExportController.h
index 0130d508..00f0ac62 100644
--- a/Source/SPExportController.h
+++ b/Source/SPExportController.h
@@ -92,6 +92,7 @@
IBOutlet NSButton *exportSQLBLOBFieldsAsHexCheck;
IBOutlet NSTextField *exportSQLInsertNValueTextField;
IBOutlet NSPopUpButton *exportSQLInsertDividerPopUpButton;
+ IBOutlet NSButton *exportSQLIncludeAutoIncrementValueButton;
// Excel
IBOutlet NSMatrix *exportExcelSheetOrFilePerTableMatrix;
diff --git a/Source/SPExportController.m b/Source/SPExportController.m
index b22d2c32..54be5b91 100644
--- a/Source/SPExportController.m
+++ b/Source/SPExportController.m
@@ -582,6 +582,8 @@ static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled";
*/
- (IBAction)toggleSQLIncludeStructure:(id)sender
{
+ [exportSQLIncludeAutoIncrementValueButton setEnabled:[sender state]];
+
[[exportTableList tableColumnWithIdentifier:SPTableViewStructureColumnID] setHidden:(![sender state])];
[self _toggleExportButtonOnBackgroundThread];
diff --git a/Source/SPExportFileUtilities.m b/Source/SPExportFileUtilities.m
index b23d0b78..f3ae56e9 100644
--- a/Source/SPExportFileUtilities.m
+++ b/Source/SPExportFileUtilities.m
@@ -35,10 +35,13 @@ typedef enum
SPExportErrorCancelExport = 0,
SPExportErrorReplaceFiles = 1,
SPExportErrorSkipErrorFiles = 2
-} SPExportErrorChoice;
+}
+SPExportErrorChoice;
@interface SPExportController (SPExportFileUtilitiesPrivateAPI)
- - (void)_reopenExportSheet;
+
+- (void)_reopenExportSheet;
+
@end
@implementation SPExportController (SPExportFileUtilities)
@@ -302,10 +305,6 @@ typedef enum
}
}
-@end
-
-@implementation SPExportController (SPExportFileUtilitiesPrivateAPI)
-
/**
* Re-open the export sheet without resetting the interface - for use on error.
*/
diff --git a/Source/SPExportInitializer.m b/Source/SPExportInitializer.m
index f9d23b63..df615495 100644
--- a/Source/SPExportInitializer.m
+++ b/Source/SPExportInitializer.m
@@ -275,6 +275,7 @@
[sqlExporter setSqlOutputIncludeUTF8BOM:[exportUseUTF8BOMButton state]];
[sqlExporter setSqlOutputEncodeBLOBasHex:[exportSQLBLOBFieldsAsHexCheck state]];
[sqlExporter setSqlOutputIncludeErrors:[exportSQLIncludeErrorsCheck state]];
+ [sqlExporter setSqlOutputIncludeAutoIncrement:([exportSQLIncludeStructureCheck state] && [exportSQLIncludeAutoIncrementValueButton state])];
[sqlExporter setSqlInsertAfterNValue:[exportSQLInsertNValueTextField integerValue]];
[sqlExporter setSqlInsertDivider:[exportSQLInsertDividerPopUpButton indexOfSelectedItem]];
diff --git a/Source/SPSQLExporter.h b/Source/SPSQLExporter.h
index 559cdc9e..b5621bd1 100644
--- a/Source/SPSQLExporter.h
+++ b/Source/SPSQLExporter.h
@@ -50,6 +50,7 @@
BOOL sqlOutputIncludeUTF8BOM;
BOOL sqlOutputEncodeBLOBasHex;
BOOL sqlOutputIncludeErrors;
+ BOOL sqlOutputIncludeAutoIncrement;
SPSQLExportInsertDivider sqlInsertDivider;
@@ -110,6 +111,11 @@
@property(readwrite, assign) BOOL sqlOutputIncludeErrors;
/**
+ * @property sqlOutputIncludeAutoIncrement Include auto increment in structure definition
+ */
+@property(readwrite, assign) BOOL sqlOutputIncludeAutoIncrement;
+
+/**
* @property sqlCurrentTableExportIndex Number of tables processed by exporter
*/
@property(readwrite, assign) NSUInteger sqlCurrentTableExportIndex;
diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m
index 4c7903fc..66411932 100644
--- a/Source/SPSQLExporter.m
+++ b/Source/SPSQLExporter.m
@@ -31,8 +31,9 @@
#import "SPExportUtilities.h"
#import "SPExportFile.h"
#import "SPTableData.h"
+#import "RegexKitLite.h"
-@interface SPSQLExporter (PrivateAPI)
+@interface SPSQLExporter ()
- (NSString *)_createViewPlaceholderSyntaxForView:(NSString *)viewName;
@@ -50,6 +51,7 @@
@synthesize sqlOutputIncludeUTF8BOM;
@synthesize sqlOutputEncodeBLOBasHex;
@synthesize sqlOutputIncludeErrors;
+@synthesize sqlOutputIncludeAutoIncrement;
@synthesize sqlCurrentTableExportIndex;
@synthesize sqlInsertAfterNValue;
@synthesize sqlInsertDivider;
@@ -263,6 +265,11 @@
createTableSyntax = [[[NSString alloc] initWithData:createTableSyntax encoding:[self exportOutputEncoding]] autorelease];
}
+ // If necessary strip out the AUTO_INCREMENT from the table structure definition
+ if (![self sqlOutputIncludeAutoIncrement]) {
+ createTableSyntax = [createTableSyntax stringByReplacingOccurrencesOfRegex:[NSString stringWithFormat:@"AUTO_INCREMENT=[0-9]+ "] withString:@""];
+ }
+
[[self exportOutputFile] writeData:[createTableSyntax dataUsingEncoding:NSUTF8StringEncoding]];
[[self exportOutputFile] writeData:[[NSString stringWithString:@";\n\n"] dataUsingEncoding:NSUTF8StringEncoding]];
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 18:21:22 +0000