Рабочая сборка с третьей ручкой

src/DAO/MySQLUserDAO.cpp

@@ -23,7 +23,7 @@ string MySQLUserDAO::Create(const user& created_user)
 
   const string sql_script =
     "INSERT INTO `up_and_down`.`users` (`uuid`, `login`, `hashed_password`) VALUES ('"
-    + uuid_str + "', '" + created_user.login +"', '" + created_user.hashed_password + "');"s;
+    + uuid_str + "', '" + created_user.login + "', '" + created_user.hashed_password + "');"s;
 
   session_.sql(sql_script).execute();
 
@@ -33,8 +33,8 @@ string MySQLUserDAO::Create(const user& created_user)
 optional<user> MySQLUserDAO::GetByUUID(const string& uuid)
 {
   const string sql_script = "SELECT * FROM `up_and_down`.`users`"s +
-                                   "WHERE (uuid = '"s + uuid +
+    "WHERE (uuid = '"s + uuid +
-                                   "') LIMIT 1;"s;
+    "') LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
                                  sql(sql_script).execute();
 
@@ -44,8 +44,8 @@ optional<user> MySQLUserDAO::GetByUUID(const string& uuid)
 optional<user> MySQLUserDAO::GetByLogin(const string& login)
 {
   const std::string sql_script = "SELECT * FROM `up_and_down`.`users`"s +
-                                   " WHERE (login = '"s + login
+    " WHERE (login = '"s + login
-                                   + "') LIMIT 1;"s;
+    + "') LIMIT 1;"s;
   mysqlx::SqlResult sql_result = session_.
                                  sql(sql_script).execute();
 
@@ -96,19 +96,22 @@ pair<bool, vector<user>> MySQLUserDAO::GetAll(size_t limit, size_t offset)
 
 bool MySQLUserDAO::Update(const user& u)
 {
-  const string sql_script = "UPDATE `up_and_down`.`user` SET login = '"s + u.login +
+  const string sql_script = "UPDATE `up_and_down`.`users` SET `login` = ? WHERE `uuid` = ?;"s;
-    "' WHERE guid = '" + u.uuid + "';"s;
 
-  auto schema = session_.sql(sql_script).execute();
+  auto schema = session_.sql(sql_script)
+                        .bind(u.login, u.uuid)
+                        .execute();
 
   return !!schema.getAffectedItemsCount();
 }
 
 bool MySQLUserDAO::Delete(const string& uuid)
 {
-  const string sql_script = "DELETE FROM `up_and_down`.`user` WHERE guid = '" + uuid +"';";
+  const string sql_script = "DELETE FROM `up_and_down`.`users` WHERE `uuid` = ?;";
 
-  auto schema = session_.sql(sql_script).execute();
+  auto schema = session_.sql(sql_script)
+                        .bind(uuid)
+                        .execute();
 
   return !!schema.getAffectedItemsCount();
 }
@@ -129,9 +132,9 @@ std::optional<user> MySQLUserDAO::GetSingleUserBySQLResult(mysqlx::SqlResult&& s
   const string user_hashed_password = row_data[2].get<string>();
 
   return optional<user>({
-    .uuid = user_uuid,
+      .uuid = user_uuid,
-    .login = user_login,
+      .login = user_login,
-    .hashed_password = user_hashed_password
+      .hashed_password = user_hashed_password
-  });
+    });
 }
 } // uad