diff --git a/dependencies.yaml b/dependencies.yaml index 8110edb3d..9da40260a 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -53,7 +53,7 @@ libevse-security: # OCPP libocpp: git: https://github.com/EVerest/libocpp.git - git_tag: 27efcee + git_tag: cc169be cmake_condition: "EVEREST_DEPENDENCY_ENABLED_LIBOCPP" # Josev Josev: diff --git a/modules/OCPP/OCPP.cpp b/modules/OCPP/OCPP.cpp index 38f3a275f..6fb56fc45 100644 --- a/modules/OCPP/OCPP.cpp +++ b/modules/OCPP/OCPP.cpp @@ -14,7 +14,7 @@ namespace module { const std::string CERTS_SUB_DIR = "certs"; -const std::string INIT_SQL = "init.sql"; +const std::string SQL_CORE_MIGRTATIONS = "core_migrations"; const std::string CHARGE_X_MREC_VENDOR_ID = "https://chargex.inl.gov"; namespace fs = std::filesystem; @@ -427,7 +427,7 @@ void OCPP::init() { create_empty_user_config(user_config_path); } - const auto sql_init_path = this->ocpp_share_path / INIT_SQL; + const auto sql_init_path = this->ocpp_share_path / SQL_CORE_MIGRTATIONS; if (!fs::exists(this->config.MessageLogPath)) { try { fs::create_directory(this->config.MessageLogPath); diff --git a/modules/OCPP201/OCPP201.cpp b/modules/OCPP201/OCPP201.cpp index f20c7b9e3..fe267831c 100644 --- a/modules/OCPP201/OCPP201.cpp +++ b/modules/OCPP201/OCPP201.cpp @@ -10,7 +10,7 @@ #include namespace module { -const std::string INIT_SQL = "init_core.sql"; +const std::string SQL_CORE_MIGRTATIONS = "core_migrations"; const std::string CERTS_DIR = "certs"; namespace fs = std::filesystem; @@ -419,7 +419,7 @@ void OCPP201::ready() { }; } - const auto sql_init_path = this->ocpp_share_path / INIT_SQL; + const auto sql_init_path = this->ocpp_share_path / SQL_CORE_MIGRTATIONS; std::map evse_connector_structure = this->get_connector_structure(); this->charge_point = std::make_unique(