fix: only parse the digits from the pg version (#315) (#316) (#321)

(cherry picked from commit e1562dc)

Co-authored-by: Rui Lopes <[email protected]>

Author: patchback[bot]

changelogs/fragments/316-postgresql_ping_fix_pg_version_parsing.yml

@@ -0,0 +1,3 @@
+bugfixes:
+  - postgresql_ping - fix pg version parsing (https://github.com/ansible-collections/community.postgresql/issues/315).
+  - postgresql_info - fix pg version parsing (https://github.com/ansible-collections/community.postgresql/issues/315).

plugins/modules/postgresql_info.py

@@ -506,6 +506,7 @@
       sample: false
 '''
 
+import re
 from fnmatch import fnmatch
 
 try:
@@ -956,13 +957,13 @@ def get_pg_version(self):
         query = "SELECT version()"
         raw = self.__exec_sql(query)[0][0]
         full = raw.split()[1]
-        tmp = full.split('.')
+        m = re.match(r"(\d+)\.(\d+)(?:\.(\d+))?", full)
 
-        major = int(tmp[0])
-        minor = int(tmp[1].rstrip(','))
+        major = int(m.group(1))
+        minor = int(m.group(2))
         patch = None
-        if len(tmp) >= 3:
-            patch = int(tmp[2].rstrip(','))
+        if m.group(3) is not None:
+            patch = int(m.group(3))
 
         self.pg_info["version"] = dict(
             major=major,

plugins/modules/postgresql_ping.py

@@ -91,6 +91,8 @@
   version_added: 1.7.0
 '''
 
+import re
+
 try:
     from psycopg2.extras import DictCursor
 except ImportError:
@@ -136,13 +138,13 @@ def get_pg_version(self):
         self.is_available = True
 
         full = raw.split()[1]
-        tmp = full.split('.')
+        m = re.match(r"(\d+)\.(\d+)(?:\.(\d+))?", full)
 
-        major = int(tmp[0])
-        minor = int(tmp[1].rstrip(','))
+        major = int(m.group(1))
+        minor = int(m.group(2))
         patch = None
-        if len(tmp) >= 3:
-            patch = int(tmp[2].rstrip(','))
+        if m.group(3) is not None:
+            patch = int(m.group(3))
 
         self.version = dict(
             major=major,