Skip to content

feat: MariaDB/MySQL table driver behind the ACE ABI (builds on #18) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Admnwk wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: MariaDB/MySQL table driver behind the ACE ABI (builds on #18) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b21ad5e
wip: MariaDB sql_backend + ABI dispatch (OPENADS_WITH_MARIADB)
Admnwk Jun 20, 2026
efa2a6a
chore(scripts): require OPENADS_TOOLCHAIN_ROOT explicitly
Admnwk Jun 20, 2026
8a8ee0e
fix(openads-plus): guard a null field handle in the mariadb field lookup
Admnwk Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ option(OPENADS_WITH_TLS "Enable TLS transport (vendors mbedtls 3.6 LTS via Fetch
# and nlohmann/json (MIT) at configure time via FetchContent.
option(OPENADS_WITH_HTTP "Enable embedded HTTP web console (Studio) in openads_serverd / ace64.dll" ON)

# Optional MariaDB table driver (mariadb-connector-c). OFF by default.
option(OPENADS_WITH_MARIADB "Enable MariaDB-backed table driver (libmariadb)" OFF)

# Pull in mbedtls FIRST so our strict /WX -Werror flags don't bleed
# into the upstream sources (C4200 zero-sized arrays etc). Each
# OpenADS target adds the strict flags target-locally below via
Expand Down Expand Up @@ -126,6 +129,59 @@ if(OPENADS_WITH_HTTP)
message(STATUS "OpenADS: HTTP web console enabled (cpp-httplib + nlohmann/json)")
endif()

if(OPENADS_WITH_MARIADB)
set(_openads_maria_linked FALSE)
set(OPENADS_LIBMARIADB_INCLUDE "" CACHE PATH "Directory containing mysql.h")
set(OPENADS_LIBMARIADB_LIBRARY "" CACHE FILEPATH "libmariadb import library (.lib/.a)")
if(OPENADS_LIBMARIADB_INCLUDE AND OPENADS_LIBMARIADB_LIBRARY)
set(_openads_maria_inc "${OPENADS_LIBMARIADB_INCLUDE}")
set(_openads_maria_lib "${OPENADS_LIBMARIADB_LIBRARY}")
endif()
if(NOT _openads_maria_lib)
if(DEFINED ENV{OPENADS_LIBMARIADB_LIBRARY})
set(_openads_maria_lib "$ENV{OPENADS_LIBMARIADB_LIBRARY}")
endif()
if(DEFINED ENV{OPENADS_LIBMARIADB_INCLUDE})
set(_openads_maria_inc "$ENV{OPENADS_LIBMARIADB_INCLUDE}")
endif()
endif()
if(NOT _openads_maria_lib OR NOT _openads_maria_inc)
if(DEFINED ENV{OPENADS_TOOLCHAIN_ROOT})
set(_openads_toolchain_root "$ENV{OPENADS_TOOLCHAIN_ROOT}")
elseif(DEFINED OPENADS_TOOLCHAIN_ROOT)
set(_openads_toolchain_root "${OPENADS_TOOLCHAIN_ROOT}")
endif()
if(_openads_toolchain_root)
if(NOT _openads_maria_inc)
find_path(_openads_maria_inc mysql.h
PATHS "${_openads_toolchain_root}/mariadb/include"
NO_DEFAULT_PATH)
endif()
if(NOT _openads_maria_lib)
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
find_library(_openads_maria_lib NAMES libmariadb
PATHS "${_openads_toolchain_root}/mariadb/lib"
NO_DEFAULT_PATH)
else()
find_library(_openads_maria_lib NAMES libmariadb64 libmariadb
PATHS "${_openads_toolchain_root}/mariadb/lib"
NO_DEFAULT_PATH)
endif()
endif()
endif()
endif()
if(_openads_maria_inc AND _openads_maria_lib)
add_library(openads_libmariadb INTERFACE)
target_include_directories(openads_libmariadb INTERFACE "${_openads_maria_inc}")
target_link_libraries(openads_libmariadb INTERFACE "${_openads_maria_lib}")
set(_openads_maria_linked TRUE)
message(STATUS "OpenADS: MariaDB backend (libmariadb: ${_openads_maria_lib})")
endif()
if(NOT _openads_maria_linked)
message(FATAL_ERROR "OPENADS_WITH_MARIADB=ON but libmariadb was not found")
endif()
endif()

if(MSVC)
add_compile_options(/W4 /permissive-)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
Expand Down
14 changes: 14 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ add_library(openads_core STATIC
network/mg_wire.cpp
)

if(OPENADS_WITH_MARIADB)
target_sources(openads_core PRIVATE
sql_backend/sql_common.cpp
sql_backend/maria_uri.cpp
sql_backend/maria_backend.cpp
sql_backend/maria_connection.cpp
)
endif()

if(WIN32)
target_sources(openads_core PRIVATE
platform/file_win32.cpp
Expand Down Expand Up @@ -98,6 +107,11 @@ if(OPENADS_WITH_TLS)
MbedTLS::mbedtls MbedTLS::mbedx509 MbedTLS::mbedcrypto)
endif()

if(OPENADS_WITH_MARIADB)
target_compile_definitions(openads_core PUBLIC OPENADS_WITH_MARIADB=1)
target_link_libraries(openads_core PUBLIC openads_libmariadb)
endif()

# ----------------------------------------------------------------------
# Drop-in replacement DLL: ace32.dll (x86) / ace64.dll (x64).
# Harbour's contrib/rddads links against ace32.lib / ace64.lib import
Expand Down
Loading