From 828b994ef4fa457055983e9db67b42e584712206 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 24 Nov 2024 20:51:33 -0800
Subject: [PATCH] Support Postgres with non-standard version string

(cherry picked from commit 40f4ef27b22113c1dae0d0cbdee8205132bed68a)
---
 .../Datastore/DatabaseVersionParserFixture.cs | 38 +++++++++++++++++++
 src/NzbDrone.Core/Datastore/Database.cs       |  4 +-
 .../Datastore/DatabaseVersionParser.cs        | 16 ++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/NzbDrone.Core.Test/Datastore/DatabaseVersionParserFixture.cs
 create mode 100644 src/NzbDrone.Core/Datastore/DatabaseVersionParser.cs

diff --git a/src/NzbDrone.Core.Test/Datastore/DatabaseVersionParserFixture.cs b/src/NzbDrone.Core.Test/Datastore/DatabaseVersionParserFixture.cs
new file mode 100644
index 000000000..05bf04fea
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Datastore/DatabaseVersionParserFixture.cs
@@ -0,0 +1,38 @@
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Test.Datastore;
+
+[TestFixture]
+public class DatabaseVersionParserFixture
+{
+    [TestCase("3.44.2", 3, 44, 2)]
+    public void should_parse_sqlite_database_version(string serverVersion, int majorVersion, int minorVersion, int buildVersion)
+    {
+        var version = DatabaseVersionParser.ParseServerVersion(serverVersion);
+
+        version.Should().NotBeNull();
+        version.Major.Should().Be(majorVersion);
+        version.Minor.Should().Be(minorVersion);
+        version.Build.Should().Be(buildVersion);
+    }
+
+    [TestCase("14.8 (Debian 14.8-1.pgdg110+1)", 14, 8, null)]
+    [TestCase("16.3 (Debian 16.3-1.pgdg110+1)", 16, 3, null)]
+    [TestCase("16.3 - Percona Distribution", 16, 3, null)]
+    [TestCase("17.0 - Percona Server", 17, 0, null)]
+    public void should_parse_postgres_database_version(string serverVersion, int majorVersion, int minorVersion, int? buildVersion)
+    {
+        var version = DatabaseVersionParser.ParseServerVersion(serverVersion);
+
+        version.Should().NotBeNull();
+        version.Major.Should().Be(majorVersion);
+        version.Minor.Should().Be(minorVersion);
+
+        if (buildVersion.HasValue)
+        {
+            version.Build.Should().Be(buildVersion.Value);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Database.cs b/src/NzbDrone.Core/Datastore/Database.cs
index d4252ed25..d31dab26b 100644
--- a/src/NzbDrone.Core/Datastore/Database.cs
+++ b/src/NzbDrone.Core/Datastore/Database.cs
@@ -2,7 +2,6 @@
 using System.Data;
 using System.Data.Common;
 using System.Data.SQLite;
-using System.Text.RegularExpressions;
 using Dapper;
 using NLog;
 using NzbDrone.Common.Instrumentation;
@@ -52,9 +51,8 @@ namespace NzbDrone.Core.Datastore
             {
                 using var db = _datamapperFactory();
                 var dbConnection = db as DbConnection;
-                var version = Regex.Replace(dbConnection.ServerVersion, @"\(.*?\)", "");
 
-                return new Version(version);
+                return DatabaseVersionParser.ParseServerVersion(dbConnection.ServerVersion);
             }
         }
 
diff --git a/src/NzbDrone.Core/Datastore/DatabaseVersionParser.cs b/src/NzbDrone.Core/Datastore/DatabaseVersionParser.cs
new file mode 100644
index 000000000..ffc77cf18
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/DatabaseVersionParser.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace NzbDrone.Core.Datastore;
+
+public static class DatabaseVersionParser
+{
+    private static readonly Regex VersionRegex = new (@"^[^ ]+", RegexOptions.Compiled);
+
+    public static Version ParseServerVersion(string serverVersion)
+    {
+        var match = VersionRegex.Match(serverVersion);
+
+        return match.Success ? new Version(match.Value) : null;
+    }
+}