Put the table content filter in a split view so the field name drop down and search field can be resized. Addresses issue #339.

3 files changed, 408 insertions, 312 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 9fabfe46..092b6a8a 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="4566"/>
+			<integer value="27"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,7 +47,7 @@
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<string key="NSWindowContentMinSize">{780, 480}</string>
 				<object class="NSView" key="NSWindowView" id="579726586">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -924,11 +924,12 @@
 																												<string>longtext</string>
 																												<string>enum</string>
 																												<string>set</string>
+																												<string>bit</string>
 																											</object>
 																											<object class="NSComboTableView" key="NSTableView" id="567127181">
 																												<reference key="NSNextResponder"/>
 																												<int key="NSvFlags">274</int>
-																												<string key="NSFrameSize">{13, 486}</string>
+																												<string key="NSFrameSize">{13, 504}</string>
 																												<reference key="NSSuperview"/>
 																												<reference key="NSWindow"/>
 																												<bool key="NSEnabled">YES</bool>
@@ -2051,7 +2052,7 @@
 												<object class="NSTabViewItem" id="624106058">
 													<string key="NSIdentifier">content</string>
 													<object class="NSView" key="NSView" id="1013108064">
-														<nil key="NSNextResponder"/>
+														<reference key="NSNextResponder" ref="714795046"/>
 														<int key="NSvFlags">256</int>
 														<object class="NSMutableArray" key="NSSubviews">
 															<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2168,7 +2169,7 @@
 																	</object>
 																	<reference ref="561547869"/>
 																</object>
-																<string key="NSFrame">{{6, 32}, {690, 472}}</string>
+																<string key="NSFrame">{{6, 33}, {690, 472}}</string>
 																<reference key="NSSuperview" ref="1013108064"/>
 																<reference key="NSNextKeyView" ref="545438501"/>
 																<int key="NSsFlags">562</int>
@@ -2179,169 +2180,6 @@
 																<reference key="NSCornerView" ref="561547869"/>
 																<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
 															</object>
-															<object class="NSPopUpButton" id="830088955">
-																<reference key="NSNextResponder" ref="1013108064"/>
-																<int key="NSvFlags">264</int>
-																<string key="NSFrame">{{56, 512}, {152, 20}}</string>
-																<reference key="NSSuperview" ref="1013108064"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="376863254">
-																	<int key="NSCellFlags">-1539178944</int>
-																	<int key="NSCellFlags2">133120</int>
-																	<object class="NSFont" key="NSSupport" id="790379580">
-																		<string key="NSName">LucidaGrande</string>
-																		<double key="NSSize">1.100000e+01</double>
-																		<int key="NSfFlags">16</int>
-																	</object>
-																	<reference key="NSControlView" ref="830088955"/>
-																	<int key="NSButtonFlags">-2038284033</int>
-																	<int key="NSButtonFlags2">36</int>
-																	<reference key="NSAlternateImage" ref="790379580"/>
-																	<string key="NSAlternateContents"/>
-																	<object class="NSMutableString" key="NSKeyEquivalent">
-																		<characters key="NS.bytes"/>
-																	</object>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="1028844875">
-																		<reference key="NSMenu" ref="747439187"/>
-																		<string key="NSTitle">field</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="450876295"/>
-																		<reference key="NSMixedImage" ref="414351669"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="376863254"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="747439187">
-																		<object class="NSMutableString" key="NSTitle">
-																			<characters key="NS.bytes">OtherViews</characters>
-																		</object>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="1028844875"/>
-																		</object>
-																	</object>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-															</object>
-															<object class="NSPopUpButton" id="744029762">
-																<reference key="NSNextResponder" ref="1013108064"/>
-																<int key="NSvFlags">264</int>
-																<string key="NSFrame">{{215, 509}, {86, 25}}</string>
-																<reference key="NSSuperview" ref="1013108064"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSPopUpButtonCell" key="NSCell" id="105542136">
-																	<int key="NSCellFlags">-1539178944</int>
-																	<int key="NSCellFlags2">133120</int>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="744029762"/>
-																	<int key="NSButtonFlags">-2038415105</int>
-																	<int key="NSButtonFlags2">36</int>
-																	<string key="NSAlternateContents"/>
-																	<object class="NSMutableString" key="NSKeyEquivalent">
-																		<characters key="NS.bytes"/>
-																	</object>
-																	<int key="NSPeriodicDelay">400</int>
-																	<int key="NSPeriodicInterval">75</int>
-																	<object class="NSMenuItem" key="NSMenuItem" id="129836593">
-																		<reference key="NSMenu" ref="1000166734"/>
-																		<string key="NSTitle">is</string>
-																		<string key="NSKeyEquiv"/>
-																		<int key="NSKeyEquivModMask">1048576</int>
-																		<int key="NSMnemonicLoc">2147483647</int>
-																		<int key="NSState">1</int>
-																		<reference key="NSOnImage" ref="450876295"/>
-																		<reference key="NSMixedImage" ref="414351669"/>
-																		<string key="NSAction">_popUpItemAction:</string>
-																		<reference key="NSTarget" ref="105542136"/>
-																	</object>
-																	<bool key="NSMenuItemRespectAlignment">YES</bool>
-																	<object class="NSMenu" key="NSMenu" id="1000166734">
-																		<object class="NSMutableString" key="NSTitle">
-																			<characters key="NS.bytes">OtherViews</characters>
-																		</object>
-																		<object class="NSMutableArray" key="NSMenuItems">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<reference ref="129836593"/>
-																		</object>
-																	</object>
-																	<int key="NSSelectedIndex">-1</int>
-																	<int key="NSPreferredEdge">3</int>
-																	<bool key="NSUsesItemFromMenu">YES</bool>
-																	<bool key="NSAltersState">YES</bool>
-																	<int key="NSArrowPosition">1</int>
-																</object>
-															</object>
-															<object class="NSSearchField" id="377771536">
-																<reference key="NSNextResponder" ref="1013108064"/>
-																<int key="NSvFlags">266</int>
-																<string key="NSFrame">{{309, 513}, {172, 19}}</string>
-																<reference key="NSSuperview" ref="1013108064"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSSearchFieldCell" key="NSCell" id="667596795">
-																	<int key="NSCellFlags">879885888</int>
-																	<int key="NSCellFlags2">268567552</int>
-																	<string key="NSContents"/>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="377771536"/>
-																	<bool key="NSDrawsBackground">YES</bool>
-																	<int key="NSTextBezelStyle">1</int>
-																	<reference key="NSBackgroundColor" ref="480189472"/>
-																	<reference key="NSTextColor" ref="454249633"/>
-																	<object class="NSButtonCell" key="NSSearchButtonCell">
-																		<int key="NSCellFlags">537001472</int>
-																		<int key="NSCellFlags2">0</int>
-																		<string key="NSContents">search</string>
-																		<string key="NSAction">_searchFieldSearch:</string>
-																		<reference key="NSTarget" ref="667596795"/>
-																		<reference key="NSControlView" ref="377771536"/>
-																		<int key="NSButtonFlags">138690815</int>
-																		<int key="NSButtonFlags2">0</int>
-																		<string key="NSKeyEquivalent"/>
-																		<int key="NSPeriodicDelay">400</int>
-																		<int key="NSPeriodicInterval">75</int>
-																	</object>
-																	<object class="NSButtonCell" key="NSCancelButtonCell">
-																		<int key="NSCellFlags">537001472</int>
-																		<int key="NSCellFlags2">0</int>
-																		<string key="NSContents">clear</string>
-																		<object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
-																			<bool key="EncodedWithXMLCoder">YES</bool>
-																			<object class="NSMutableDictionary">
-																				<bool key="EncodedWithXMLCoder">YES</bool>
-																				<object class="NSMutableArray" key="dict.sortedKeys">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<string>AXDescription</string>
-																					<string>NSAccessibilityEncodedAttributesValueType</string>
-																				</object>
-																				<object class="NSMutableArray" key="dict.values">
-																					<bool key="EncodedWithXMLCoder">YES</bool>
-																					<string>cancel</string>
-																					<reference ref="9"/>
-																				</object>
-																			</object>
-																		</object>
-																		<string key="NSAction">_searchFieldCancel:</string>
-																		<reference key="NSTarget" ref="667596795"/>
-																		<reference key="NSControlView" ref="377771536"/>
-																		<int key="NSButtonFlags">138690815</int>
-																		<int key="NSButtonFlags2">0</int>
-																		<string key="NSKeyEquivalent"/>
-																		<int key="NSPeriodicDelay">400</int>
-																		<int key="NSPeriodicInterval">75</int>
-																	</object>
-																	<int key="NSMaximumRecents">255</int>
-																	<bool key="NSSendsWholeSearchString">YES</bool>
-																	<bytes key="NSSearchFieldFlags">CAAAAA</bytes>
-																</object>
-															</object>
 															<object class="NSTextField" id="572483755">
 																<reference key="NSNextResponder" ref="1013108064"/>
 																<int key="NSvFlags">265</int>
@@ -2422,22 +2260,6 @@
 																	</object>
 																</object>
 															</object>
-															<object class="NSTextField" id="905386082">
-																<reference key="NSNextResponder" ref="1013108064"/>
-																<int key="NSvFlags">268</int>
-																<string key="NSFrame">{{11, 515}, {43, 14}}</string>
-																<reference key="NSSuperview" ref="1013108064"/>
-																<bool key="NSEnabled">YES</bool>
-																<object class="NSTextFieldCell" key="NSCell" id="314592665">
-																	<int key="NSCellFlags">67239488</int>
-																	<int key="NSCellFlags2">272761856</int>
-																	<string key="NSContents">Search:</string>
-																	<reference key="NSSupport" ref="26"/>
-																	<reference key="NSControlView" ref="905386082"/>
-																	<reference key="NSBackgroundColor" ref="62854682"/>
-																	<reference key="NSTextColor" ref="454249633"/>
-																</object>
-															</object>
 															<object class="NSTextField" id="956558617">
 																<reference key="NSNextResponder" ref="1013108064"/>
 																<int key="NSvFlags">265</int>
@@ -2473,7 +2295,11 @@
 																	<int key="NSCellFlags">-2080244224</int>
 																	<int key="NSCellFlags2">134217728</int>
 																	<string key="NSContents">Filter</string>
-																	<reference key="NSSupport" ref="790379580"/>
+																	<object class="NSFont" key="NSSupport" id="790379580">
+																		<string key="NSName">LucidaGrande</string>
+																		<double key="NSSize">1.100000e+01</double>
+																		<int key="NSfFlags">16</int>
+																	</object>
 																	<reference key="NSControlView" ref="983589239"/>
 																	<int key="NSButtonFlags">-2038152961</int>
 																	<int key="NSButtonFlags2">164</int>
@@ -2656,8 +2482,215 @@
 																	<reference key="NSTextColor" ref="454249633"/>
 																</object>
 															</object>
+															<object class="NSSplitView" id="231622333">
+																<reference key="NSNextResponder" ref="1013108064"/>
+																<int key="NSvFlags">266</int>
+																<object class="NSMutableArray" key="NSSubviews">
+																	<bool key="EncodedWithXMLCoder">YES</bool>
+																	<object class="NSCustomView" id="894187833">
+																		<reference key="NSNextResponder" ref="231622333"/>
+																		<int key="NSvFlags">290</int>
+																		<object class="NSMutableArray" key="NSSubviews">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<object class="NSTextField" id="905386082">
+																				<reference key="NSNextResponder" ref="894187833"/>
+																				<int key="NSvFlags">264</int>
+																				<string key="NSFrame">{{7, 6}, {43, 14}}</string>
+																				<reference key="NSSuperview" ref="894187833"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSTextFieldCell" key="NSCell" id="314592665">
+																					<int key="NSCellFlags">67239488</int>
+																					<int key="NSCellFlags2">272761856</int>
+																					<string key="NSContents">Search:</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="905386082"/>
+																					<reference key="NSBackgroundColor" ref="62854682"/>
+																					<reference key="NSTextColor" ref="454249633"/>
+																				</object>
+																			</object>
+																			<object class="NSPopUpButton" id="830088955">
+																				<reference key="NSNextResponder" ref="894187833"/>
+																				<int key="NSvFlags">266</int>
+																				<string key="NSFrame">{{54, 3}, {102, 20}}</string>
+																				<reference key="NSSuperview" ref="894187833"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="376863254">
+																					<int key="NSCellFlags">-1539178944</int>
+																					<int key="NSCellFlags2">133120</int>
+																					<reference key="NSSupport" ref="790379580"/>
+																					<reference key="NSControlView" ref="830088955"/>
+																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags2">36</int>
+																					<reference key="NSAlternateImage" ref="790379580"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="1028844875">
+																						<reference key="NSMenu" ref="747439187"/>
+																						<string key="NSTitle">field</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="450876295"/>
+																						<reference key="NSMixedImage" ref="414351669"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="376863254"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="747439187">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<object class="NSMutableArray" key="NSMenuItems">
+																							<bool key="EncodedWithXMLCoder">YES</bool>
+																							<reference ref="1028844875"/>
+																						</object>
+																					</object>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																			</object>
+																			<object class="NSPopUpButton" id="744029762">
+																				<reference key="NSNextResponder" ref="894187833"/>
+																				<int key="NSvFlags">265</int>
+																				<string key="NSFrame">{{161, 0}, {89, 25}}</string>
+																				<reference key="NSSuperview" ref="894187833"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="105542136">
+																					<int key="NSCellFlags">-1539178944</int>
+																					<int key="NSCellFlags2">133120</int>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="744029762"/>
+																					<int key="NSButtonFlags">-2038415105</int>
+																					<int key="NSButtonFlags2">36</int>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="129836593">
+																						<reference key="NSMenu" ref="1000166734"/>
+																						<string key="NSTitle">is</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="450876295"/>
+																						<reference key="NSMixedImage" ref="414351669"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="105542136"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="1000166734">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<object class="NSMutableArray" key="NSMenuItems">
+																							<bool key="EncodedWithXMLCoder">YES</bool>
+																							<reference ref="129836593"/>
+																						</object>
+																					</object>
+																					<int key="NSSelectedIndex">-1</int>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																			</object>
+																		</object>
+																		<string key="NSFrameSize">{255, 27}</string>
+																		<reference key="NSSuperview" ref="231622333"/>
+																		<string key="NSClassName">NSView</string>
+																	</object>
+																	<object class="NSCustomView" id="641645529">
+																		<reference key="NSNextResponder" ref="231622333"/>
+																		<int key="NSvFlags">290</int>
+																		<object class="NSMutableArray" key="NSSubviews">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<object class="NSSearchField" id="377771536">
+																				<reference key="NSNextResponder" ref="641645529"/>
+																				<int key="NSvFlags">266</int>
+																				<string key="NSFrame">{{5, 4}, {205, 19}}</string>
+																				<reference key="NSSuperview" ref="641645529"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSSearchFieldCell" key="NSCell" id="667596795">
+																					<int key="NSCellFlags">879885888</int>
+																					<int key="NSCellFlags2">268567552</int>
+																					<string key="NSContents"/>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="377771536"/>
+																					<bool key="NSDrawsBackground">YES</bool>
+																					<int key="NSTextBezelStyle">1</int>
+																					<reference key="NSBackgroundColor" ref="480189472"/>
+																					<reference key="NSTextColor" ref="454249633"/>
+																					<object class="NSButtonCell" key="NSSearchButtonCell">
+																						<int key="NSCellFlags">537001472</int>
+																						<int key="NSCellFlags2">0</int>
+																						<string key="NSContents">search</string>
+																						<string key="NSAction">_searchFieldSearch:</string>
+																						<reference key="NSTarget" ref="667596795"/>
+																						<reference key="NSControlView" ref="377771536"/>
+																						<int key="NSButtonFlags">138690815</int>
+																						<int key="NSButtonFlags2">0</int>
+																						<string key="NSKeyEquivalent"/>
+																						<int key="NSPeriodicDelay">400</int>
+																						<int key="NSPeriodicInterval">75</int>
+																					</object>
+																					<object class="NSButtonCell" key="NSCancelButtonCell">
+																						<int key="NSCellFlags">537001472</int>
+																						<int key="NSCellFlags2">0</int>
+																						<string key="NSContents">clear</string>
+																						<object class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+																							<bool key="EncodedWithXMLCoder">YES</bool>
+																							<object class="NSMutableDictionary">
+																								<bool key="EncodedWithXMLCoder">YES</bool>
+																								<object class="NSMutableArray" key="dict.sortedKeys">
+																									<bool key="EncodedWithXMLCoder">YES</bool>
+																									<string>AXDescription</string>
+																									<string>NSAccessibilityEncodedAttributesValueType</string>
+																								</object>
+																								<object class="NSMutableArray" key="dict.values">
+																									<bool key="EncodedWithXMLCoder">YES</bool>
+																									<string>cancel</string>
+																									<reference ref="9"/>
+																								</object>
+																							</object>
+																						</object>
+																						<string key="NSAction">_searchFieldCancel:</string>
+																						<reference key="NSTarget" ref="667596795"/>
+																						<reference key="NSControlView" ref="377771536"/>
+																						<int key="NSButtonFlags">138690815</int>
+																						<int key="NSButtonFlags2">0</int>
+																						<string key="NSKeyEquivalent"/>
+																						<int key="NSPeriodicDelay">400</int>
+																						<int key="NSPeriodicInterval">75</int>
+																					</object>
+																					<int key="NSMaximumRecents">255</int>
+																					<bool key="NSSendsWholeSearchString">YES</bool>
+																					<bytes key="NSSearchFieldFlags">CAAAAA</bytes>
+																				</object>
+																			</object>
+																		</object>
+																		<string key="NSFrame">{{264, 0}, {211, 27}}</string>
+																		<reference key="NSSuperview" ref="231622333"/>
+																		<string key="NSClassName">NSView</string>
+																	</object>
+																</object>
+																<string key="NSFrame">{{6, 509}, {475, 27}}</string>
+																<reference key="NSSuperview" ref="1013108064"/>
+																<bool key="NSIsVertical">YES</bool>
+																<string key="NSAutosaveName">TableFilterSplitter</string>
+															</object>
 														</object>
 														<string key="NSFrame">{{10, 7}, {700, 544}}</string>
+														<reference key="NSSuperview" ref="714795046"/>
 													</object>
 													<string key="NSLabel">Content</string>
 													<reference key="NSColor" ref="62854682"/>
@@ -3068,7 +3101,7 @@
 																					<reference key="NSControlView" ref="363916571"/>
 																					<int key="NSButtonFlags">-2042609409</int>
 																					<int key="NSButtonFlags2">35</int>
-																					<object class="NSCustomResource" key="NSNormalImage" id="193133054">
+																					<object class="NSCustomResource" key="NSNormalImage" id="44837094">
 																						<string key="NSClassName">NSImage</string>
 																						<string key="NSResourceName">button_action</string>
 																					</object>
@@ -3083,7 +3116,7 @@
 																						<string key="NSKeyEquiv"/>
 																						<int key="NSKeyEquivModMask">1048576</int>
 																						<int key="NSMnemonicLoc">2147483647</int>
-																						<reference key="NSImage" ref="193133054"/>
+																						<reference key="NSImage" ref="44837094"/>
 																						<string key="NSAction">_popUpItemAction:</string>
 																						<reference key="NSTarget" ref="984501775"/>
 																					</object>
@@ -3752,6 +3785,7 @@
 																</object>
 																<string key="NSFrame">{{24, 30}, {645, 278}}</string>
 																<reference key="NSSuperview" ref="730602982"/>
+																<string key="NSAutosaveName">TableInfoSplitter</string>
 															</object>
 															<object class="NSTextField" id="459419226">
 																<reference key="NSNextResponder" ref="730602982"/>
@@ -4111,7 +4145,7 @@
 												<object class="NSTabViewItem" id="986490149">
 													<string key="NSIdentifier">relations</string>
 													<object class="NSView" key="NSView" id="49633996">
-														<reference key="NSNextResponder" ref="714795046"/>
+														<nil key="NSNextResponder"/>
 														<int key="NSvFlags">256</int>
 														<object class="NSMutableArray" key="NSSubviews">
 															<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4487,21 +4521,20 @@
 															</object>
 														</object>
 														<string key="NSFrame">{{10, 7}, {700, 544}}</string>
-														<reference key="NSSuperview" ref="714795046"/>
 													</object>
 													<string key="NSLabel">Relations</string>
 													<reference key="NSColor" ref="62854682"/>
 													<reference key="NSTabView" ref="714795046"/>
 												</object>
 											</object>
-											<reference key="NSSelectedTabViewItem" ref="986490149"/>
+											<reference key="NSSelectedTabViewItem" ref="624106058"/>
 											<reference key="NSFont" ref="26"/>
 											<int key="NSTvFlags">134217731</int>
 											<bool key="NSAllowTruncatedLabels">YES</bool>
 											<bool key="NSDrawsBackground">YES</bool>
 											<object class="NSMutableArray" key="NSSubviews">
 												<bool key="EncodedWithXMLCoder">YES</bool>
-												<reference ref="49633996"/>
+												<reference ref="1013108064"/>
 											</object>
 										</object>
 									</object>
@@ -4517,6 +4550,7 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{944, 550}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{780, 502}</string>
@@ -8434,7 +8468,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">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -8628,6 +8662,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 17}, {423, 141}}</string>
 									<reference key="NSSuperview" ref="1041893843"/>
+									<reference key="NSNextKeyView" ref="134631251"/>
 									<reference key="NSDocView" ref="134631251"/>
 									<reference key="NSBGColor" ref="1024678221"/>
 									<int key="NScvFlags">6</int>
@@ -8661,6 +8696,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 									</object>
 									<string key="NSFrame">{{1, 0}, {423, 17}}</string>
 									<reference key="NSSuperview" ref="1041893843"/>
+									<reference key="NSNextKeyView" ref="568493807"/>
 									<reference key="NSDocView" ref="568493807"/>
 									<reference key="NSBGColor" ref="1024678221"/>
 									<int key="NScvFlags">4</int>
@@ -8669,6 +8705,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							</object>
 							<string key="NSFrame">{{20, 45}, {425, 159}}</string>
 							<reference key="NSSuperview" ref="1024486775"/>
+							<reference key="NSNextKeyView" ref="68425806"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="99652168"/>
 							<reference key="NSHScroller" ref="1053700221"/>
@@ -8809,7 +8846,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						</object>
 					</object>
 					<string key="NSFrameSize">{465, 294}</string>
-					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMinSize">{350, 272}</string>
@@ -14572,6 +14608,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<int key="connectionID">6302</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="231622333"/>
+						<reference key="destination" ref="392169872"/>
+					</object>
+					<int key="connectionID">6306</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -18125,21 +18169,18 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<reference ref="393139604"/>
 							<reference ref="262235013"/>
-							<reference ref="830088955"/>
 							<reference ref="1013153003"/>
 							<reference ref="459474311"/>
 							<reference ref="331025266"/>
 							<reference ref="196265983"/>
 							<reference ref="738389447"/>
-							<reference ref="33038697"/>
-							<reference ref="905386082"/>
 							<reference ref="440898411"/>
 							<reference ref="531095296"/>
 							<reference ref="572483755"/>
 							<reference ref="956558617"/>
 							<reference ref="983589239"/>
-							<reference ref="377771536"/>
-							<reference ref="744029762"/>
+							<reference ref="231622333"/>
+							<reference ref="33038697"/>
 						</object>
 						<reference key="parent" ref="624106058"/>
 					</object>
@@ -18162,24 +18203,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="1013108064"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3971</int>
-						<reference key="object" ref="905386082"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="314592665"/>
-						</object>
-						<reference key="parent" ref="1013108064"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">146</int>
-						<reference key="object" ref="830088955"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="376863254"/>
-						</object>
-						<reference key="parent" ref="1013108064"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">5175</int>
 						<reference key="object" ref="1013153003"/>
 						<object class="NSMutableArray" key="children">
@@ -18300,34 +18323,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="1013153003"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3754</int>
-						<reference key="object" ref="376863254"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="747439187"/>
-						</object>
-						<reference key="parent" ref="830088955"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">147</int>
-						<reference key="object" ref="747439187"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1028844875"/>
-						</object>
-						<reference key="parent" ref="376863254"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="1028844875"/>
-						<reference key="parent" ref="747439187"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3972</int>
-						<reference key="object" ref="314592665"/>
-						<reference key="parent" ref="905386082"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">3759</int>
 						<reference key="object" ref="665575636"/>
 						<reference key="parent" ref="262235013"/>
@@ -18408,52 +18403,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="983589239"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">3963</int>
-						<reference key="object" ref="377771536"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="667596795"/>
-						</object>
-						<reference key="parent" ref="1013108064"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3964</int>
-						<reference key="object" ref="667596795"/>
-						<reference key="parent" ref="377771536"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">156</int>
-						<reference key="object" ref="744029762"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105542136"/>
-						</object>
-						<reference key="parent" ref="1013108064"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3755</int>
-						<reference key="object" ref="105542136"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1000166734"/>
-						</object>
-						<reference key="parent" ref="744029762"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">157</int>
-						<reference key="object" ref="1000166734"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="129836593"/>
-						</object>
-						<reference key="parent" ref="105542136"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">154</int>
-						<reference key="object" ref="129836593"/>
-						<reference key="parent" ref="1000166734"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">5428</int>
 						<reference key="object" ref="78186995"/>
 						<object class="NSMutableArray" key="children">
@@ -20569,6 +20518,128 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 						<reference key="parent" ref="1043842561"/>
 						<string key="objectName">SPHistoryController</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6303</int>
+						<reference key="object" ref="231622333"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="894187833"/>
+							<reference ref="641645529"/>
+						</object>
+						<reference key="parent" ref="1013108064"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6304</int>
+						<reference key="object" ref="894187833"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="905386082"/>
+							<reference ref="830088955"/>
+							<reference ref="744029762"/>
+						</object>
+						<reference key="parent" ref="231622333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6305</int>
+						<reference key="object" ref="641645529"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="377771536"/>
+						</object>
+						<reference key="parent" ref="231622333"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3963</int>
+						<reference key="object" ref="377771536"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="667596795"/>
+						</object>
+						<reference key="parent" ref="641645529"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3964</int>
+						<reference key="object" ref="667596795"/>
+						<reference key="parent" ref="377771536"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3971</int>
+						<reference key="object" ref="905386082"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="314592665"/>
+						</object>
+						<reference key="parent" ref="894187833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3972</int>
+						<reference key="object" ref="314592665"/>
+						<reference key="parent" ref="905386082"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="830088955"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="376863254"/>
+						</object>
+						<reference key="parent" ref="894187833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3754</int>
+						<reference key="object" ref="376863254"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="747439187"/>
+						</object>
+						<reference key="parent" ref="830088955"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">147</int>
+						<reference key="object" ref="747439187"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1028844875"/>
+						</object>
+						<reference key="parent" ref="376863254"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="1028844875"/>
+						<reference key="parent" ref="747439187"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">156</int>
+						<reference key="object" ref="744029762"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="105542136"/>
+						</object>
+						<reference key="parent" ref="894187833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3755</int>
+						<reference key="object" ref="105542136"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1000166734"/>
+						</object>
+						<reference key="parent" ref="744029762"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">157</int>
+						<reference key="object" ref="1000166734"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="129836593"/>
+						</object>
+						<reference key="parent" ref="105542136"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">154</int>
+						<reference key="object" ref="129836593"/>
+						<reference key="parent" ref="1000166734"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -20758,6 +20829,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>156.IBAttributePlaceholdersKey</string>
 					<string>156.IBPluginDependency</string>
 					<string>156.ImportedFromIB2</string>
+					<string>157.IBEditorWindowLastContentRect</string>
 					<string>157.IBPluginDependency</string>
 					<string>157.ImportedFromIB2</string>
 					<string>157.editorWindowContentRectSynchronizationRect</string>
@@ -21259,6 +21331,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>4777.ImportedFromIB2</string>
 					<string>4795.IBPluginDependency</string>
 					<string>5.IBEditorWindowLastContentRect</string>
+					<string>5.IBViewEditorWindowController.showingLayoutRectangles</string>
 					<string>5.IBWindowTemplateEditedContentRect</string>
 					<string>5.ImportedFromIB2</string>
 					<string>5.NSWindowTemplate.visibleAtLaunch</string>
@@ -21802,6 +21875,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>6293.IBSegmentedControlTracker.WasGrowing</string>
 					<string>6294.IBPluginDependency</string>
 					<string>6297.IBPluginDependency</string>
+					<string>6303.IBPluginDependency</string>
+					<string>6304.IBPluginDependency</string>
+					<string>6305.IBPluginDependency</string>
 					<string>654.IBPluginDependency</string>
 					<string>654.ImportedFromIB2</string>
 					<string>655.IBPluginDependency</string>
@@ -22264,6 +22340,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
+					<string>{{618, 746}, {92, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{535, 926}, {92, 23}}</string>
@@ -22829,8 +22906,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{251, 233}, {944, 550}}</string>
-					<string>{{251, 233}, {944, 550}}</string>
+					<string>{{252, 100}, {944, 550}}</string>
+					<boolean value="NO"/>
+					<string>{{252, 100}, {944, 550}}</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
 					<string>{{62, 352}, {845, 504}}</string>
@@ -23584,6 +23662,9 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -23803,7 +23884,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">6302</int>
+			<int key="maxID">6315</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 263b48dd..d596eb7b 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -2033,6 +2033,24 @@
 }
 
 #pragma mark -
+#pragma mark SplitView delegate methods
+
+- (BOOL)splitView:(NSSplitView *)sender canCollapseSubview:(NSView *)subview
+{
+	return NO;
+}
+
+- (float)splitView:(NSSplitView *)sender constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)offset
+{
+	return (proposedMax - 150);
+}
+
+- (float)splitView:(NSSplitView *)sender constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)offset
+{
+	return (proposedMin + 200);
+}
+
+#pragma mark -
 
 /*
  * Trap the enter and escape keys, overriding default behaviour and continuing/ending editing,
diff --git a/Source/TableSource.m b/Source/TableSource.m
index 48d1d75d..165d6461 100644
--- a/Source/TableSource.m
+++ b/Source/TableSource.m
@@ -243,6 +243,8 @@ loads aTable, put it in an array, update the tableViewColumns and reload the tab
 
 	//query finished
 	[[NSNotificationCenter defaultCenter] postNotificationName:@"SMySQLQueryHasBeenPerformed" object:self];
+	
+	NSLog(@"%@", tableFields);
 }
 
 /*
@@ -663,7 +665,7 @@ fetches the result as an array with a dictionary for each row in it
 		// CHANGE syntax
 		if (([[theRow objectForKey:@"Length"] isEqualToString:@""]) || (![theRow objectForKey:@"Length"]) || ([[theRow objectForKey:@"Type"] isEqualToString:@"datetime"])) {
 			
-			// If the old row and new row dictionaries are equel then the user didn't actually change anything so don't continue 
+			// If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue 
 			if ([oldRow isEqualToDictionary:theRow]) {
 				return YES;
 			}
@@ -675,7 +677,7 @@ fetches the result as an array with a dictionary for each row in it
 															[theRow objectForKey:@"Type"]];
 		} 
 		else {
-			// If the old row and new row dictionaries are equel then the user didn't actually change anything so don't continue 
+			// If the old row and new row dictionaries are equal then the user didn't actually change anything so don't continue 
 			if ([oldRow isEqualToDictionary:theRow]) {
 				return YES;
 			}
@@ -711,8 +713,8 @@ fetches the result as an array with a dictionary for each row in it
 	// Don't provide any defaults for auto-increment fields
 	if ([[theRow objectForKey:@"Extra"] isEqualToString:@"auto_increment"]) {
 		[queryString appendString:@" "];
-	} else {
-
+	} 
+	else {
 		// If a null value has been specified, and null is allowed, specify DEFAULT NULL
 		if ([[theRow objectForKey:@"Default"] isEqualToString:[prefs objectForKey:@"NullValue"]]) {
 			if ([[theRow objectForKey:@"Null"] intValue] == 1) {
@@ -720,13 +722,15 @@ fetches the result as an array with a dictionary for each row in it
 			}
 		
 		// Otherwise, if current_timestamp was specified for timestamps, use that
-		} else if ([[theRow objectForKey:@"Type"] isEqualToString:@"timestamp"] &&
-					[[[theRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"])
+		} 
+		else if ([[theRow objectForKey:@"Type"] isEqualToString:@"timestamp"] && 
+				 [[[theRow objectForKey:@"Default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"])
 		{
 			[queryString appendString:@" DEFAULT CURRENT_TIMESTAMP "];
 
+		}
 		// Otherwise, use the provided default
-		} else {
+		else {
 			[queryString appendString:[NSString stringWithFormat:@" DEFAULT '%@' ", [mySQLConnection prepareString:[theRow objectForKey:@"Default"]]]];
 		}
 	}
@@ -1019,11 +1023,7 @@ returns a dictionary containing enum/set field names as key and possible values
 
 - (int)numberOfRowsInTableView:(NSTableView *)aTableView
 {
-	if ( aTableView == tableSourceView ) {
-		return [tableFields count];
-	} else {
-		return [indexes count];
-	}
+	return (aTableView == tableSourceView) ? [tableFields count] : [indexes count];
 }
 
 - (id)tableView:(NSTableView *)aTableView
@@ -1047,19 +1047,16 @@ returns a dictionary containing enum/set field names as key and possible values
 			forTableColumn:(NSTableColumn *)aTableColumn
 			row:(int)rowIndex
 {
-    //make sure that the drag operation is for the right table view
+    // Make sure that the drag operation is for the right table view
     if (aTableView!=tableSourceView) return;
 
-	if ( !isEditingRow ) {
+	if (!isEditingRow) {
 		[oldRow setDictionary:[tableFields objectAtIndex:rowIndex]];
 		isEditingRow = YES;
 		currentlyEditingRow = rowIndex;
 	}
-	if ( anObject ) {
-		[[tableFields objectAtIndex:rowIndex] setObject:anObject forKey:[aTableColumn identifier]];
-	} else {
-		[[tableFields objectAtIndex:rowIndex] setObject:@"" forKey:[aTableColumn identifier]];
-	}
+	
+	[[tableFields objectAtIndex:rowIndex] setObject:(anObject) ? anObject : @"" forKey:[aTableColumn identifier]];
 }
 
 /*