From be2c1ead61289e277d7d3c0db37865301a94a4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Sun, 28 Sep 2025 08:25:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=87=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B0=20=D1=81=20=D1=82=D1=80?= =?UTF-8?q?=D0=B5=D1=82=D1=8C=D0=B5=D0=B9=20=D1=80=D1=83=D1=87=D0=BA=D0=BE?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/DAO/MySQLUserDAO.cpp | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/src/DAO/MySQLUserDAO.cpp b/src/DAO/MySQLUserDAO.cpp index 0ca9486..a94d4fd 100644 --- a/src/DAO/MySQLUserDAO.cpp +++ b/src/DAO/MySQLUserDAO.cpp @@ -25,9 +25,7 @@ string MySQLUserDAO::Create(const user& created_user) "INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('" + uuid_str + "', '" + created_user.login +"', '" + created_user.hashed_password + "');"s; - session_.sql(sql_script) - .bind(uuid_str, created_user.login, created_user.hashed_password) - .execute(); + session_.sql(sql_script).execute(); return uuid_str; } @@ -89,10 +87,7 @@ pair> MySQLUserDAO::GetAll(size_t limit, size_t offset) const string user_uuid = row[0].get(); const string user_login = row[1].get(); - user.login = user_login; - user.uuid = user_uuid; - - ret.second.push_back(std::move(user)); + ret.second.push_back({.uuid = user_uuid, .login = user_login}); --limit; } @@ -133,12 +128,10 @@ std::optional MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& s const string user_login = row_data[1].get(); const string user_hashed_password = row_data[2].get(); - user single_user; - - single_user.uuid = user_uuid; - single_user.login = user_login; - single_user.hashed_password = user_hashed_password; - - return optional(std::move(single_user)); + return optional({ + .uuid = user_uuid, + .login = user_login, + .hashed_password = user_hashed_password + }); } } // uad