libtransport.git Changeset - ebebf04f69f1

Changeset - ebebf04f69f1

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 15 years ago 2011-04-07 14:21:42
hanzz.k@gmail.com

SQLite3Backend::addBuddy

3 files changed with 36 insertions and 1 deletions:

include/transport/sqlite3backend.h

src/rostermanager.cpp

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -70,36 +70,38 @@ class SQLite3Backend : public StorageBackend @@
 		/// Removes user and all connected data from database.
 		/// \param id id of user - UserInfo.id
 		/// \return true if user has been found in database and removed
 		bool removeUser(long id);
 		/// Returns JIDs of all buddies in user's roster.
 		/// \param id id of user - UserInfo.id
 		/// \param roster string list used to store user's roster
 		/// \return true if user has been found in database and roster has been fetched
 		bool getBuddies(long id, std::list<std::string> &roster);
 		long addBuddy(long userId, const BuddyInfo &buddyInfo) { return 0; }
 		long addBuddy(long userId, const BuddyInfo &buddyInfo);
 		void updateBuddy(long userId, const BuddyInfo &buddyInfo) {}
 		void removeBuddy(long id) {}
 		void beginTransaction() {}
 		void commitTransaction() {}
 	private:
 		bool exec(const std::string &query);
 		sqlite3 *m_db;
 		Config *m_config;
 		std::string m_prefix;
 		// statements
 		sqlite3_stmt *m_setUser;
 		sqlite3_stmt *m_getUser;
 		sqlite3_stmt *m_removeUser;
 		sqlite3_stmt *m_removeUserBuddies;
 		sqlite3_stmt *m_removeUserSettings;
 		sqlite3_stmt *m_removeUserBuddiesSettings;
 		sqlite3_stmt *m_addBuddy;
 };
+}

src/rostermanager.cpp

➞

Show inline comments

@@ @@ -79,24 +79,27 @@ void RosterManager::setBuddyCallback(Buddy *buddy) { @@
 		sendBuddyRosterPush(buddy);
+	}
 	else {
+	}
 	if (m_setBuddyTimer->onTick.empty()) {
 		m_setBuddyTimer->stop();
 		if (true /*&& rie_is_supported*/) {
 			m_RIETimer->start();
+		}
+	}
 	if (m_rosterStorage)
 		m_rosterStorage->storeBuddy(buddy);
+}
 void RosterManager::unsetBuddy(Buddy *buddy) {
 	m_buddies.erase(buddy->getName());
 	if (m_rosterStorage)
 		m_rosterStorage->removeBuddyFromQueue(buddy);
 	onBuddyUnset(buddy);
+}
 void RosterManager::handleBuddyRosterPushResponse(Swift::ErrorPayload::ref error, const std::string &key) {
 	if (m_buddies[key] != NULL) {
 		m_buddies[key]->buddyChanged();

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -31,24 +31,33 @@ @@
 // Prepare the SQL statement
 #define PREP_STMT(sql, str) \
 	if(sqlite3_prepare_v2(m_db, std::string(str).c_str(), -1, &sql, NULL)) { \
 		onStorageError(str, (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db))); \
 		return false; \
+	}
 // Finalize the prepared statement
 #define FINALIZE_STMT(prep) \
 	if(prep != NULL) { \
 		sqlite3_finalize(prep); \
+	}
 #define BEGIN(STATEMENT) 	sqlite3_reset(m_addBuddy);\
 							int STATEMENT##_id = 1;
 #define BIND_INT(STATEMENT, VARIABLE) sqlite3_bind_int(STATEMENT, STATEMENT##_id++, VARIABLE);
 #define BIND_STR(STATEMENT, VARIABLE) sqlite3_bind_text(STATEMENT, STATEMENT##_id++, VARIABLE.c_str(), -1, SQLITE_STATIC);
 #define EXECUTE_STATEMENT(STATEMENT, NAME) 	if(sqlite3_step(STATEMENT) != SQLITE_DONE) {\
 		onStorageError(NAME, (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));\
+			}
 using namespace boost;
 namespace Transport {
 SQLite3Backend::SQLite3Backend(Config *config) {
 	m_config = config;
 	m_db = NULL;
 	m_prefix = CONFIG_STRING(m_config, "database.prefix");
+}
 SQLite3Backend::~SQLite3Backend(){
@@ @@ -75,24 +84,26 @@ bool SQLite3Backend::connect() { @@
 	if (createDatabase() == false)
 		return false;
 	PREP_STMT(m_setUser, "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, DATETIME('NOW'), ?)");
 	PREP_STMT(m_getUser, "SELECT id, jid, uin, password, encoding, language, vip FROM " + m_prefix + "users WHERE jid=?");
 	PREP_STMT(m_removeUser, "DELETE FROM " + m_prefix + "users WHERE id=?");
 	PREP_STMT(m_removeUserBuddies, "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	PREP_STMT(m_removeUserSettings, "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	PREP_STMT(m_removeUserBuddiesSettings, "DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=?");
 	PREP_STMT(m_addBuddy, "INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
 				"  id INTEGER PRIMARY KEY NOT NULL,"
 				"  user_id int(10) NOT NULL,"
 				"  uin varchar(255) NOT NULL,"
 				"  subscription varchar(20) NOT NULL,"
 				"  nickname varchar(255) NOT NULL,"
 				"  groups varchar(255) NOT NULL,"
 				"  flags int(4) NOT NULL DEFAULT '0'"
 	if (ret != SQLITE_DONE) {
 		onStorageError("getUser query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
+	}
 	return false;
+}
 void SQLite3Backend::setUserOnline(long id, bool online) {
+}
 long SQLite3Backend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	BEGIN(m_addBuddy);
 	BIND_INT(m_addBuddy, userId);
 	BIND_STR(m_addBuddy, buddyInfo.legacyName);
 	BIND_STR(m_addBuddy, buddyInfo.subscription);
 	BIND_STR(m_addBuddy, buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_addBuddy, buddyInfo.alias);
 	BIND_INT(m_addBuddy, buddyInfo.flags);
 	EXECUTE_STATEMENT(m_addBuddy, "addBuddy query");
 	if(sqlite3_step(m_addBuddy) != SQLITE_DONE) {
 		onStorageError("addBuddy query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return -1;
+	}
 	return (long) sqlite3_last_insert_rowid(m_db);
+}
 bool SQLite3Backend::getBuddies(long id, std::list<std::string> &roster) {
 	return true;
+}
 bool SQLite3Backend::removeUser(long id) {
 	sqlite3_reset(m_removeUser);
 	sqlite3_bind_int(m_removeUser, 1, id);
 	if(sqlite3_step(m_removeUser) != SQLITE_DONE) {
 		onStorageError("removeUser query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return false;
+	}

0 comments (0 inline, 0 general)