summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-03-18 02:50:33 +0100
committerlouiz’ <louiz@louiz.org>2018-03-18 02:54:34 +0100
commit5af0a8040c33d07dacf78343eb9ed0a03437a65a (patch)
tree0473c864e9e32c947a2c4879997a00c5838b040e
parentc8e96fc31bc9938e9fb59af77676305b14a289a2 (diff)
downloadbiboumi-5af0a8040c33d07dacf78343eb9ed0a03437a65a.tar.gz
biboumi-5af0a8040c33d07dacf78343eb9ed0a03437a65a.tar.bz2
biboumi-5af0a8040c33d07dacf78343eb9ed0a03437a65a.tar.xz
biboumi-5af0a8040c33d07dacf78343eb9ed0a03437a65a.zip
Use a transaction around the DELETE + INSERT of the after_connection_commands
Otherwise we can imagine that two clients changing this value at the same time would mix things up. ref #3275
-rw-r--r--src/database/database.cpp21
-rw-r--r--src/database/database.hpp11
2 files changed, 31 insertions, 1 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 812d27c..b1525d5 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -106,6 +106,8 @@ void Database::set_after_connection_commands(const Database::IrcServerOptions& s
const auto id = server_options.col<Id>();
if (id == Id::unset_value)
return ;
+
+ Transaction transaction;
auto query = Database::after_connection_commands.del();
query.where() << ForeignKey{} << "=" << id;
query.execute(*Database::db);
@@ -330,4 +332,23 @@ std::string Database::gen_uuid()
return uuid_str;
}
+Transaction::Transaction()
+{
+ const auto result = Database::raw_exec("BEGIN");
+ if (std::get<bool>(result) == false)
+ log_error("Failed to create SQL transaction: ", std::get<std::string>(result));
+ else
+ this->success = true;
+
+}
+
+Transaction::~Transaction()
+{
+ if (this->success)
+ {
+ const auto result = Database::raw_exec("END");
+ if (std::get<bool>(result) == false)
+ log_error("Failed to end SQL transaction: ", std::get<std::string>(result));
+ }
+}
#endif
diff --git a/src/database/database.hpp b/src/database/database.hpp
index 0e88be8..5dde447 100644
--- a/src/database/database.hpp
+++ b/src/database/database.hpp
@@ -203,11 +203,20 @@ class Database
static auto raw_exec(const std::string& query)
{
- Database::db->raw_exec(query);
+ return Database::db->raw_exec(query);
}
private:
static std::string gen_uuid();
static std::map<CacheKey, EncodingIn::real_type> encoding_in_cache;
};
+
+class Transaction
+{
+public:
+ Transaction();
+ ~Transaction();
+ bool success{false};
+};
+
#endif /* USE_DATABASE */