Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion mamonsu/plugins/pgsql/driver/pool.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from .connection import Connection, ConnectionInfo
from .version import extract_version

from mamonsu.lib.version import parse
import threading
Expand Down Expand Up @@ -155,7 +156,8 @@ def server_version(self, db=None):
return self._cache["server_version"]["storage"][db]

version_string = self.query("show server_version", db)[0][0]
version_string = version_string.rstrip("devel")
version_string = extract_version(version_string)

result = bytes(
version_string.split(" ")[0], "utf-8")
self._cache["server_version"]["storage"][db] = "{0}".format(
Expand Down
9 changes: 9 additions & 0 deletions mamonsu/plugins/pgsql/driver/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import re

def extract_version(raw_version):
match = re.search(r'\d+(?:\.\d+)*', raw_version)

if match:
return match.group(0)

return ''
Empty file.
23 changes: 23 additions & 0 deletions tests/tests/bash/test_pgsql/test_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import pytest

from mamonsu.plugins.pgsql.driver.version import extract_version

class TestVersion:
@pytest.mark.parametrize("raw, expected", [
("14.6", "14.6"),
("17.2", "17.2"),
("9.3.10", "9.3.10"),
("15.1 (Debian 15.1-1.pgdg110+1)", "15.1"),
("15.1 (Ubuntu 15.1-1.pgdg22.04+1)", "15.1"),
("11.2-YB-2.17.3.0-b0", "11.2"),
("1.2-xxx", "1.2"),
("17.10 - TRIAL", "17.10"),
("16.14-TRIAL", "16.14"),
("16beta1", "16"),
("17.1rc1", "17.1"),
("12devel", "12"),
("16.14/TRIAL", "16.14"),
("", ""),
])
def test_extract_version(self, raw, expected):
assert extract_version(raw) == expected