libtransport.git Changeset - 5855e6608cdc

Changeset - 5855e6608cdc

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Jan Kaluza - 14 years ago 2011-04-07 14:51:34
hanzz.k@gmail.com

begin/commit transaction, update buddy statement

2 files changed with 26 insertions and 5 deletions:

include/transport/sqlite3backend.h

src/sqlite3backend.cpp

0 comments (0 inline, 0 general)

include/transport/sqlite3backend.h

➞

Show inline comments

@@ @@ -78,17 +78,17 @@ class SQLite3Backend : public StorageBackend @@
 		/// \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);
-		void updateBuddy(long userId, const BuddyInfo &buddyInfo) {}
+		void updateBuddy(long userId, const BuddyInfo &buddyInfo);
 		void removeBuddy(long id) {}
 		void beginTransaction() {}
 		void commitTransaction() {}
 		void beginTransaction();
 		void commitTransaction();
 	private:
 		bool exec(const std::string &query);
 		sqlite3 *m_db;
 		Config *m_config;
@@ @@ -99,9 +99,10 @@ class SQLite3Backend : public StorageBackend @@
 		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;
 };
+}

src/sqlite3backend.cpp

➞

Show inline comments

@@ @@ -91,12 +91,13 @@ bool SQLite3Backend::connect() { @@
 	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=?");
 	return true;
+}
 bool SQLite3Backend::createDatabase() {
 	int not_exist = exec("CREATE TABLE " + m_prefix + "buddies ("
 	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);
+}
 void SQLite3Backend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
 // 	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) {
 	return true;
+}
 bool SQLite3Backend::removeUser(long id) {
 	sqlite3_reset(m_removeUser);
@@ @@ -260,7 +272,15 @@ bool SQLite3Backend::removeUser(long id) { @@
 		return false;
+	}
 	return true;
+}
 void SQLite3Backend::beginTransaction() {
 	exec("BEGIN TRANSACTION;");
+}
 void SQLite3Backend::commitTransaction() {
 	exec("COMMIT TRANSACTION;");
+}
+}

0 comments (0 inline, 0 general)