phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

Added database configuration file

Browse Source
This commit is contained in:
kdeng00
2019-08-18 16:15:47 -04:00
parent 10b546d8b8
commit e9aa5f799c
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -13
View File
@@ -5,8 +5,6 @@ project(icarus)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
set(SOURCES set(SOURCES
src/appComponent.hpp src/appComponent.hpp
src/controller/loginController.hpp src/controller/loginController.hpp
@@ -20,10 +18,10 @@ set(SOURCES
) )
set(HEADERS set(HEADERS
include/database/base_repository.h include/database/base_repository.h
include/models.h
include/directory_manager.h include/directory_manager.h
include/imageFile.h include/imageFile.h
include/metadata_retriever.h include/metadata_retriever.h
include/models.h
include/token_manager.h include/token_manager.h
) )
@@ -60,27 +58,18 @@ set (ORM_DIR
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ormpp ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ormpp
) )
set (MYSQL
/usr/local/mysql/connector-c++-8.0/lib64
)
set (MYSQL_INCLUDE
/usr/local/mysql/connector-c++-8.0/include/mysqlx
/usr/local/mysql/connector-c++-8.0/include/mysqlx/common
)
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup() conan_basic_setup()
link_directories(${MYSQL})
include_directories(include ${CPR_INCLUDE_DIRS} ${TAGLIB} ${TAGLIB_HEADERS}) include_directories(include ${CPR_INCLUDE_DIRS} ${TAGLIB} ${TAGLIB_HEADERS})
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cpr) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cpr)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/taglib) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/taglib)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/oatpp) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/oatpp)
#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/mysql-connector-cpp)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/appsettings.json ${CMAKE_BINARY_DIR}/bin/appsettings.json COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/appsettings.json ${CMAKE_BINARY_DIR}/bin/appsettings.json COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/authcredentials.json ${CMAKE_BINARY_DIR}/bin/authcredentials.json COPYONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/authcredentials.json ${CMAKE_BINARY_DIR}/bin/authcredentials.json COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/database.json ${CMAKE_BINARY_DIR}/bin/database.json COPYONLY)
add_executable(icarus ${SOURCES} ${HEADERS}) add_executable(icarus ${SOURCES} ${HEADERS})
target_include_directories(icarus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/jwt-cpp/include) target_include_directories(icarus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/jwt-cpp/include)
database.json
+7
View File
@@ -0,0 +1,7 @@
{
"server": "server",
"database": "database",
"username": "username",
"password": "password"
}
include/database/base_repository.h
+1 -1
View File
@@ -12,7 +12,7 @@ class base_repository
public: public:
MYSQL* setup_mysql_connection(database_connection); MYSQL* setup_mysql_connection(database_connection);
MYSQL_RES* perform_mysql_query(MYSQL*, std::string&); MYSQL_RES* perform_mysql_query(MYSQL*, const std::string&);
private: private:
}; };
src/database/base_repository.cpp
+1 -1
View File
@@ -12,7 +12,7 @@ MYSQL* base_repository::setup_mysql_connection(database_connection details)
return connection; return connection;
} }
MYSQL_RES* base_repository::perform_mysql_query(MYSQL *conn, std::string& query) MYSQL_RES* base_repository::perform_mysql_query(MYSQL *conn, const std::string& query)
{ {
// send the query to the database // send the query to the database
if (mysql_query(conn, query.c_str())) if (mysql_query(conn, query.c_str()))