summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-04-13 23:35:06 +0200
committerlouiz’ <louiz@louiz.org>2018-04-13 23:35:06 +0200
commit4bd7b6981bb49dd4111c908aaa34c34f677171f4 (patch)
tree918347adb112c04455e23fcad06626e5635b6ad4
parentde8267fa3f4f4e1d61bcf35fb36c6664f520a385 (diff)
downloadbiboumi-4bd7b6981bb49dd4111c908aaa34c34f677171f4.tar.gz
biboumi-4bd7b6981bb49dd4111c908aaa34c34f677171f4.tar.bz2
biboumi-4bd7b6981bb49dd4111c908aaa34c34f677171f4.tar.xz
biboumi-4bd7b6981bb49dd4111c908aaa34c34f677171f4.zip
Refactor that fixes a compilation issue in Release mode
Some template specialization were not found, because they were not declared at the point they were used. We moved things around, things are less inter-dependant, and also now it works.
-rw-r--r--src/database/column_escape.cpp46
-rw-r--r--src/database/database.cpp57
-rw-r--r--src/database/insert_query.cpp21
-rw-r--r--src/database/insert_query.hpp21
-rw-r--r--src/database/row.hpp49
-rw-r--r--src/database/save.hpp31
-rw-r--r--src/database/select_query.cpp21
-rw-r--r--src/database/select_query.hpp14
-rw-r--r--src/database/sqlite3_engine.cpp1
-rw-r--r--src/database/table.hpp10
-rw-r--r--src/database/update_query.hpp11
-rw-r--r--src/xmpp/biboumi_adhoc_commands.cpp7
-rw-r--r--tests/database.cpp21
13 files changed, 162 insertions, 148 deletions
diff --git a/src/database/column_escape.cpp b/src/database/column_escape.cpp
deleted file mode 100644
index 0f1f611..0000000
--- a/src/database/column_escape.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <string>
-
-#include <database/database.hpp>
-#include <database/select_query.hpp>
-
-template <>
-std::string before_column<Database::Date>()
-{
- if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
- return "strftime(\"%Y-%m-%dT%H:%M:%SZ\", ";
- else if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
- return "to_char(";
- return {};
-}
-
-template <>
-std::string after_column<Database::Date>()
-{
- if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
- return ")";
- else if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
- return R"(, 'YYYY-MM-DD"T"HH24:MM:SS"Z"'))";
- return {};
-}
-
-#include <database/insert_query.hpp>
-
-template <>
-std::string before_value<Database::Date>()
-{
- if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
- return "julianday(";
- if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
- return "to_timestamp(";
- return {};
-}
-
-template <>
-std::string after_value<Database::Date>()
-{
- if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
- return ", \"unixepoch\")";
- if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
- return ")";
- return {};
-}
diff --git a/src/database/database.cpp b/src/database/database.cpp
index 7cb0a45..c935139 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -1,6 +1,8 @@
#include "biboumi.h"
#ifdef USE_DATABASE
+#include <database/select_query.hpp>
+#include <database/save.hpp>
#include <database/database.hpp>
#include <utils/get_first_non_empty.hpp>
#include <utils/time.hpp>
@@ -63,32 +65,28 @@ void Database::open(const std::string& filename)
Database::GlobalOptions Database::get_global_options(const std::string& owner)
{
- auto request = Database::global_options.select();
+ auto request = select(Database::global_options);
request.where() << Owner{} << "=" << owner;
- Database::GlobalOptions options{Database::global_options.get_name()};
auto result = request.execute(*Database::db);
if (result.size() == 1)
- options = result.front();
- else
- options.col<Owner>() = owner;
+ return result.front();
+ Database::GlobalOptions options{Database::global_options.get_name()};
+ options.col<Owner>() = owner;
return options;
}
Database::IrcServerOptions Database::get_irc_server_options(const std::string& owner, const std::string& server)
{
- auto request = Database::irc_server_options.select();
+ auto request = select(Database::irc_server_options);
request.where() << Owner{} << "=" << owner << " and " << Server{} << "=" << server;
- Database::IrcServerOptions options{Database::irc_server_options.get_name()};
auto result = request.execute(*Database::db);
if (result.size() == 1)
- options = result.front();
- else
- {
- options.col<Owner>() = owner;
- options.col<Server>() = server;
- }
+ return result.front();
+ Database::IrcServerOptions options{Database::irc_server_options.get_name()};
+ options.col<Owner>() = owner;
+ options.col<Server>() = server;
return options;
}
@@ -97,7 +95,7 @@ Database::AfterConnectionCommands Database::get_after_connection_commands(const
const auto id = server_options.col<Id>();
if (id == Id::unset_value)
return {};
- auto request = Database::after_connection_commands.select();
+ auto request = select(Database::after_connection_commands);
request.where() << ForeignKey{} << "=" << id;
return request.execute(*Database::db);
}
@@ -116,26 +114,23 @@ void Database::set_after_connection_commands(const Database::IrcServerOptions& s
for (auto& command: commands)
{
command.col<ForeignKey>() = server_options.col<Id>();
- command.save(Database::db);
+ save(command, *Database::db);
}
}
Database::IrcChannelOptions Database::get_irc_channel_options(const std::string& owner, const std::string& server, const std::string& channel)
{
- auto request = Database::irc_channel_options.select();
+ auto request = select(Database::irc_channel_options);
request.where() << Owner{} << "=" << owner <<\
" and " << Server{} << "=" << server <<\
" and " << Channel{} << "=" << channel;
- Database::IrcChannelOptions options{Database::irc_channel_options.get_name()};
auto result = request.execute(*Database::db);
if (result.size() == 1)
- options = result.front();
- else
- {
- options.col<Owner>() = owner;
- options.col<Server>() = server;
- options.col<Channel>() = channel;
- }
+ return result.front();
+ Database::IrcChannelOptions options{Database::irc_channel_options.get_name()};
+ options.col<Owner>() = owner;
+ options.col<Server>() = server;
+ options.col<Channel>() = channel;
return options;
}
@@ -191,7 +186,7 @@ std::string Database::store_muc_message(const std::string& owner, const std::str
line.col<Body>() = body;
line.col<Nick>() = nick;
- line.save(Database::db);
+ save(line, *Database::db);
return uuid;
}
@@ -202,7 +197,7 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
if (limit == 0)
return {};
- auto request = Database::muc_log_lines.select();
+ auto request = select(Database::muc_log_lines);
request.where() << Database::Owner{} << "=" << owner << \
" and " << Database::IrcChanName{} << "=" << chan_name << \
" and " << Database::IrcServerName{} << "=" << server;
@@ -256,7 +251,7 @@ std::vector<Database::MucLogLine> Database::get_muc_logs(const std::string& owne
Database::MucLogLine Database::get_muc_log(const std::string& owner, const std::string& chan_name, const std::string& server,
const std::string& uuid, const std::string& start, const std::string& end)
{
- auto request = Database::muc_log_lines.select();
+ auto request = select(Database::muc_log_lines);
request.where() << Database::Owner{} << "=" << owner << \
" and " << Database::IrcChanName{} << "=" << chan_name << \
" and " << Database::IrcServerName{} << "=" << server << \
@@ -297,7 +292,7 @@ void Database::add_roster_item(const std::string& local, const std::string& remo
roster_item.col<Database::LocalJid>() = local;
roster_item.col<Database::RemoteJid>() = remote;
- roster_item.save(Database::db);
+ save(roster_item, *Database::db);
}
void Database::delete_roster_item(const std::string& local, const std::string& remote)
@@ -311,7 +306,7 @@ void Database::delete_roster_item(const std::string& local, const std::string& r
bool Database::has_roster_item(const std::string& local, const std::string& remote)
{
- auto query = Database::roster.select();
+ auto query = select(Database::roster);
query.where() << Database::LocalJid{} << "=" << local << \
" and " << Database::RemoteJid{} << "=" << remote;
@@ -322,7 +317,7 @@ bool Database::has_roster_item(const std::string& local, const std::string& remo
std::vector<Database::RosterItem> Database::get_contact_list(const std::string& local)
{
- auto query = Database::roster.select();
+ auto query = select(Database::roster);
query.where() << Database::LocalJid{} << "=" << local;
return query.execute(*Database::db);
@@ -330,7 +325,7 @@ std::vector<Database::RosterItem> Database::get_contact_list(const std::string&
std::vector<Database::RosterItem> Database::get_full_roster()
{
- auto query = Database::roster.select();
+ auto query = select(Database::roster);
return query.execute(*Database::db);
}
diff --git a/src/database/insert_query.cpp b/src/database/insert_query.cpp
new file mode 100644
index 0000000..f72d67f
--- /dev/null
+++ b/src/database/insert_query.cpp
@@ -0,0 +1,21 @@
+#include <database/insert_query.hpp>
+
+template <>
+std::string before_value<Database::Date>()
+{
+ if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
+ return "julianday(";
+ if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
+ return "to_timestamp(";
+ return {};
+}
+
+template <>
+std::string after_value<Database::Date>()
+{
+ if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
+ return ", \"unixepoch\")";
+ if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
+ return ")";
+ return {};
+}
diff --git a/src/database/insert_query.hpp b/src/database/insert_query.hpp
index e3a7e83..cd1942f 100644
--- a/src/database/insert_query.hpp
+++ b/src/database/insert_query.hpp
@@ -1,10 +1,15 @@
#pragma once
#include <database/statement.hpp>
+#include <database/database.hpp>
#include <database/column.hpp>
#include <database/query.hpp>
+#include <database/row.hpp>
+
#include <logger/logger.hpp>
+#include <utils/is_one_of.hpp>
+
#include <type_traits>
#include <vector>
#include <string>
@@ -37,6 +42,12 @@ std::string after_value()
return {};
}
+template <>
+std::string before_value<Database::Date>();
+
+template <>
+std::string after_value<Database::Date>();
+
struct InsertQuery: public Query
{
template <typename... T>
@@ -141,3 +152,13 @@ struct InsertQuery: public Query
insert_col_name(const std::tuple<T...>&)
{}
};
+
+template <typename... T>
+void insert(Row<T...>& row, DatabaseEngine& db)
+{
+ InsertQuery query(row.table_name, row.columns);
+ // Ugly workaround for non portable stuff
+ if (is_one_of<Id, T...>)
+ query.body += db.get_returning_id_sql_string(Id::name);
+ query.execute(db, row.columns);
+}
diff --git a/src/database/row.hpp b/src/database/row.hpp
index 3703ff7..27caf43 100644
--- a/src/database/row.hpp
+++ b/src/database/row.hpp
@@ -1,9 +1,5 @@
#pragma once
-#include <database/insert_query.hpp>
-#include <database/update_query.hpp>
-#include <logger/logger.hpp>
-
#include <utils/is_one_of.hpp>
#include <type_traits>
@@ -29,52 +25,7 @@ struct Row
return col.value;
}
- template <bool Coucou=true>
- void save(std::unique_ptr<DatabaseEngine>& db, typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
- {
- this->insert(*db);
- }
-
- template <bool Coucou=true>
- void save(std::unique_ptr<DatabaseEngine>& db, typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
- {
- const Id& id = std::get<Id>(this->columns);
- if (id.value == Id::unset_value)
- {
- this->insert(*db);
- if (db->last_inserted_rowid >= 0)
- std::get<Id>(this->columns).value = static_cast<Id::real_type>(db->last_inserted_rowid);
- }
- else
- this->update(*db);
- }
-
- private:
- template <bool Coucou=true>
- void insert(DatabaseEngine& db, typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
- {
- InsertQuery query(this->table_name, this->columns);
- // Ugly workaround for non portable stuff
- query.body += db.get_returning_id_sql_string(Id::name);
- query.execute(db, this->columns);
- }
-
- template <bool Coucou=true>
- void insert(DatabaseEngine& db, typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
- {
- InsertQuery query(this->table_name, this->columns);
- query.execute(db, this->columns);
- }
-
- void update(DatabaseEngine& db)
- {
- UpdateQuery query(this->table_name, this->columns);
-
- query.execute(db, this->columns);
- }
-
public:
std::tuple<T...> columns;
std::string table_name;
-
};
diff --git a/src/database/save.hpp b/src/database/save.hpp
new file mode 100644
index 0000000..4362110
--- /dev/null
+++ b/src/database/save.hpp
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <database/update_query.hpp>
+#include <database/insert_query.hpp>
+
+#include <database/engine.hpp>
+
+#include <database/row.hpp>
+
+#include <utils/is_one_of.hpp>
+
+template <typename... T, bool Coucou=true>
+void save(Row<T...>& row, DatabaseEngine& db, typename std::enable_if<!is_one_of<Id, T...> && Coucou>::type* = nullptr)
+{
+ insert(row, db);
+}
+
+template <typename... T, bool Coucou=true>
+void save(Row<T...>& row, DatabaseEngine& db, typename std::enable_if<is_one_of<Id, T...> && Coucou>::type* = nullptr)
+{
+ const Id& id = std::get<Id>(row.columns);
+ if (id.value == Id::unset_value)
+ {
+ insert(row, db);
+ if (db.last_inserted_rowid >= 0)
+ std::get<Id>(row.columns).value = static_cast<Id::real_type>(db.last_inserted_rowid);
+ }
+ else
+ update(row, db);
+}
+
diff --git a/src/database/select_query.cpp b/src/database/select_query.cpp
new file mode 100644
index 0000000..970b06c
--- /dev/null
+++ b/src/database/select_query.cpp
@@ -0,0 +1,21 @@
+#include <database/select_query.hpp>
+
+template <>
+std::string before_column<Database::Date>()
+{
+ if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
+ return "strftime(\"%Y-%m-%dT%H:%M:%SZ\", ";
+ else if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
+ return "to_char(";
+ return {};
+}
+
+template <>
+std::string after_column<Database::Date>()
+{
+ if (Database::engine_type() == DatabaseEngine::EngineType::Sqlite3)
+ return ")";
+ else if (Database::engine_type() == DatabaseEngine::EngineType::Postgresql)
+ return R"(, 'YYYY-MM-DD"T"HH24:MM:SS"Z"'))";
+ return {};
+}
diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp
index 3013dd8..0de4fe5 100644
--- a/src/database/select_query.hpp
+++ b/src/database/select_query.hpp
@@ -2,6 +2,8 @@
#include <database/engine.hpp>
+#include <database/table.hpp>
+#include <database/database.hpp>
#include <database/statement.hpp>
#include <utils/datetime.hpp>
#include <database/query.hpp>
@@ -78,6 +80,12 @@ std::string after_column()
return {};
}
+template <>
+std::string before_column<Database::Date>();
+
+template <>
+std::string after_column<Database::Date>();
+
template <typename... T>
struct SelectQuery: public Query
{
@@ -153,3 +161,9 @@ struct SelectQuery: public Query
const std::string table_name;
};
+template <typename... T>
+auto select(const Table<T...> table)
+{
+ SelectQuery<T...> query(table.name);
+ return query;
+}
diff --git a/src/database/sqlite3_engine.cpp b/src/database/sqlite3_engine.cpp
index 1fa6316..b6ac1a1 100644
--- a/src/database/sqlite3_engine.cpp
+++ b/src/database/sqlite3_engine.cpp
@@ -3,6 +3,7 @@
#ifdef SQLITE3_FOUND
#include <database/database.hpp>
+#include <database/select_query.hpp>
#include <database/sqlite3_engine.hpp>
#include <database/sqlite3_statement.hpp>
diff --git a/src/database/table.hpp b/src/database/table.hpp
index 31b92a7..4c96151 100644
--- a/src/database/table.hpp
+++ b/src/database/table.hpp
@@ -2,7 +2,6 @@
#include <database/engine.hpp>
-#include <database/select_query.hpp>
#include <database/delete_query.hpp>
#include <database/row.hpp>
@@ -82,12 +81,6 @@ class Table
return {this->name};
}
- auto select()
- {
- SelectQuery<T...> select(this->name);
- return select;
- }
-
auto del()
{
DeleteQuery query(this->name);
@@ -99,6 +92,8 @@ class Table
return this->name;
}
+ const std::string name;
+
private:
template <std::size_t N=0>
@@ -133,5 +128,4 @@ class Table
add_column_create(DatabaseEngine&, std::string&)
{ }
- const std::string name;
};
diff --git a/src/database/update_query.hpp b/src/database/update_query.hpp
index a29ac3f..c2b819d 100644
--- a/src/database/update_query.hpp
+++ b/src/database/update_query.hpp
@@ -1,7 +1,8 @@
#pragma once
-#include <database/query.hpp>
#include <database/engine.hpp>
+#include <database/query.hpp>
+#include <database/row.hpp>
using namespace std::string_literals;
@@ -102,3 +103,11 @@ struct UpdateQuery: public Query
actual_bind(statement, value.value, sizeof...(T));
}
};
+
+template <typename... T>
+void update(Row<T...>& row, DatabaseEngine& db)
+{
+ UpdateQuery query(row.table_name, row.columns);
+
+ query.execute(db, row.columns);
+}
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index 93732ba..82a1cbf 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -14,6 +14,7 @@
#ifdef USE_DATABASE
#include <database/database.hpp>
+#include <database/save.hpp>
#endif
#ifndef HAS_PUT_TIME
@@ -196,7 +197,7 @@ void ConfigureGlobalStep2(XmppComponent& xmpp_component, AdhocSession& session,
options.col<Database::GlobalPersistent>() = to_bool(value->get_inner());
}
- options.save(Database::db);
+ save(options, *Database::db);
command_node.delete_all_children();
XmlSubNode note(command_node, "note");
@@ -476,7 +477,7 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
}
Database::invalidate_encoding_in_cache();
- options.save(Database::db);
+ save(options, *Database::db);
Database::set_after_connection_commands(options, commands);
command_node.delete_all_children();
@@ -646,7 +647,7 @@ bool handle_irc_channel_configuration_form(XmppComponent& xmpp_component, const
}
Database::invalidate_encoding_in_cache(requester.bare(), iid.get_server(), iid.get_local());
- options.save(Database::db);
+ save(options, *Database::db);
}
return true;
}
diff --git a/tests/database.cpp b/tests/database.cpp
index c9b8dc7..15c117b 100644
--- a/tests/database.cpp
+++ b/tests/database.cpp
@@ -7,6 +7,7 @@
#include <cstdlib>
#include <database/database.hpp>
+#include <database/save.hpp>
#include <config/config.hpp>
@@ -28,11 +29,11 @@ TEST_CASE("Database")
{
auto o = Database::get_irc_server_options("zouzou@example.com", "irc.example.com");
CHECK(Database::count(Database::irc_server_options) == 0);
- o.save(Database::db);
+ save(o, *Database::db);
CHECK(Database::count(Database::irc_server_options) == 1);
o.col<Database::Realname>() = "Different realname";
CHECK(o.col<Database::Realname>() == "Different realname");
- o.save(Database::db);
+ save(o, *Database::db);
CHECK(o.col<Database::Realname>() == "Different realname");
CHECK(Database::count(Database::irc_server_options) == 1);
@@ -44,7 +45,7 @@ TEST_CASE("Database")
// inserted
CHECK(1 == Database::count(Database::irc_server_options));
- b.save(Database::db);
+ save(b, *Database::db);
CHECK(2 == Database::count(Database::irc_server_options));
CHECK(b.col<Database::Pass>() == "");
@@ -58,7 +59,7 @@ TEST_CASE("Database")
o.col<Database::EncodingIn>() = "ISO-8859-1";
CHECK(o.col<Database::RecordHistoryOptional>().is_set == false);
o.col<Database::RecordHistoryOptional>().set_value(false);
- o.save(Database::db);
+ save(o, *Database::db);
auto b = Database::get_irc_channel_options("zouzou@example.com", "irc.example.com", "#foo");
CHECK(o.col<Database::EncodingIn>() == "ISO-8859-1");
CHECK(o.col<Database::RecordHistoryOptional>().is_set == true);
@@ -77,7 +78,7 @@ TEST_CASE("Database")
GIVEN("An option defined for the channel but not the server")
{
c.col<Database::EncodingIn>() = "channelEncoding";
- c.save(Database::db);
+ save(c, *Database::db);
WHEN("we fetch that option")
{
auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
@@ -88,7 +89,7 @@ TEST_CASE("Database")
GIVEN("An option defined for the server but not the channel")
{
s.col<Database::EncodingIn>() = "serverEncoding";
- s.save(Database::db);
+ save(s, *Database::db);
WHEN("we fetch that option")
{
auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
@@ -99,9 +100,9 @@ TEST_CASE("Database")
GIVEN("An option defined for both the server and the channel")
{
s.col<Database::EncodingIn>() = "serverEncoding";
- s.save(Database::db);
+ save(s, *Database::db);
c.col<Database::EncodingIn>() = "channelEncoding";
- c.save(Database::db);
+ save(c, *Database::db);
WHEN("we fetch that option")
{
auto r = Database::get_irc_channel_options_with_server_default(owner, server, chan1);
@@ -129,8 +130,8 @@ TEST_CASE("Database")
auto after_connection_commands = Database::get_after_connection_commands(soptions);
CHECK(after_connection_commands.empty());
- soptions.save(Database::db);
- soptions2.save(Database::db);
+ save(soptions, *Database::db);
+ save(soptions2, *Database::db);
auto com = Database::after_connection_commands.row();
com.col<Database::AfterConnectionCommand>() = "first";
after_connection_commands.push_back(com);