Integration with PostgresSQL soci backend, modular support in cmake

CMakeLists.txt

@@ -341,8 +341,47 @@ if(NOT ZM_NO_CURL)
   endif()
 endif()
 
+set(LIBSOCI_COMPONENTS "")
+
+# mysqlclient (using find_library and find_path)
+find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
+if(MYSQLCLIENT_LIBRARIES)
+  set(HAVE_LIBMYSQLCLIENT 1)
+  list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
+  find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
+  if(MYSQLCLIENT_INCLUDE_DIR)
+    include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
+  check_include_file("mysql.h" HAVE_MYSQL_H)
+  if(NOT HAVE_MYSQL_H)
+    message(FATAL_ERROR "MySQL client libraries found but no headers - check that MySQL development packages are installed")
+  endif()
+  list(APPEND LIBSOCI_COMPONENTS mysql)
+endif()
+
+find_package(PostgreSQL)
+if(PostgreSQL_FOUND)
+  set(HAVE_LIBPOSTGRESQL_CLIENT 1)
+  list(APPEND ZM_BIN_LIBS "${PostgreSQL_LIBRARIES}")
+  find_path(PostgreSQL_INCLUDE_DIRS libpq-fe.h)
+  if(PostgreSQL_INCLUDE_DIRS)
+    include_directories("${PostgreSQL_INCLUDE_DIRS}")
+    set(CMAKE_REQUIRED_INCLUDES "${PostgreSQL_INCLUDE_DIRS}")
+  endif()
+  mark_as_advanced(FORCE PostgreSQL_LIBRARIES PostgreSQL_INCLUDE_DIRS)
+  check_include_file("libpq-fe.h" HAVE_POSTGRESQL_H)
+  if(NOT HAVE_POSTGRESQL_H)
+    message(FATAL_ERROR "Postegresql client libraries found but no headers - check that Postegresql development packages are installed")
+  endif()
+  list(APPEND LIBSOCI_COMPONENTS postgresql)
+endif()
+
+message(STATUS "Database components available: ${LIBSOCI_COMPONENTS}")
+
 # Soci
-find_package(Soci COMPONENTS mysql postgresql)
+find_package(Soci COMPONENTS ${LIBSOCI_COMPONENTS})
 if(SOCI_FOUND)
   set(HAVE_LIBSOCI 1)
   list(APPEND ZM_BIN_LIBS "${SOCI_LIBRARY}")
@@ -461,25 +500,6 @@ if(NOT ZM_NO_PRCE)
   endif()
 endif()
 
-# mysqlclient (using find_library and find_path)
-find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
-if(MYSQLCLIENT_LIBRARIES)
-  set(HAVE_LIBMYSQLCLIENT 1)
-  list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
-  find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
-  if(MYSQLCLIENT_INCLUDE_DIR)
-    include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
-  check_include_file("mysql.h" HAVE_MYSQL_H)
-  if(NOT HAVE_MYSQL_H)
-    message(FATAL_ERROR "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
-  endif()
-else()
-  message(FATAL_ERROR "ZoneMinder requires mysqlclient but it was not found on your system")
-endif()
-
 find_package(FFMPEG 55.34.100 REQUIRED
   COMPONENTS
     avcodec

src/CMakeLists.txt

@@ -16,6 +16,7 @@ set(ZM_BIN_SRC_FILES
   zm.cpp
   zm_db.cpp
   zm_db_mysql.cpp
+  zm_db_postgresql.cpp
   zm_decoder_thread.cpp
   zm_logger.cpp
   zm_event.cpp

src/zm_db.cpp

@@ -18,6 +18,7 @@
 //
 #include "zm_db.h"
 #include "zm_db_mysql.h"
+#include "zm_db_postgresql.h"
 
 #include "zm_logger.h"
 #include "zm_signal.h"
@@ -48,7 +49,7 @@ bool zmDbConnect()
 
 #ifdef HAVE_LIBSOCI_POSTGRESQL
   if( dbType.compare("postgresql") == 0 )
-    database = new zmDbMySQLAdapter();
+    database = new zmDbPostgresqlAdapter();
 #endif
 
   if( database == nullptr ) {

src/zm_db_mysql.cpp

@@ -22,7 +22,7 @@
 #ifdef HAVE_LIBSOCI_MYSQL
 #include "zm_db_mysql.h"
 
-std::string load_monitor_sql =
+std::string load_monitor_mysql =
 "SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Capturing`, `Analysing`, `AnalysisSource`, `AnalysisImage`,"
 "`Recording`, `RecordingSource`, `Decoding`, "
 "`JanusEnabled`, `JanusAudioEnabled`, `Janus_Profile_Override`, `Janus_Use_RTSP_Restream`,"
@@ -207,11 +207,11 @@ void zmDbMySQLAdapter::prepareSelectMonitorStatements()
     std::string cond_path = "`Path` = :path";
     std::string cond_rtsp = "`Function` != 'None' AND `RTSPerver` != false";
 
-    std::string base_query = load_monitor_sql + cond_type + op_and;
+    std::string base_query = load_monitor_mysql + cond_type + op_and;
 
-    mapStatements[SELECT_MONITOR_WITH_ID]->prepare(load_monitor_sql + cond_id);
+    mapStatements[SELECT_MONITOR_WITH_ID]->prepare(load_monitor_mysql + cond_id);
 
-    mapStatements[SELECT_MONITOR_TYPE]->prepare(load_monitor_sql + cond_type);
+    mapStatements[SELECT_MONITOR_TYPE]->prepare(load_monitor_mysql + cond_type);
 
     mapStatements[SELECT_MONITOR_TYPE_AND_DEVICE]->prepare(base_query + cond_device);
 
@@ -227,13 +227,13 @@ void zmDbMySQLAdapter::prepareSelectMonitorStatements()
 
     mapStatements[SELECT_MONITOR_TYPE_AND_PATH_AND_SERVER]->prepare(base_query + cond_path + op_and + cond_server_id);
 
-    mapStatements[SELECT_MONITOR_TYPE_RTSP]->prepare(load_monitor_sql + cond_rtsp);
+    mapStatements[SELECT_MONITOR_TYPE_RTSP]->prepare(load_monitor_mysql + cond_rtsp);
 
-    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_SERVER]->prepare(load_monitor_sql + cond_rtsp + op_and + cond_server_id);
+    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_SERVER]->prepare(load_monitor_mysql + cond_rtsp + op_and + cond_server_id);
 
-    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_ID]->prepare(load_monitor_sql + cond_rtsp + op_and + cond_id);
+    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_ID]->prepare(load_monitor_mysql + cond_rtsp + op_and + cond_id);
 
-    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_SERVER_AND_ID]->prepare(load_monitor_sql + cond_rtsp + op_and + cond_server_id + op_and + cond_id);
+    mapStatements[SELECT_MONITOR_TYPE_RTSP_AND_SERVER_AND_ID]->prepare(load_monitor_mysql + cond_rtsp + op_and + cond_server_id + op_and + cond_id);
 
 }