From aba6043b8b90d9744ab56c7f91cd0bee25621581 Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 13 Feb 2018 14:12:20 +0100
Subject: [PATCH] fix(MainDb): remove CHECK_LEGACY_TABLE_EXISTS macro

---
 src/db/main-db.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 00558fb4d..cbb002daf 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -1186,18 +1186,18 @@ void MainDbPrivate::updateSchema () {
 
 // -----------------------------------------------------------------------------
 
-#define CHECK_LEGACY_TABLE_EXISTS(SESSION, NAME) \
-	do { \
-		SESSION << "SELECT name FROM sqlite_master WHERE type='table' AND name='" NAME "'"; \
-		return SESSION.got_data() > 0; \
-	} while (false);
+// NOTE: Legacy supports only sqlite.
+static inline bool checkLegacyTableExists (soci::session &session, const string &name) {
+	session << "SELECT name FROM sqlite_master WHERE type='table' AND name = :name", soci::use(name);
+	return session.got_data() > 0;
+}
 
 static inline bool checkLegacyFriendsTableExists (soci::session &session) {
-	CHECK_LEGACY_TABLE_EXISTS(session, "friends");
+	return checkLegacyTableExists(session, "friends");
 }
 
 static inline bool checkLegacyHistoryTableExists (soci::session &session) {
-	CHECK_LEGACY_TABLE_EXISTS(session, "history");
+	return checkLegacyTableExists(session, "history");
 }
 
 template<typename T>