From: Go MAEDA <maeda@farend.jp>
Date: Fri, 22 Dec 2023 00:06:29 +0000 (+0000)
Subject: Extends mysql8? test helper to handle more complex version strings (#39865).
X-Git-Tag: 6.0.0~559
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=11169aacae9999596a5c9aea932854dc630ab875;p=redmine.git

Extends mysql8? test helper to handle more complex version strings (#39865).

Patch by Jens Krämer.


git-svn-id: https://svn.redmine.org/redmine/trunk@22542 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 45fedd8e7..23ba199fa 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -204,7 +204,8 @@ class ActiveSupport::TestCase
   end
 
   def mysql8?
-    Gem::Version.new(Redmine::Database.mysql_version) >= Gem::Version.new('8.0.0')
+    version = Redmine::Database.mysql_version.sub(/^(\d+\.\d+\.\d+).*/, '\1')
+    Gem::Version.new(version) >= Gem::Version.new('8.0.0')
   end
 
   def postgresql?