• CSV Import Field Mapper

- added the chance to mark a global value as SQL statement in the sheet to allow to use a calculated value like LENGTH(`foo`) or NOW() while inserting/replacing/updating
• added ^⌥⌘N short-cut Navigator (still hidden)

5 files changed, 184 insertions, 70 deletions

diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib
index a3cc1947..d57f084b 100644
--- a/Interfaces/English.lproj/DataMigrationDialog.xib
+++ b/Interfaces/English.lproj/DataMigrationDialog.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="133"/>
+			<integer value="162"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -65,11 +65,13 @@
 									<int key="NSvFlags">256</int>
 									<string key="NSFrame">{{1, 2.5}, {544, 0}}</string>
 									<reference key="NSSuperview" ref="412235166"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{-12, 53}, {546, 2}}</string>
 							<string key="NSBounds">{{0, 1.5}, {546, 0}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -119,6 +121,7 @@
 											<int key="NSvFlags">269</int>
 											<string key="NSFrame">{{175, 12}, {168, 17}}</string>
 											<reference key="NSSuperview" ref="297364507"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="922239869">
 												<int key="NSCellFlags">68288064</int>
@@ -153,10 +156,12 @@
 									</object>
 									<string key="NSFrame">{{1, 1}, {522, 39}}</string>
 									<reference key="NSSuperview" ref="617902336"/>
+									<reference key="NSWindow"/>
 								</object>
 							</object>
 							<string key="NSFrame">{{-1, 308}, {524, 41}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
 								<int key="NSCellFlags">67239424</int>
@@ -194,12 +199,14 @@
 											<int key="NSvFlags">288</int>
 											<string key="NSFrameSize">{522, 126}</string>
 											<reference key="NSSuperview" ref="929465390"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="1025336439">
 												<reference key="NSNextResponder" ref="622202999"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{522, 17}</string>
 												<reference key="NSSuperview" ref="622202999"/>
+												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="678921094"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="20192669">
@@ -207,6 +214,7 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{-22, 0}, {12, 17}}</string>
 												<reference key="NSSuperview" ref="495172082"/>
+												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -458,6 +466,7 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {522, 126}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="678921094"/>
 									<reference key="NSDocView" ref="678921094"/>
 									<object class="NSColor" key="NSBGColor" id="518286732">
@@ -473,6 +482,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{413, 18}, {11, 140}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">256</int>
 									<reference key="NSTarget" ref="495172082"/>
 									<string key="NSAction">_doScroller:</string>
@@ -483,6 +493,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {227, 11}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="495172082"/>
 									<string key="NSAction">_doScroller:</string>
@@ -498,6 +509,7 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {522, 17}}</string>
 									<reference key="NSSuperview" ref="495172082"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1025336439"/>
 									<reference key="NSDocView" ref="1025336439"/>
 									<reference key="NSBGColor" ref="518286732"/>
@@ -507,6 +519,7 @@
 							</object>
 							<string key="NSFrame">{{-1, 129}, {524, 144}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="929465390"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="59350381"/>
@@ -521,6 +534,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{343, 12}, {82, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="977848648">
 								<int key="NSCellFlags">67239424</int>
@@ -546,6 +560,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{425, 12}, {83, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="291690242">
@@ -569,6 +584,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{20, 19}, {32, 24}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="87458302">
 								<int key="NSCellFlags">604110336</int>
@@ -593,6 +609,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{51, 19}, {32, 24}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="809975974">
@@ -619,6 +636,7 @@
 							<int key="NSvFlags">294</int>
 							<string key="NSFrame">{{88, 23}, {155, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="929441265">
 								<int key="NSCellFlags">67239488</int>
@@ -635,6 +653,7 @@
 							<int key="NSvFlags">267</int>
 							<string key="NSFrame">{{290, 278}, {215, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="107647973">
 								<int key="NSCellFlags">-2076049856</int>
@@ -667,6 +686,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{372, 97}, {133, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="1033308908">
 								<int key="NSCellFlags">-2076049856</int>
@@ -731,6 +751,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{276, 102}, {94, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="869323357">
 								<int key="NSCellFlags">68288064</int>
@@ -755,6 +776,7 @@
 							</object>
 							<string key="NSFrame">{{5, 280}, {260, 20}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPathCell" key="NSCell" id="183652084">
 								<int key="NSCellFlags">69336641</int>
@@ -804,6 +826,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{17, 100}, {188, 18}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="413696615">
 								<int key="NSCellFlags">-2080244224</int>
@@ -831,6 +854,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{372, 73}, {133, 22}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="940205369">
 								<int key="NSCellFlags">-2076049856</int>
@@ -913,6 +937,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{253, 79}, {117, 14}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="498123343">
 								<int key="NSCellFlags">68288064</int>
@@ -929,6 +954,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{239, 12}, {82, 32}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="538595338">
 								<int key="NSCellFlags">67239424</int>
@@ -949,6 +975,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{11, 56}, {29, 26}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1001034034">
 								<int key="NSCellFlags">67239424</int>
@@ -975,6 +1002,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{17, 8}, {100, 18}}</string>
 									<reference key="NSSuperview" ref="892658687"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="385836359">
 										<int key="NSCellFlags">67239424</int>
@@ -997,6 +1025,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{132, 8}, {80, 18}}</string>
 									<reference key="NSSuperview" ref="892658687"/>
+									<reference key="NSWindow"/>
 									<int key="NSTag">1</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="767775548">
@@ -1018,6 +1047,7 @@
 							</object>
 							<string key="NSFrame">{{145, 20}, {230, 44}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 						<object class="NSCustomView" id="219742831">
@@ -1030,6 +1060,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{227, 62}, {134, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="843921917">
 										<int key="NSCellFlags">-2080244224</int>
@@ -1085,6 +1116,7 @@
 													</object>
 													<string key="NSFrameSize">{400, 14}</string>
 													<reference key="NSSuperview" ref="396898918"/>
+													<reference key="NSWindow"/>
 													<object class="NSTextContainer" key="NSTextContainer" id="510363477">
 														<object class="NSLayoutManager" key="NSLayoutManager">
 															<object class="NSTextStorage" key="NSTextStorage">
@@ -1164,6 +1196,7 @@
 											</object>
 											<string key="NSFrame">{{1, 1}, {400, 37}}</string>
 											<reference key="NSSuperview" ref="952580067"/>
+											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="249839159"/>
 											<reference key="NSDocView" ref="249839159"/>
 											<reference key="NSBGColor" ref="746040121"/>
@@ -1178,6 +1211,7 @@
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{386, 1}, {15, 37}}</string>
 											<reference key="NSSuperview" ref="952580067"/>
+											<reference key="NSWindow"/>
 											<int key="NSsFlags">512</int>
 											<reference key="NSTarget" ref="952580067"/>
 											<string key="NSAction">_doScroller:</string>
@@ -1189,6 +1223,7 @@
 											<int key="NSvFlags">-2147483392</int>
 											<string key="NSFrame">{{-100, -100}, {87, 15}}</string>
 											<reference key="NSSuperview" ref="952580067"/>
+											<reference key="NSWindow"/>
 											<int key="NSsFlags">513</int>
 											<reference key="NSTarget" ref="952580067"/>
 											<string key="NSAction">_doScroller:</string>
@@ -1198,6 +1233,7 @@
 									</object>
 									<string key="NSFrame">{{20, 20}, {402, 39}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="396898918"/>
 									<int key="NSsFlags">530</int>
 									<reference key="NSVScroller" ref="24215372"/>
@@ -1209,6 +1245,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{227, 85}, {104, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="776859395">
 										<int key="NSCellFlags">67239424</int>
@@ -1231,6 +1268,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{17, 85}, {100, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="666818493">
 										<int key="NSCellFlags">67239424</int>
@@ -1253,6 +1291,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{17, 62}, {181, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<int key="NSTag">2</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="265447544">
@@ -1276,6 +1315,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{137, 85}, {80, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<int key="NSTag">1</int>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="548754049">
@@ -1299,6 +1339,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{354, 85}, {70, 18}}</string>
 									<reference key="NSSuperview" ref="219742831"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="115350738">
 										<int key="NSCellFlags">67239424</int>
@@ -1319,6 +1360,7 @@
 							</object>
 							<string key="NSFrame">{{39, -57}, {442, 121}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 						<object class="NSCustomView" id="471578497">
@@ -1331,6 +1373,7 @@
 									<int key="NSvFlags">289</int>
 									<string key="NSFrame">{{213, 8}, {139, 18}}</string>
 									<reference key="NSSuperview" ref="471578497"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="450486129">
 										<int key="NSCellFlags">67239424</int>
@@ -1353,6 +1396,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{17, 8}, {100, 18}}</string>
 									<reference key="NSSuperview" ref="471578497"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="162288118">
 										<int key="NSCellFlags">67239424</int>
@@ -1375,6 +1419,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{132, 8}, {70, 18}}</string>
 									<reference key="NSSuperview" ref="471578497"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="591185810">
 										<int key="NSCellFlags">67239424</int>
@@ -1395,6 +1440,7 @@
 							</object>
 							<string key="NSFrame">{{66, 20}, {377, 44}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 						<object class="NSButton" id="317672858">
@@ -1402,6 +1448,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{34, 58}, {58, 23}}</string>
 							<reference key="NSSuperview" ref="78582513"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="365850666">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1420,6 +1467,7 @@
 					</object>
 					<string key="NSFrameSize">{522, 348}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
 				<string key="NSMinSize">{522, 370}</string>
@@ -1456,14 +1504,12 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{311, 111}</string>
 											<reference key="NSSuperview" ref="153719181"/>
-											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="293135471">
 												<reference key="NSNextResponder" ref="236935166"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{311, 17}</string>
 												<reference key="NSSuperview" ref="236935166"/>
-												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="666379639"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="535120964">
@@ -1471,7 +1517,6 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="466562755"/>
-												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1506,13 +1551,13 @@
 												</object>
 												<object class="NSTableColumn" id="1070769052">
 													<string key="NSIdentifier">global_value</string>
-													<double key="NSWidth">275</double>
+													<double key="NSWidth">240</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">Global Source Values</string>
+														<string key="NSContents">Global Source Values or SQL Expressions</string>
 														<reference key="NSSupport" ref="26"/>
 														<reference key="NSBackgroundColor" ref="646298629"/>
 														<reference key="NSTextColor" ref="186205954"/>
@@ -1531,6 +1576,39 @@
 													<bool key="NSIsEditable">YES</bool>
 													<reference key="NSTableView" ref="666379639"/>
 												</object>
+												<object class="NSTableColumn" id="221711496">
+													<string key="NSIdentifier">sql</string>
+													<double key="NSWidth">32</double>
+													<double key="NSMinWidth">32</double>
+													<double key="NSMaxWidth">32</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">SQL</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="646298629"/>
+														<reference key="NSTextColor" ref="186205954"/>
+													</object>
+													<object class="NSButtonCell" key="NSDataCell" id="536255044">
+														<int key="NSCellFlags">67239424</int>
+														<int key="NSCellFlags2">201457664</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="666379639"/>
+														<int key="NSButtonFlags">1215582719</int>
+														<int key="NSButtonFlags2">2</int>
+														<reference key="NSNormalImage" ref="294469764"/>
+														<reference key="NSAlternateImage" ref="728464408"/>
+														<string key="NSAlternateContents"/>
+														<string key="NSKeyEquivalent"/>
+														<int key="NSPeriodicDelay">200</int>
+														<int key="NSPeriodicInterval">25</int>
+													</object>
+													<int key="NSResizingMask">1</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="666379639"/>
+												</object>
 											</object>
 											<double key="NSIntercellSpacingWidth">3</double>
 											<double key="NSIntercellSpacingHeight">2</double>
@@ -1548,7 +1626,7 @@
 											<int key="NSTvFlags">1522532352</int>
 											<reference key="NSDelegate"/>
 											<reference key="NSDataSource"/>
-											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSColumnAutoresizingStyle">2</int>
 											<int key="NSDraggingSourceMaskForLocal">15</int>
 											<int key="NSDraggingSourceMaskForNonLocal">0</int>
 											<bool key="NSAllowsTypeSelect">YES</bool>
@@ -1558,7 +1636,6 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {311, 111}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="666379639"/>
 									<reference key="NSDocView" ref="666379639"/>
 									<reference key="NSBGColor" ref="518286732"/>
@@ -1569,7 +1646,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="466562755"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.99065423011779785</double>
@@ -1579,7 +1655,6 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {238, 15}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<int key="NSsFlags">1</int>
 									<reference key="NSTarget" ref="466562755"/>
 									<string key="NSAction">_doScroller:</string>
@@ -1595,7 +1670,6 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {311, 17}}</string>
 									<reference key="NSSuperview" ref="466562755"/>
-									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="293135471"/>
 									<reference key="NSDocView" ref="293135471"/>
 									<reference key="NSBGColor" ref="518286732"/>
@@ -1605,7 +1679,6 @@
 							</object>
 							<string key="NSFrame">{{-1, 47}, {313, 129}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="153719181"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="818055239"/>
@@ -1620,7 +1693,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{20, 17}, {20, 23}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1062542413">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1645,7 +1717,6 @@
 							<int key="NSvFlags">-2147483356</int>
 							<string key="NSFrame">{{112, -10}, {20, 23}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="87720389">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1670,7 +1741,6 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{226, 13}, {70, 28}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="360762154">
@@ -1692,7 +1762,6 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{48, 17}, {40, 23}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="741625949">
@@ -1715,7 +1784,6 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{102, 19}, {120, 18}}</string>
 							<reference key="NSSuperview" ref="803374494"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="574058264">
 								<int key="NSCellFlags">-2080244224</int>
@@ -1736,7 +1804,6 @@
 					</object>
 					<string key="NSFrameSize">{311, 186}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string>
 				<string key="NSMinSize">{311, 208}</string>
@@ -2860,6 +2927,7 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="1031370429"/>
 							<reference ref="1070769052"/>
+							<reference ref="221711496"/>
 						</object>
 						<reference key="parent" ref="466562755"/>
 					</object>
@@ -3224,6 +3292,20 @@
 						<reference key="object" ref="843921917"/>
 						<reference key="parent" ref="80724644"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">400</int>
+						<reference key="object" ref="221711496"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="536255044"/>
+						</object>
+						<reference key="parent" ref="666379639"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="536255044"/>
+						<reference key="parent" ref="221711496"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -3366,6 +3448,8 @@
 					<string>396.IBPluginDependency</string>
 					<string>397.IBPluginDependency</string>
 					<string>40.IBPluginDependency</string>
+					<string>400.IBPluginDependency</string>
+					<string>402.IBPluginDependency</string>
 					<string>41.IBPluginDependency</string>
 					<string>42.IBPluginDependency</string>
 					<string>42.ImportedFromIB2</string>
@@ -3397,9 +3481,9 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{361, 389}, {522, 348}}</string>
+					<string>{{222, 389}, {522, 348}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{361, 389}, {522, 348}}</string>
+					<string>{{222, 389}, {522, 348}}</string>
 					<integer value="1"/>
 					<string>{{387, 725}, {432, 282}}</string>
 					<boolean value="NO"/>
@@ -3414,7 +3498,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{722, 413}, {161, 71}}</string>
+					<string>{{583, 413}, {161, 71}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3464,9 +3548,9 @@
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{68, 380}, {311, 186}}</string>
+					<string>{{160, 404}, {311, 186}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{68, 380}, {311, 186}}</string>
+					<string>{{160, 404}, {311, 186}}</string>
 					<boolean value="NO"/>
 					<boolean value="YES"/>
 					<string>{311, 186}</string>
@@ -3621,6 +3705,8 @@
 					<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"/>
@@ -3664,7 +3750,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">399</int>
+			<int key="maxID">402</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index a08f7f23..705eaafb 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -1193,7 +1193,8 @@
 									<reference key="NSMenu" ref="466354362"/>
 									<bool key="NSIsHidden">YES</bool>
 									<string key="NSTitle">Show Navigator</string>
-									<string key="NSKeyEquiv"/>
+									<string key="NSKeyEquiv">n</string>
+									<int key="NSKeyEquivModMask">1835008</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
@@ -4888,7 +4889,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{639, 365}, {237, 293}}</string>
+					<string>{{639, 365}, {251, 293}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{698, 703}, {184, 133}}</string>
diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index d291399f..ed66979c 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -83,6 +83,7 @@
 	NSMutableArray *fieldMappingOperatorOptions;
 	NSMutableArray *fieldMappingOperatorArray;
 	NSMutableArray *fieldMappingGlobalValues;
+	NSMutableArray *fieldMappingGlobalValuesSQLMarked;
 	NSMutableArray *fieldMappingTableDefaultValues;
 
 	NSNumber *doImport;
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index a269f75e..71220dd8 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -60,6 +60,7 @@
 		fieldMappingOperatorOptions    = [[NSMutableArray alloc] init];
 		fieldMappingOperatorArray      = [[NSMutableArray alloc] init];
 		fieldMappingGlobalValues       = [[NSMutableArray alloc] init];
+		fieldMappingGlobalValuesSQLMarked = [[NSMutableArray alloc] init];
 		fieldMappingArray = nil;
 
 		lastDisabledCSVFieldcolumn = [NSNumber numberWithInteger:0];
@@ -152,6 +153,7 @@
 	if (fieldMappingOperatorOptions) [fieldMappingOperatorOptions release];
 	if (fieldMappingOperatorArray) [fieldMappingOperatorArray release];
 	if (fieldMappingGlobalValues) [fieldMappingGlobalValues release];
+	if (fieldMappingGlobalValuesSQLMarked) [fieldMappingGlobalValuesSQLMarked release];
 	if (fieldMappingTableDefaultValues) [fieldMappingTableDefaultValues release];
 	[super dealloc];
 }
@@ -180,8 +182,10 @@
 		numberOfImportColumns = [NSArrayObjectAtIndex(fieldMappingImportArray, 0) count];
 
 	NSInteger i;
-	for(i=0; i<numberOfImportColumns; i++)
+	for(i=0; i<numberOfImportColumns; i++) {
 		[fieldMappingGlobalValues addObject:@"…"];
+		[fieldMappingGlobalValuesSQLMarked addObject:@"…"];
+	}
 
 }
 
@@ -210,7 +214,14 @@
 
 - (NSArray*)fieldMappingGlobalValueArray
 {
-	return fieldMappingGlobalValues;
+	NSMutableArray *globals = [NSMutableArray array];
+	for(NSInteger i=0; i < [fieldMappingGlobalValues count]; i++)
+		if([[fieldMappingGlobalValuesSQLMarked objectAtIndex:i] boolValue])
+			[globals addObject:[fieldMappingGlobalValues objectAtIndex:i]];
+		else
+			[globals addObject:[NSString stringWithFormat:@"'%@'", [fieldMappingGlobalValues objectAtIndex:i]]];
+
+	return globals;
 }
 
 - (BOOL)globalValuesInUsage
@@ -548,6 +559,7 @@
 - (IBAction)addGlobalValue:(id)sender
 {
 	[fieldMappingGlobalValues addObject:@""];
+	[fieldMappingGlobalValuesSQLMarked addObject:[NSNumber numberWithBool:NO]];
 	[globalValuesTableView reloadData];
 	[globalValuesTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[fieldMappingGlobalValues count]-1-numberOfImportColumns] byExtendingSelection:NO];
 	[globalValuesTableView editColumn:1 row:[fieldMappingGlobalValues count]-1-numberOfImportColumns withEvent:nil select:YES];
@@ -562,6 +574,7 @@
 
 	while (currentIndex != NSNotFound) {
 		[fieldMappingGlobalValues removeObjectAtIndex:currentIndex+numberOfImportColumns];
+		[fieldMappingGlobalValuesSQLMarked removeObjectAtIndex:currentIndex+numberOfImportColumns];
 		// get next index (beginning from the end)
 		currentIndex = [indexes indexLessThanIndex:currentIndex];
 	}
@@ -1025,13 +1038,13 @@
 				[c removeAllItems];
 				[c addItemsWithTitles:fieldMappingButtonOptions];
 				[m addItem:[NSMenuItem separatorItem]];
-				[c addItemWithTitle:NSLocalizedString(@"Ignore field", @"ignore field label")];
-				[c addItemWithTitle:NSLocalizedString(@"Ignore all fields", @"ignore all fields menu item")];
-				[c addItemWithTitle:NSLocalizedString(@"Import all fields", @"import all fields menu item")];
+				[c addItemWithTitle:NSLocalizedString(@"Ignore Field", @"ignore field label")];
+				[c addItemWithTitle:NSLocalizedString(@"Ignore all Fields", @"ignore all fields menu item")];
+				[c addItemWithTitle:NSLocalizedString(@"Import all Fields", @"import all fields menu item")];
 				if([[self selectedImportMethod] isEqualToString:@"UPDATE"])
-					[c addItemWithTitle:NSLocalizedString(@"Match field", @"match field menu item")];
+					[c addItemWithTitle:NSLocalizedString(@"Match Field", @"match field menu item")];
 				[m addItem:[NSMenuItem separatorItem]];
-				[c addItemWithTitle:NSLocalizedString(@"Add global value…", @"add global value menu item")];
+				[c addItemWithTitle:NSLocalizedString(@"Add Value or Expression…", @"add global value or expression menu item")];
 				[c addItemWithTitle:[NSString stringWithFormat:@"DEFAULT: %@", [fieldMappingTableDefaultValues objectAtIndex:rowIndex]]];
 				[[m itemAtIndex:[c numberOfItems]-1] setEnabled:NO];
 
@@ -1063,6 +1076,10 @@
 		else if ([[aTableColumn identifier] isEqualToString:@"global_value"]) {
 			return [fieldMappingGlobalValues objectAtIndex:numberOfImportColumns + rowIndex];
 		}
+
+		else if ([[aTableColumn identifier] isEqualToString:@"sql"])
+			return [fieldMappingGlobalValuesSQLMarked objectAtIndex:numberOfImportColumns + rowIndex];
+
 	}
 	
 	
@@ -1143,6 +1160,8 @@
 	else if(aTableView == globalValuesTableView) {
 		if ([[aTableColumn identifier] isEqualToString:@"global_value"])
 			[fieldMappingGlobalValues replaceObjectAtIndex:(numberOfImportColumns + rowIndex) withObject:anObject];
+		else if ([[aTableColumn identifier] isEqualToString:@"sql"])
+			[fieldMappingGlobalValuesSQLMarked replaceObjectAtIndex:(numberOfImportColumns + rowIndex) withObject:anObject];
 	}
 }
 
diff --git a/Source/TableDump.m b/Source/TableDump.m
index a035c750..db26db5a 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -1338,21 +1338,23 @@
 			[setString appendString:@"="];
 			// Append the data
 			// - check for global values
-			if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns)
-				cellData = NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn);
-			else
+			if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns) {
+				// Global variables are coming wrapped in ' ' if there're not marked as SQL 
+				 [setString appendString:NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn)];
+			} else {
 				cellData = NSArrayObjectAtIndex(csvRowArray, mapColumn);
 
-			// If import column isn't specified import the table column default value
-			if ([cellData isSPNotLoaded])
-				cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
+				// If import column isn't specified import the table column default value
+				if ([cellData isSPNotLoaded])
+					cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
 
-			if (cellData == [NSNull null]) {
-				[setString appendString:@"NULL"];
-			} else {
-				[setString appendString:@"'"];
-				[setString appendString:[mySQLConnection prepareString:cellData]];
-				[setString appendString:@"'"];
+				if (cellData == [NSNull null]) {
+					[setString appendString:@"NULL"];
+				} else {
+					[setString appendString:@"'"];
+					[setString appendString:[mySQLConnection prepareString:cellData]];
+					[setString appendString:@"'"];
+				}
 			}
 		}
 		// WHERE clause
@@ -1362,22 +1364,25 @@
 			[whereString appendString:[NSArrayObjectAtIndex(fieldMappingTableColumnNames, i) backtickQuotedString]];
 			// Append the data
 			// - check for global values
-			if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns)
-				cellData = NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn);
-			else
+			if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns) {
+				// Global variables are coming wrapped in ' ' if there're not marked as SQL 
+				[whereString appendString:@"="];
+				[whereString appendString:NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn)];
+			} else {
 				cellData = NSArrayObjectAtIndex(csvRowArray, mapColumn);
 
-			// If import column isn't specified import the table column default value
-			if ([cellData isSPNotLoaded])
-				cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
+				// If import column isn't specified import the table column default value
+				if ([cellData isSPNotLoaded])
+					cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
 
-			if (cellData == [NSNull null]) {
-				[whereString appendString:@" IS NULL"];
-			} else {
-				[whereString appendString:@"="];
-				[whereString appendString:@"'"];
-				[whereString appendString:[mySQLConnection prepareString:cellData]];
-				[whereString appendString:@"'"];
+				if (cellData == [NSNull null]) {
+					[whereString appendString:@" IS NULL"];
+				} else {
+					[whereString appendString:@"="];
+					[whereString appendString:@"'"];
+					[whereString appendString:[mySQLConnection prepareString:cellData]];
+					[whereString appendString:@"'"];
+				}
 			}
 		}
 	}
@@ -1407,21 +1412,23 @@
 
 		// Append the data
 		// - check for global values
-		if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns)
-			cellData = NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn);
-		else
+		if(fieldMappingArrayHasGlobalVariables && mapColumn >= numberOfImportDataColumns) {
+			// Global variables are coming wrapped in ' ' if there're not marked as SQL 
+			[valueString appendString:NSArrayObjectAtIndex(fieldMappingGlobalValueArray, mapColumn)];
+		} else {
 			cellData = NSArrayObjectAtIndex(csvRowArray, mapColumn);
 
-		// If import column isn't specified import the table column default value
-		if ([cellData isSPNotLoaded])
-			cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
+			// If import column isn't specified import the table column default value
+			if ([cellData isSPNotLoaded])
+				cellData = NSArrayObjectAtIndex(fieldMappingTableDefaultValues, i);
 
-		if (cellData == [NSNull null]) {
-			[valueString appendString:@"NULL"];
-		} else {
-			[valueString appendString:@"'"];
-			[valueString appendString:[mySQLConnection prepareString:cellData]];
-			[valueString appendString:@"'"];
+			if (cellData == [NSNull null]) {
+				[valueString appendString:@"NULL"];
+			} else {
+				[valueString appendString:@"'"];
+				[valueString appendString:[mySQLConnection prepareString:cellData]];
+				[valueString appendString:@"'"];
+			}
 		}
 	}