libtransport.git Changeset - e58ede7d51dc

Changeset - e58ede7d51dc

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 15 years ago 2011-04-10 20:22:21
hanzz.k@gmail.com

getBuddies sqlite statement

4 files changed with 37 insertions and 10 deletions:

include/transport/sqlite3backend.h

include/transport/storagebackend.h

src/sqlite3backend.cpp

src/userregistration.cpp

0 comments (0 inline, 0 general)

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ class SQLite3Backend : public StorageBackend @@
 		/// \param online online state
 		void setUserOnline(long id, bool online);
 		/// 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);
+		bool getBuddies(long id, std::list<BuddyInfo> &roster);
 		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);
@@ @@ -94,15 +94,16 @@ class SQLite3Backend : public StorageBackend @@
 		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;
 		sqlite3_stmt *m_updateBuddy;
 		sqlite3_stmt *m_getBuddies;
 };
+}

include/transport/storagebackend.h

➞

Show inline comments

@@ @@ -62,25 +62,25 @@ class StorageBackend @@
 		virtual void setUser(const UserInfo &user) = 0;
 		/// getuser
 		virtual bool getUser(const std::string &barejid, UserInfo &user) = 0;
 		/// setUserOnline
 		virtual void setUserOnline(long id, bool online) = 0;
 		/// removeUser
 		virtual bool removeUser(long id) = 0;
 		/// getBuddies
-		virtual bool getBuddies(long id, std::list<std::string> &roster) = 0;
+		virtual bool getBuddies(long id, std::list<BuddyInfo> &roster) = 0;
 		virtual long addBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void updateBuddy(long userId, const BuddyInfo &buddyInfo) = 0;
 		virtual void removeBuddy(long id) = 0;
 		virtual void beginTransaction() = 0;
 		virtual void commitTransaction() = 0;
 		/// onStorageError
 		boost::signal<void (const std::string &statement, const std::string &error)> onStorageError;
 };

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -33,28 +33,32 @@ @@
 	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);
 							int STATEMENT##_id = 1;\
 							int STATEMENT##_id_get = -1;\
 							(void)STATEMENT##_id_get;
 #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 GET_INT(STATEMENT)	sqlite3_column_int(STATEMENT, STATEMENT##_id_get++)
 #define GET_STR(STATEMENT)	(const char *) sqlite3_column_text(STATEMENT, STATEMENT##_id_get++)
 #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");
@@ @@ -86,24 +90,25 @@ bool SQLite3Backend::connect() { @@
 		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 (?, ?, ?, ?, ?, ?)");
 	PREP_STMT(m_updateBuddy, "UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?");
 	PREP_STMT(m_getBuddies, "SELECT id uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC");
 	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,"
 // 	UPDATE " + m_prefix + "buddies SET groups=?, nickname=?, flags=?, subscription=? WHERE user_id=? AND uin=?
 	BEGIN(m_updateBuddy);
 	BIND_STR(m_updateBuddy, buddyInfo.groups[0]); // TODO: serialize groups
 	BIND_STR(m_updateBuddy, buddyInfo.alias);
 	BIND_INT(m_updateBuddy, buddyInfo.flags);
 	BIND_STR(m_updateBuddy, buddyInfo.subscription);
 	BIND_INT(m_updateBuddy, userId);
 	BIND_STR(m_updateBuddy, buddyInfo.legacyName);
 	EXECUTE_STATEMENT(m_updateBuddy, "updateBuddy query");
+}
 bool SQLite3Backend::getBuddies(long id, std::list<std::string> &roster) {
 bool SQLite3Backend::getBuddies(long id, std::list<BuddyInfo> &roster) {
 // 	"SELECT id, user_id, uin, subscription, nickname, groups, flags FROM " + m_prefix + "buddies WHERE user_id=? ORDER BY id ASC"
 	BEGIN(m_getBuddies);
 	BIND_INT(m_getBuddies, id);
 	int ret;
 	while((ret = sqlite3_step(m_getUser)) == SQLITE_ROW) {
 		BuddyInfo b;
 		b.id = GET_INT(m_getBuddies);
 		b.legacyName = GET_STR(m_getBuddies);
 		b.subscription = GET_STR(m_getBuddies);
 		b.alias = GET_STR(m_getBuddies);
 		b.groups.push_back(GET_STR(m_getBuddies));
 		b.flags = GET_INT(m_getBuddies);
 		roster.push_back(b);
+	}
 	if (ret != SQLITE_DONE) {
 		onStorageError("getBuddies query", (sqlite3_errmsg(m_db) == NULL ? "" : sqlite3_errmsg(m_db)));
 		return false;
+	}
 	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;
+	}
 	sqlite3_reset(m_removeUserSettings);

src/userregistration.cpp

➞

Show inline comments

 	bool registered = m_storageBackend->getUser(barejid, userInfo);
 	// This user is not registered
 	if (!registered)
 		return false;
 	onUserUnregistered(userInfo);
 	Swift::Presence::ref response;
 	User *user = m_userManager->getUser(barejid);
 	// roster contains already escaped jids
-	std::list <std::string> roster;
+	std::list <BuddyInfo> roster;
 	m_storageBackend->getBuddies(userInfo.id, roster);
 	for(std::list<std::string>::iterator u = roster.begin(); u != roster.end() ; u++){
 		std::string name = *u;
 	for(std::list<BuddyInfo>::iterator u = roster.begin(); u != roster.end() ; u++){
 		std::string name = (*u).legacyName;
 		response = Swift::Presence::create();
 		response->setTo(Swift::JID(barejid));
 		response->setFrom(Swift::JID(name + "@" + m_component->getJID().toString()));
 		response->setType(Swift::Presence::Unsubscribe);
 		m_component->m_component->sendPresence(response);
 		response = Swift::Presence::create();
 		response->setTo(Swift::JID(barejid));
 		response->setFrom(Swift::JID(name + "@" + m_component->getJID().toString()));
 		response->setType(Swift::Presence::Unsubscribed);
 		m_component->m_component->sendPresence(response);

0 comments (0 inline, 0 general)