merge main and solve conflict

Sequel-Ace · Mar 7, 2021 · e29d0ca · e29d0ca
2 parents a70fb50 + a704611
commit e29d0ca
Show file tree

Hide file tree

Showing 69 changed files with 1,409 additions and 599 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -13,7 +13,7 @@ Please use one of these hashtags for your PR title:
 - 
 
 ## Closes following issues:
-- Closes 
+- Closes: 
 
 ## Tested:
 - Processors:
@@ -25,12 +25,12 @@ Please use one of these hashtags for your PR title:
   - [ ] 10.14.x (Mojave)
   - [ ] 10.15.x (Catalina)
   - [ ] 11.x (Big Sur)
-- Xcode Version:
 - Localizations:
   - [ ] English
   - [ ] Spanish
   - [ ] Other (please specify)
+- Xcode Version:
+
 ## Screenshots:
 
-
 ## Additional notes:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,34 @@
+## [3.2.3]
+
+### Added
+- eb3378d5, No Newer Release Available info alert 
+- caa4103b, kill ssh child processes on crash 
+- baa65392, Edit cells inline or popup 'intelligent' switch 
+- 3b188a8f, GitHub release checker 
+
+### Fixed
+- e6899d3b, Fix windows being created instead of populated 
+- 07e01804, GitHub version checker fixes  
+- b074152d,  saving individual query history
+- 1a8377bf,  some analyzer warnings
+- 53f87c86,  hide the filter for the current session
+- f07244a8,  a couple of crashes
+- 0b0ae9cf, allow insertion of NULL into varchar fields of length < 4  
+- bff9f326,   latest crashes
+- 62491cb9, edit in popup  
+- 22de4acc, Export directory bookmarks 
+- 8163a425,  some crashes
+
+### Changed
+- e4a68c3e, Don't show no new release available alert on startup 
+
+### Removed
+
+
+### Infra
+- cf73d714, faster-stringForByteSize 
+- b967b556, Sqlite error logging 
+
 ## [3.2.2]
 
 ### Added

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,15 +2,15 @@
 
 I'm really glad you're reading this, because we need volunteer developers to help this project be successful long-term.
 
-We make a commitment to review *all* PRs (pull requests) that are submitted by members of the community. We will provide feedback and recommendations with the effort of incorperating contributions from the community whenever possible.
+We make a commitment to review *all* pull requests that are submitted by members of the community. We will provide feedback and recommendations with the effort of incorporating contributions from the community whenever possible.
 
 ## Testing
 
 If you add a new feature or fix a bug, it's generally a good idea to write a test to accompany it! Tests help us ensure that our users can depend on Sequel Ace.
 
 ## Submitting changes
 
-Please send a [GitHub Pull Request to Sequel Ace](https://github.com/Sequel-Ace/Sequel-Ace/pull/new/dev), pointed at the *dev* branch, with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)). Please include detailed explainations of what changed (screenshots of changes are preferred). Please avoid committing changes that are unrelated to the pull request (if you accidentally edited an .xib file, it's all good, just revert changes to that unrelated file).
+Please send a [GitHub Pull Request to Sequel Ace](https://github.com/Sequel-Ace/Sequel-Ace/pull/new/dev), pointed at the *main* branch, with a clear list of what you've done (read more about [pull requests](http://help.github.com/pull-requests/)). Please include detailed explanations of what changed (screenshots of changes are preferred). Please avoid committing changes that are unrelated to the pull request (if you accidentally edited an .xib file, it's all good, just revert changes to that unrelated file).
 
 Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
 

diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
@@ -365,6 +365,7 @@
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* QueryKit */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
@@ -455,7 +456,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -597,7 +598,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
@@ -707,7 +708,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -757,7 +758,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -803,7 +804,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

diff --git a/Frameworks/QueryKit/Resources/Info.plist b/Frameworks/QueryKit/Resources/Info.plist
@@ -21,7 +21,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3023</string>
+	<string>3024</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Frameworks/QueryKit/Resources/Tests-Info.plist b/Frameworks/QueryKit/Resources/Tests-Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3023</string>
+	<string>3024</string>
 </dict>
 </plist>
diff --git a/Frameworks/SPMySQLFramework/Resources/Info.plist b/Frameworks/SPMySQLFramework/Resources/Info.plist
@@ -21,7 +21,7 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3023</string>
+	<string>3024</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>

diff --git a/Frameworks/SPMySQLFramework/SPMySQL Unit Tests/Info.plist b/Frameworks/SPMySQLFramework/SPMySQL Unit Tests/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3023</string>
+	<string>3024</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.12</string>
 	<key>CFBundleSupportedPlatforms</key>

diff --git a/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj b/Frameworks/SPMySQLFramework/SPMySQLFramework.xcodeproj/project.pbxproj
@@ -773,7 +773,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = NKQ4HJ66PX;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -807,7 +807,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = NKQ4HJ66PX;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -852,7 +852,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				ENABLE_TESTABILITY = YES;
@@ -906,7 +906,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1043,7 +1043,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1084,7 +1084,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = NKQ4HJ66PX;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1163,7 +1163,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1201,7 +1201,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = NKQ4HJ66PX;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -1245,7 +1245,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CURRENT_PROJECT_VERSION = 3023;
+				CURRENT_PROJECT_VERSION = 3024;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1283,7 +1283,7 @@
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = NKQ4HJ66PX;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 3023;
+				DYLIB_CURRENT_VERSION = 3024;
 				FRAMEWORK_VERSION = A;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

diff --git a/Interfaces/ConnectionView.xib b/Interfaces/ConnectionView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -1785,11 +1785,11 @@ DQ
             </subviews>
             <point key="canvasLocation" x="139" y="276.5"/>
         </customView>
-        <window title="Error Detail" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5431" userLabel="Error Detail HUD" customClass="NSPanel">
+        <window title="Error Detail" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" hidesOnDeactivate="YES" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5431" userLabel="Error Detail HUD" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="439" y="291" width="580" height="320"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2880" height="1595"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <value key="minSize" type="size" width="100" height="100"/>
             <view key="contentView" id="5432">
                 <rect key="frame" x="0.0" y="0.0" width="580" height="320"/>
@@ -1799,9 +1799,9 @@ DQ
                         <rect key="frame" x="0.0" y="0.0" width="580" height="320"/>
                         <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Qd-RL-aJ4">
                             <rect key="frame" x="0.0" y="0.0" width="580" height="320"/>
-                            <autoresizingMask key="autoresizingMask"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                             <subviews>
-                                <textView editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="NO" id="5434" customClass="SPAutosizingTextView" customModule="Sequel_Ace" customModuleProvider="target">
+                                <textView editable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" verticallyResizable="NO" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="5434" customClass="SPAutosizingTextView" customModule="Sequel_Ace" customModuleProvider="target">
                                     <rect key="frame" x="0.0" y="0.0" width="580" height="320"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="textColor" red="0.90196078999999996" green="0.90196078999999996" blue="0.90196078999999996" alpha="1" colorSpace="calibratedRGB"/>
@@ -2581,7 +2581,7 @@ DQ
             <connections>
                 <outlet property="delegate" destination="-2" id="5461"/>
             </connections>
-            <point key="canvasLocation" x="139" y="-345"/>
+            <point key="canvasLocation" x="-51" y="-388"/>
         </window>
         <userDefaultsController representsSharedInstance="YES" id="5455"/>
         <customView id="5576" userLabel="SSH Key Selection Help">

diff --git a/Interfaces/DBView.xib b/Interfaces/DBView.xib
@@ -62,9 +62,6 @@
                 <outlet property="tableTabView" destination="25" id="1244"/>
                 <outlet property="tableTriggersInstance" destination="6691" id="6796"/>
                 <outlet property="tablesListInstance" destination="68" id="104"/>
-                <outlet property="titleAccessoryView" destination="5999" id="6002"/>
-                <outlet property="titleImageView" destination="6000" id="6003"/>
-                <outlet property="titleStringView" destination="6170" id="6172"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -4160,27 +4157,6 @@ Gw
             </subviews>
             <point key="canvasLocation" x="-1822" y="484"/>
         </customView>
-        <customView id="5999" userLabel="Title Icon View">
-            <rect key="frame" x="0.0" y="0.0" width="110" height="20"/>
-            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-            <subviews>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6170">
-                    <rect key="frame" x="2" y="2" width="105" height="14"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" id="6171">
-                        <font key="font" metaFont="message" size="11"/>
-                        <color key="textColor" name="disabledControlTextColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    </textFieldCell>
-                </textField>
-                <imageView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6000">
-                    <rect key="frame" x="5" y="-2" width="101" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageAlignment="right" imageScaling="proportionallyDown" id="6001"/>
-                </imageView>
-            </subviews>
-            <point key="canvasLocation" x="-1323" y="644"/>
-        </customView>
         <customView id="6885" userLabel="statusTable Accessory View">
             <rect key="frame" x="0.0" y="0.0" width="360" height="157"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>

diff --git a/Interfaces/MainMenu.xib b/Interfaces/MainMenu.xib
@@ -988,6 +988,13 @@ CQ
                                     <action selector="visitFAQWebsite:" target="213" id="939"/>
                                 </connections>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" hidden="YES" id="ZLx-5a-0BY"/>
+                            <menuItem title="SSH Tunnel Debugging Info" hidden="YES" enabled="NO" id="Nzm-iu-YJV">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="showConnectionDebugMessages:" target="-1" id="PAE-lH-krZ"/>
+                                </connections>
+                            </menuItem>
                             <menuItem isSeparatorItem="YES" id="1048"/>
                             <menuItem title="Keyboard Shortcuts" id="1047">
                                 <modifierMask key="keyEquivalentModifierMask"/>
@@ -1008,6 +1015,9 @@ CQ
                                 </connections>
                             </menuItem>
                         </items>
+                        <connections>
+                            <outlet property="delegate" destination="103" id="uyy-MC-UPd"/>
+                        </connections>
                     </menu>
                 </menuItem>
             </items>