From ec3ad812f0be9b323ab5fa9ee3ed0097d0256e45 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Tue, 10 Nov 2026 12:16:31 +0100
Subject: [PATCH] [Server] Accept the database interface in the connection pool
 (#7853)

Servatrice_ConnectionPool stored and returned a concrete
Servatrice_DatabaseInterface pointer, so the pool that decides which database a
socket handler runs against could not hold any other Server_DatabaseInterface.
Retype the constructor, member and accessor, and include the interface header
instead of the Servatrice one. The shipped path still builds MySQL pools and
converts implicitly; behaviour is unchanged.
---
 servatrice/src/servatrice_connection_pool.cpp | 4 ++--
 servatrice/src/servatrice_connection_pool.h   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/servatrice/src/servatrice_connection_pool.cpp b/servatrice/src/servatrice_connection_pool.cpp
index 3edb4da27..3bdb58cd7 100644
--- a/servatrice/src/servatrice_connection_pool.cpp
+++ b/servatrice/src/servatrice_connection_pool.cpp
@@ -1,10 +1,10 @@
 #include "servatrice_connection_pool.h"
 
-#include "servatrice_database_interface.h"
+#include "server_database_interface.h"
 
 #include <QThread>
 
-Servatrice_ConnectionPool::Servatrice_ConnectionPool(Servatrice_DatabaseInterface *_databaseInterface)
+Servatrice_ConnectionPool::Servatrice_ConnectionPool(Server_DatabaseInterface *_databaseInterface)
     : databaseInterface(_databaseInterface), threaded(false), clientCount(0)
 {
 }
diff --git a/servatrice/src/servatrice_connection_pool.h b/servatrice/src/servatrice_connection_pool.h
index ddd12fc95..1e6dda8fe 100644
--- a/servatrice/src/servatrice_connection_pool.h
+++ b/servatrice/src/servatrice_connection_pool.h
@@ -6,22 +6,22 @@
 #include <QObject>
 #include <qtmetamacros.h>
 
-class Servatrice_DatabaseInterface;
+class Server_DatabaseInterface;
 
 class Servatrice_ConnectionPool : public QObject
 {
     Q_OBJECT
 private:
-    Servatrice_DatabaseInterface *databaseInterface;
+    Server_DatabaseInterface *databaseInterface;
     bool threaded;
     mutable QMutex clientCountMutex;
     int clientCount;
 
 public:
-    explicit Servatrice_ConnectionPool(Servatrice_DatabaseInterface *_databaseInterface);
+    explicit Servatrice_ConnectionPool(Server_DatabaseInterface *_databaseInterface);
     ~Servatrice_ConnectionPool() override;
 
-    Servatrice_DatabaseInterface *getDatabaseInterface() const
+    Server_DatabaseInterface *getDatabaseInterface() const
     {
         return databaseInterface;
     }