Merge pull request #1916 from Dragonliu2018/lzl/fix/adapt_mysql_homebrew_version_display

fix: display version for Homebrew MySQL

Author: rolandwalker

changelog.md

@@ -9,6 +9,7 @@ Bug Fixes
 ---------
 * Keep completion-menu Escape cancellation eager only in Vi mode so Emacs Alt-key bindings keep working while completions are open.
 * Keep identifiers that start with `set` highlighted as names.
+* Fix version display for MySQL distributions that return a plain `X.Y.Z` version string with no suffix (e.g. Homebrew MySQL).
 
 
 Internal

mycli/sqlexecute.py

@@ -69,7 +69,8 @@ def from_version_string(cls, version_string: str) -> ServerInfo:
             (r"(?P<version>[0-9\.]+)-MariaDB", ServerSpecies.MariaDB),
             (r"[0-9\.]*-TiDB-v(?P<version>[0-9\.]+)-?(?P<comment>[a-z0-9\-]*)", ServerSpecies.TiDB),
             (r"(?P<version>[0-9\.]+)[a-z0-9]*-(?P<comment>[0-9]+$)", ServerSpecies.Percona),
-            (r"(?P<version>[0-9\.]+)[a-z0-9]*-(?P<comment>[A-Za-z0-9_]+)", ServerSpecies.MySQL),
+            # Also matches plain "X.Y.Z" with no suffix (e.g. Homebrew MySQL).
+            (r"(?P<version>[0-9]+\.[0-9]+\.[0-9]+)[a-z0-9]*(-(?P<comment>[A-Za-z0-9_]+))?", ServerSpecies.MySQL),
         )
         for regexp, species in re_species:
             match = re.search(regexp, version_string)

test/pytests/test_sqlexecute.py

@@ -429,6 +429,8 @@ def test_multiple_results(executor):
         ("5.5.5-10.5.8-MariaDB-1:10.5.8+maria~focal", "MariaDB", "10.5.8", 100508),
         ("5.0.16-pro-nt-log", "MySQL", "5.0.16", 50016),
         ("5.1.5a-alpha", "MySQL", "5.1.5", 50105),
+        # Plain X.Y.Z with no suffix (e.g. Homebrew MySQL)
+        ("5.7.99", "MySQL", "5.7.99", 50799),
         ("unexpected version string", None, "", 0),
         ("", None, "", 0),
         (None, None, "", 0),