From e9aa5f799c61c94fd43057881ed1b4c9b4be0ce9 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Sun, 18 Aug 2019 16:15:47 -0400
Subject: [PATCH] Added database configuration file

---
 CMakeLists.txt                     | 15 ++-------------
 database.json                      |  7 +++++++
 include/database/base_repository.h |  2 +-
 src/database/base_repository.cpp   |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 database.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cce78a..7c15d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,6 @@ project(icarus)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_STANDARD 17)
 
-#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-
 set(SOURCES
     src/appComponent.hpp
     src/controller/loginController.hpp
@@ -20,10 +18,10 @@ set(SOURCES
 )
 set(HEADERS
     include/database/base_repository.h
-    include/models.h
     include/directory_manager.h
     include/imageFile.h
     include/metadata_retriever.h
+    include/models.h
     include/token_manager.h
 )
 
@@ -60,27 +58,18 @@ set (ORM_DIR
     ${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)
 conan_basic_setup()
 
-link_directories(${MYSQL})
 include_directories(include ${CPR_INCLUDE_DIRS} ${TAGLIB} ${TAGLIB_HEADERS})
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cpr)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/taglib)
 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}/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})
 target_include_directories(icarus PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/jwt-cpp/include)
diff --git a/database.json b/database.json
new file mode 100644
index 0000000..661decf
--- /dev/null
+++ b/database.json
@@ -0,0 +1,7 @@
+
+{
+  "server": "server",
+  "database": "database",
+  "username": "username",
+  "password": "password"
+}
diff --git a/include/database/base_repository.h b/include/database/base_repository.h
index d8c8e43..110f29e 100644
--- a/include/database/base_repository.h
+++ b/include/database/base_repository.h
@@ -12,7 +12,7 @@ class base_repository
 public:
     MYSQL* setup_mysql_connection(database_connection);
 
-    MYSQL_RES* perform_mysql_query(MYSQL*, std::string&);
+    MYSQL_RES* perform_mysql_query(MYSQL*, const std::string&);
 private:
 };
 
diff --git a/src/database/base_repository.cpp b/src/database/base_repository.cpp
index c67c065..886c66b 100644
--- a/src/database/base_repository.cpp
+++ b/src/database/base_repository.cpp
@@ -12,7 +12,7 @@ MYSQL* base_repository::setup_mysql_connection(database_connection details)
     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
    if (mysql_query(conn, query.c_str()))