From 61c652da3b791ace5ed4801c4966b1d157b67a58 Mon Sep 17 00:00:00 2001
From: Sebastian Gumprich <sebastian.gumprich@t-systems.com>
Date: Thu, 11 Mar 2021 11:59:41 +0100
Subject: [PATCH] add mysql_full_version and suffix return variable

add changelog fragment
---
 ...d_mysql_full_version_suffix_return_var.yml |  2 +
 plugins/modules/mysql_info.py                 | 38 ++++++++++++++++---
 .../targets/test_mysql_info/tasks/main.yml    |  2 +-
 3 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml

diff --git a/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml b/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
new file mode 100644
index 0000000..e6f1a5f
--- /dev/null
+++ b/changelogs/fragments/115-add_mysql_full_version_suffix_return_var.yml
@@ -0,0 +1,2 @@
+minor_changes:
+- mysql_info - add mysql_full_version and suffix return variable (https://github.com/ansible-collections/community.mysql/issues/114)
diff --git a/plugins/modules/mysql_info.py b/plugins/modules/mysql_info.py
index c7d9e89..7ef6c67 100644
--- a/plugins/modules/mysql_info.py
+++ b/plugins/modules/mysql_info.py
@@ -57,6 +57,7 @@ seealso:
 
 author:
 - Andrew Klychkov (@Andersson007)
+- Sebastian Gumprich (@rndmh3ro)
 
 extends_documentation_fragment:
 - community.mysql.mysql
@@ -121,7 +122,7 @@ version:
   description: Database server version.
   returned: if not excluded by filter
   type: dict
-  sample: { "version": { "major": 5, "minor": 5, "release": 60 } }
+  sample: { "version": { "major": 5, "minor": 5, "release": 60, "suffix": "MariaDB", "full_version": "5.5.60-MariaDB" } }
   contains:
     major:
       description: Major server version.
@@ -138,6 +139,16 @@ version:
       returned: if not excluded by filter
       type: int
       sample: 60
+    suffix:
+      description: Server suffix, for example MySQL, MariaDB, other or none.
+      returned: if not excluded by filter
+      type: str
+      sample: "MariaDB"
+    full_version:
+      description: Full server version.
+      returned: if not excluded by filter
+      type: str
+      sample: "5.5.60-MariaDB"
 databases:
   description: Information about databases.
   returned: if not excluded by filter
@@ -353,13 +364,30 @@ class MySQL_Info(object):
             for var in res:
                 self.info['settings'][var['Variable_name']] = self.__convert(var['Value'])
 
-            ver = self.info['settings']['version'].split('.')
-            release = ver[2].split('-')[0]
+            # version = ["5", "5," "60-MariaDB]
+            version = self.info['settings']['version'].split('.')
+
+            # full_version = "5.5.60-MariaDB"
+            full_version = self.info['settings']['version']
+
+            # release = "60"
+            release = version[2].split('-')[0]
+
+            # check if a suffix exists by counting the length
+            if len(version[2].split('-')) > 1:
+                # suffix = "MariaDB"
+                suffix = version[2].split('-', 1)[1]
+            else:
+                suffix = ""
 
             self.info['version'] = dict(
-                major=int(ver[0]),
-                minor=int(ver[1]),
+                # major = "5"
+                major=int(version[0]),
+                # minor = "5"
+                minor=int(version[1]),
                 release=int(release),
+                suffix=str(suffix),
+                full_version=str(full_version),
             )
 
     def __get_global_status(self):
diff --git a/tests/integration/targets/test_mysql_info/tasks/main.yml b/tests/integration/targets/test_mysql_info/tasks/main.yml
index 13ddbcb..a17f6eb 100644
--- a/tests/integration/targets/test_mysql_info/tasks/main.yml
+++ b/tests/integration/targets/test_mysql_info/tasks/main.yml
@@ -48,7 +48,7 @@
     - assert:
         that:
         - result.changed == false
-        - result.version != {}
+        - "mysql_version in result.version.full_version"
         - result.settings != {}
         - result.global_status != {}
         - result.databases != {}