Just delete mysqlconncpp entirely

Delete FindMySQLConnectorCPP

Get rid of FindMySQL and use Boost.Mysql

libmysqlcppconn-dev is a hacky uncomplete unbuntu library with custom file staging that's incompatible with modern setups (include/jdbc) so grab official binaries instead and install directly into cmake.

Author: Phatcat

CMakeLists.txt

@@ -98,12 +98,6 @@ set(version_file "${CMAKE_CURRENT_BINARY_DIR}/Version.cpp")
 find_package(Botan 2.14.0 REQUIRED)
 include_directories(${BOTAN_INCLUDE_DIRS})
 
-##############################
-#     MySQL Connector C++    #
-##############################
-find_package(MySQLConnectorCPP REQUIRED)
-include_directories(${MYSQLCCPP_INCLUDE_DIRS})
-
 ##############################
 #         FlatBuffers        #
 ##############################

Dockerfile

@@ -6,7 +6,7 @@ LABEL description="Development build environment"
 # Update the distro and install our tools
 RUN apt-get -y update && apt-get -y upgrade \
  && apt-get -y install software-properties-common \
- && apt-get -y install wget \
+ && apt-get -y install wget tar \
  # GCC stuff
  && apt-get -y install build-essential gcc-14 g++-14 \
  # Clang stuff
@@ -23,14 +23,14 @@ RUN apt-get -y update && apt-get -y upgrade \
  && apt-get -y install git \
  # Install required library packages
  && apt-get install -y libbotan-2-dev \
- && apt-get install -y libmysqlcppconn-dev \
+ && apt-get install -y libssl-dev \
  && apt-get install -y zlib1g-dev \
  && apt-get install -y libpcre3-dev \
  && apt-get install -y libflatbuffers-dev \
  && wget -q https://archives.boost.io/release/1.88.0/source/boost_1_88_0.tar.gz \
  && tar -zxf boost_1_88_0.tar.gz \
  && cd boost_1_88_0 \
- && ./bootstrap.sh --with-libraries=system,program_options,headers \
+ && ./bootstrap.sh --with-libraries=mysql,system,program_options,headers \
  && ./b2 link=static install -d0 -j $(nproc) cxxflags="-std=c++23"
 
 # Copy source
@@ -42,7 +42,7 @@ WORKDIR ${working_dir}
 # These can be overriden by passing them through to `docker build`
 ARG build_optional_tools=1
 ARG disable_threads=0
-ARG build_type=Rel
+ARG build_type=Debug
 ARG install_dir=/usr/local/bin
 
 # Generate Makefile & compile

cmake/FindMySQLConnectorCPP.cmake

@@ -25,8 +25,8 @@ set(LIBRARY_SRC
 include_directories(${SPARK_INCLUDES_DIR})
 
 add_library(${LIBRARY_NAME} ${LIBRARY_HDR} ${LIBRARY_SRC})
-target_link_libraries(${LIBRARY_NAME} PRIVATE spark conpool logger shared ${MYSQLCCPP_LIBRARY} 
-                                      ${BOTAN_LIBRARY} ${Boost_LIBRARIES} Threads::Threads FB_SCHEMA_COMPILE)
+target_link_libraries(${LIBRARY_NAME} spark conpool logger shared ${Boost_LIBRARIES}
+                                      ${BOTAN_LIBRARY} Threads::Threads FB_SCHEMA_COMPILE)
 target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_BINARY_DIR})
 
 add_executable(${EXECUTABLE_NAME} main.cpp)

src/account/CMakeLists.txt

@@ -24,13 +24,13 @@ set(LIBRARY_SRC
 include_directories(${CMAKE_SOURCE_DIR}/deps/utf8cpp)
 
 add_library(${LIBRARY_NAME} ${LIBRARY_HDR} ${LIBRARY_SRC})
-target_link_libraries(${LIBRARY_NAME} dbcreader spark logger protocol shared ${BOTAN_LIBRARY} 
-                                      ${Boost_LIBRARIES} Threads::Threads FB_SCHEMA_COMPILE)
+target_link_libraries(${LIBRARY_NAME} dbcreader spark logger protocol shared ${Boost_LIBRARIES}
+                                      ${BOTAN_LIBRARY} Threads::Threads FB_SCHEMA_COMPILE)
 target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_BINARY_DIR})
 
 add_executable(${EXECUTABLE_NAME} main.cpp)
 target_link_libraries(${EXECUTABLE_NAME} ${LIBRARY_NAME} protocol dbcreader spark conpool logger shared 
-                                                         ${MYSQLCCPP_LIBRARY} ${Boost_LIBRARIES} Threads::Threads)
+                                         ${Boost_LIBRARIES} Threads::Threads)
 
 INSTALL(TARGETS ${EXECUTABLE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 set_target_properties(character PROPERTIES FOLDER "Services/Applications")

src/character/CMakeLists.txt

@@ -85,8 +85,8 @@ set(LIBRARY_SRC
 
 add_library(${LIBRARY_NAME} ${LIBRARY_HDR} ${LIBRARY_SRC})
 add_dependencies(${LIBRARY_NAME} FB_SCHEMA_COMPILE)
-target_link_libraries(${LIBRARY_NAME} PRIVATE ${Boost_LIBRARIES} PRIVATE nsd conpool stun ports dbcreader protocol spark 
-                                             logger shared ${ZLIB_LIBRARY} ${BOTAN_LIBRARY} Threads::Threads)
+target_link_libraries(${LIBRARY_NAME} nsd conpool stun ports dbcreader protocol spark logger shared
+                                      ${Boost_LIBRARIES} ${BOTAN_LIBRARY} ${ZLIB_LIBRARY} Threads::Threads)
 target_include_directories(${LIBRARY_NAME} PUBLIC ${CMAKE_BINARY_DIR})
 
 add_executable(${EXECUTABLE_NAME} main.cpp)

src/gateway/CMakeLists.txt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 - 2024 Ember
+ * Copyright (c) 2014 - 2025 Ember
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -18,12 +18,19 @@
 #include <string_view>
 #include <utility>
 #include <cstdint>
+#include <boost/mysql.hpp>
+#include <boost/asio/io_context.hpp>
 
 namespace sql {
 
-class Driver;
-class Connection;
-class PreparedStatement;
+using Connection = boost::mysql::tcp_connection;
+using PreparedStatement = boost::mysql::statement;
+
+class Driver {
+public:
+	std::string getName() const { return "Boost.MySQL"; }
+	std::tuple<int, int, int> getVersion() const { return std::make_tuple(0, 0, 0); }
+};
 
 } // sql
 
@@ -75,10 +82,8 @@ class MySQL final {
 	bool clean(sql::Connection* conn) const;
 	void close(sql::Connection* conn) const;
 	bool keep_alive(sql::Connection* conn) const;
-	void thread_enter() const;
-	void thread_exit() const;
 	sql::PreparedStatement* prepare_cached(sql::Connection* conn, std::string key);
 	sql::PreparedStatement* prepare_cached(sql::Connection* conn, std::string_view key);
 };
 
-} // drivers, ember
+} // drivers, ember