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); } }