From dc2759ddcbe816bd20ad971253df2d4a6e9f6ca8 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Mon, 17 Apr 2023 04:04:01 +0300 Subject: [PATCH] Fixed: (Database) Improve Version detection (cherry picked from commit 788fa6d96a45ebec684672f0811d8ee284c2f0c8) --- src/NzbDrone.Core/Datastore/Database.cs | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Database.cs b/src/NzbDrone.Core/Datastore/Database.cs index e36241ef0..dd6a79f73 100644 --- a/src/NzbDrone.Core/Datastore/Database.cs +++ b/src/NzbDrone.Core/Datastore/Database.cs @@ -1,5 +1,6 @@ using System; using System.Data; +using System.Data.Common; using System.Text.RegularExpressions; using Dapper; using NLog; @@ -56,24 +57,11 @@ namespace NzbDrone.Core.Datastore { get { - using (var db = _datamapperFactory()) - { - string version; + using var db = _datamapperFactory(); + var dbConnection = db as DbConnection; + var version = Regex.Replace(dbConnection.ServerVersion, @"\(.*?\)", ""); - try - { - version = db.QueryFirstOrDefault("SHOW server_version"); - - // Postgres can return extra info about operating system on version call, ignore this - version = Regex.Replace(version, @"\(.*?\)", ""); - } - catch - { - version = db.QueryFirstOrDefault("SELECT sqlite_version()"); - } - - return new Version(version); - } + return new Version(version); } }