From b733eee7e4bfe5bb1f42ddba28429edb274ec89a Mon Sep 17 00:00:00 2001 From: ihmc3jn09hk Date: Sat, 8 Feb 2020 11:08:11 +0800 Subject: [PATCH] A small fix. (#345) * Fix missed "password" fix for MySQL. * Update trantor Co-authored-by: An Tao --- .gitignore | 2 +- drogon_ctl/create_model.cc | 4 ++++ trantor | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 075e6e8e..0cb9d764 100755 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,4 @@ latex/ .settings/ .vs/ CMakeSettings.json - +install diff --git a/drogon_ctl/create_model.cc b/drogon_ctl/create_model.cc index 68e64137..a56ce6a7 100644 --- a/drogon_ctl/create_model.cc +++ b/drogon_ctl/create_model.cc @@ -804,6 +804,10 @@ void create_model::createModel(const std::string &path, exit(1); } auto password = config.get("passwd", "").asString(); + if (password.empty()) + { + password = config.get("password", "").asString(); + } auto connStr = utils::formattedString("host=%s port=%u dbname=%s user=%s", diff --git a/trantor b/trantor index faea59cf..dc45be85 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit faea59cfe6e1e836a7e9d8a08669b8e2d3a466ae +Subproject commit dc45be8593c8acad952b8abc38b807aeeeae6baf