Skip to content

Commit

Permalink
Adaugat biblioteca dotenv
Browse files Browse the repository at this point in the history
  • Loading branch information
Duta-Sebastian committed Dec 23, 2024
1 parent f3729c5 commit 6422a5f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export DB_NAME=oop_db
export DB_USER=oop
export DB_PASSWORD=ooppa55
export DB_HOSTADDR=127.0.0.1
export DB_PORT=5432
export DB_CONNECT_TIMEOUT=10
DATABASE_NAME=oop_db
DATABASE_USER=oop
DATABASE_PASSWORD=ooppa55
DATABASE_HOSTADDR=127.0.0.1
DATABASE_PORT=5432
DATABASE_CONNECT_TIMEOUT=10
9 changes: 8 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,13 @@ FetchContent_Declare(

FetchContent_MakeAvailable(pqxx)

FetchContent_Declare(
dotenv
GIT_REPOSITORY https://github.com/laserpants/dotenv-cpp
)

FetchContent_MakeAvailable(dotenv)

###############################################################################

# external dependencies with find_package
Expand All @@ -69,7 +76,7 @@ include(cmake/CompilerFlags.cmake)
# use SYSTEM so cppcheck and clang-tidy do not report warnings from these directories
target_include_directories(${MAIN_EXECUTABLE_NAME} SYSTEM PRIVATE generated/include)
target_include_directories(${MAIN_EXECUTABLE_NAME} PRIVATE database)
target_link_libraries(${MAIN_EXECUTABLE_NAME} PRIVATE pqxx)
target_link_libraries(${MAIN_EXECUTABLE_NAME} PRIVATE pqxx dotenv)
# target_include_directories(${MAIN_EXECUTABLE_NAME} SYSTEM PRIVATE ext/<SomeHppLib>/include)
# target_include_directories(${MAIN_EXECUTABLE_NAME} SYSTEM PRIVATE ${<SomeLib>_SOURCE_DIR}/include)
# target_link_directories(${MAIN_EXECUTABLE_NAME} PRIVATE ${<SomeLib>_BINARY_DIR}/lib)
Expand Down
14 changes: 8 additions & 6 deletions database/Database.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include <iostream>
#include "dotenv.h"

#include "Database.h"

Database::Database(const bool& withDropTables) {
Expand Down Expand Up @@ -95,10 +97,10 @@ void Database::updateUserPassword(std::string name, std::string newPassword) {
}

void Database::setConnectionString() {
connString = "dbname=" + std::string(std::getenv("DB_NAME")) +
" user=" + std::string(std::getenv("DB_USER")) +
" password=" + std::string(std::getenv("DB_PASSWORD")) +
" hostaddr=" + std::string(std::getenv("DB_HOSTADDR")) +
" port=" + std::string(std::getenv("DB_PORT")) +
" connect_timeout=" + std::string(std::getenv("DB_CONNECT_TIMEOUT"));
connString = "dbname=" + std::string(dotenv::getenv("DATABASE_NAME", "''")) +
" user=" + std::string(dotenv::getenv("DATABASE_USER", "''")) +
" password=" + std::string(dotenv::getenv("DATABASE_PASSWORD", "''")) +
" hostaddr=" + std::string(dotenv::getenv("DATABASE_HOSTADDR", "127.0.0.1")) +
" port=" + std::string(dotenv::getenv("DATABASE_PORT","5432")) +
" connect_timeout=" + std::string(dotenv::getenv("DATABASE_CONNECT_TIMEOUT", "10"));
}
2 changes: 2 additions & 0 deletions main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

#include <Helper.h>
#include "Database.h"
#include "dotenv.h"

int main() {
dotenv::init();
std::cout << "Hello, world!\n";
std::array<int, 100> v{};
int nr;
Expand Down

0 comments on commit 6422a5f

Please sign in to comment.