From bd4153962f2ca958054ad3222ba43ace2179776f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Thomas?= <fx.thomas@gmail.com>
Date: Tue, 11 Feb 2020 22:27:59 +0100
Subject: [PATCH] Internal help: Add database server version

---
 .../org/airsonic/player/controller/InternalHelpController.java   | 1 +
 .../org/airsonic/player/i18n/ResourceBundle_en.properties        | 1 +
 airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java
index b0350d47..afd92aa8 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/InternalHelpController.java
@@ -298,6 +298,7 @@ public class InternalHelpController {
             // Driver name/version
             map.put("dbDriverName", conn.getMetaData().getDriverName());
             map.put("dbDriverVersion", conn.getMetaData().getDriverVersion());
+            map.put("dbServerVersion", conn.getMetaData().getDatabaseProductVersion());
 
             // Gather information for existing database tables
             ResultSet resultSet = conn.getMetaData().getTables(null, null, "%", null);
diff --git a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
index 87f57382..ee1ec929 100644
--- a/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
+++ b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
@@ -308,6 +308,7 @@ internalhelp.dbnonpresent.ok=The database does not contain non-present items.
 internalhelp.dbnonpresent.warn=The database contains non-present items. Run "clean-up database" to clean them up.
 internalhelp.dbdrivername=Database driver name
 internalhelp.dbdriverversion=Database driver version
+internalhelp.dbserverversion=Database server version
 internalhelp.dbdirectorysize=Size of the internal database directory
 internalhelp.dblogsize=Size of the internal database log
 internalhelp.dblogsize.ok=The size of the database log file (db/airsonic.log) appears healthy.
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
index 350a16d8..e38e440f 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/internalhelp.jsp
@@ -101,6 +101,7 @@
 
     <tr><td class="ruleTableHeader"><fmt:message key="internalhelp.dbdrivername"/></td><td class="ruleTableCell">${model.dbDriverName}</td></tr>
     <tr><td class="ruleTableHeader"><fmt:message key="internalhelp.dbdriverversion"/></td><td class="ruleTableCell">${model.dbDriverVersion}</td></tr>
+    <tr><td class="ruleTableHeader"><fmt:message key="internalhelp.dbserverversion"/></td><td class="ruleTableCell">${model.dbServerVersion}</td></tr>
 
     <c:if test="${model.dbIsLegacy}">
         <tr><td class="ruleTableHeader"><fmt:message key="internalhelp.dbdirectorysize"/></td><td class="ruleTableCell">${model.dbDirectorySize}</td></tr>