fix: The database type detection mechanism has been redesigned.

Author: dessanhemrayev

changelog.html

@@ -44,6 +44,11 @@ <h1>
 REST API Plugin Changelog
 </h1>
 
+<p><b>1.12.1</b> October 9, 2025</p>
+<ul>
+    <li>Ensure cross-database compatibility for unread message count query</li>
+</ul>
+
 <p><b>1.12.0</b> July 4, 2025</p>
 <ul>
     <li>Now requires Openfire 5.0.0 or later</li>

src/java/org/jivesoftware/openfire/plugin/rest/controller/MsgArchiveController.java

@@ -36,29 +36,30 @@ public class MsgArchiveController {
 
     /** The Constant INSTANCE. */
     public static final MsgArchiveController INSTANCE = new MsgArchiveController();
+    
     /**
      * Builds the SQL query for counting unread messages based on the underlying database type.
      *
-     * @param con the database connection used to detect the database product name
+     * @param databaseType the database connection used to detect the database product name
      * @return the database-specific SQL query string for counting unread messages
      * @throws SQLException if a database access error occurs while retrieving metadata
      */
-    private String buildUserMessageCountQuery(Connection con) throws SQLException {
-        String db = con.getMetaData().getDatabaseProductName().toLowerCase();
+    private String buildUserMessageCountQuery(DatabaseType databaseType) throws SQLException {
         String castExpr;
-    
-        if (db.contains("mysql")) {
-            castExpr = "CAST(p.offlineDate AS SIGNED)";
-        } else if (db.contains("oracle")) {
-            castExpr = "CAST(p.offlineDate AS NUMBER)";
-        } else {
-            // PostgreSQL, SQL Server, Sybase — all understand BIGINT in CAST
-            castExpr = "CAST(p.offlineDate AS BIGINT)";
+        switch (databaseType) {
+            case mysql:
+                castExpr = "CAST(p.offlineDate AS SIGNED)"; break;
+            case oracle:
+                castExpr = "CAST(p.offlineDate AS NUMBER)"; break;
+            default:
+                // PostgreSQL, SQL Server, Sybase — all understand BIGINT in CAST
+                castExpr = "CAST(p.offlineDate AS BIGINT)";
+                break;
         }
-    
+
         return "SELECT COUNT(1) FROM ofMessageArchive a " +
-               "JOIN ofPresence p ON (a.sentDate > " + castExpr + ") " +
-               "WHERE a.toJID = ? AND p.username = ?";
+            "JOIN ofPresence p ON (a.sentDate > " + castExpr + ") " +
+            "WHERE a.toJID = ? AND p.username = ?";
     }
     /**
      * Gets the single instance of MsgArchiveController.
@@ -88,8 +89,9 @@ public int getUnReadMessagesCount(JID jid) {
         ResultSet rs = null;
         try {
             con = DbConnectionManager.getConnection();
-            String userMessageCount = buildUserMessageCountQuery(con);
-            pstmt = con.prepareStatement(userMessageCount);
+            DatabaseType databaseType = DbConnectionManager.getDatabaseType();
+            String userMessageCountQuery = buildUserMessageCountQuery(databaseType);
+            pstmt = con.prepareStatement(userMessageCountQuery);
             pstmt.setString(1, jid.toBareJID());
             pstmt.setString(2, jid.getNode());
             rs = pstmt.executeQuery();