libtransport.git Changeset - 3d2aa79ccbaa

Changeset - 3d2aa79ccbaa

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-08-13 17:26:56
hanzz.k@gmail.com

mysql removeUser

4 files changed with 68 insertions and 35 deletions:

include/transport/mysqlbackend.h

include/transport/storagebackend.h

spectrum/src/main.cpp

src/mysqlbackend.cpp

0 comments (0 inline, 0 general)

include/transport/mysqlbackend.h

➞

Show inline comments

@@ @@ -97,13 +97,13 @@ class MySQLBackend : public StorageBackend @@
 			public:
 				Statement(MYSQL *conn, const std::string &format, const std::string &statement);
 				~Statement();
 				bool execute();
-				bool fetch();
+				int fetch();
 				// Pushes new data used as input for the statement.
 				template <typename T>
 				Statement& operator << (const T& t);
 				Statement& operator << (const std::string& str);
@@ @@ -132,18 +132,18 @@ class MySQLBackend : public StorageBackend @@
 // 		MYSQL_STMT *m_setUser;
 		Statement *m_setUser;
 		Statement *m_getUser;
 		MYSQL_STMT *m_getUserSetting;
 		MYSQL_STMT *m_setUserSetting;
 		MYSQL_STMT *m_updateUserSetting;
 		MYSQL_STMT *m_removeUser;
 		MYSQL_STMT *m_removeUserBuddies;
 		MYSQL_STMT *m_removeUserSettings;
 		MYSQL_STMT *m_removeUserBuddiesSettings;
 		MYSQL_STMT *m_addBuddy;
 		Statement *m_removeUser;
 		Statement *m_removeUserBuddies;
 		Statement *m_removeUserSettings;
 		Statement *m_removeUserBuddiesSettings;
 		Statement *m_addBuddy;
 		MYSQL_STMT *m_updateBuddy;
-		MYSQL_STMT *m_updateBuddySetting;
+		Statement *m_updateBuddySetting;
 		MYSQL_STMT *m_getBuddies;
 		MYSQL_STMT *m_getBuddiesSettings;
 };
+}

include/transport/storagebackend.h

➞

Show inline comments

@@ @@ -24,13 +24,13 @@ @@
 #include <map>
 namespace Transport {
 /// Represents all data needed to be stored in database.
 struct UserInfo {
-	long id;				///< id of user used as primary key in database
+	int id;				///< id of user used as primary key in database
 	std::string jid;		///< barejid of XMPP user
 	std::string uin;		///< legacy network username
 	std::string password;	///< password for legacy network
 	std::string language;	///< user's preferred language
 	std::string encoding;	///< user's preferred encoding
 	bool vip;				///< true if user is VIP

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -83,18 +83,20 @@ int main(int argc, char **argv) @@
 	StorageBackend *storageBackend = NULL;
 	if (CONFIG_STRING(&config, "database.type") == "sqlite3") {
 		storageBackend = new SQLite3Backend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
 	else if (CONFIG_STRING(&config, "database.type") == "mysql") {
 		storageBackend = new MySQLBackend(&config);
 		if (!storageBackend->connect()) {
 			std::cerr << "Can't connect to database.\n";
 			return -1;
+		}
+	}
 	UserManager userManager(&transport, &userRegistry, storageBackend);
 	UserRegistration *userRegistration = NULL;
 	if (storageBackend) {

src/mysqlbackend.cpp

➞

Show inline comments

 				break;
 			case 'i':
 				m_params.resize(m_params.size() + 1);
 				memset(&m_params.back(), 0, sizeof(MYSQL_BIND));
 				m_params.back().buffer_type= MYSQL_TYPE_LONG;
-				m_params.back().buffer= (unsigned long *) malloc(sizeof(unsigned long));
+				m_params.back().buffer= (int *) malloc(sizeof(int));
 				m_params.back().is_null= 0;
 				m_params.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				break;
 			case 'b':
 				m_params.resize(m_params.size() + 1);
 				memset(&m_params.back(), 0, sizeof(MYSQL_BIND));
 			case '|':
 				m_resultOffset = i;
 				break;
+		}
+	}
 	for (int i = m_resultOffset; i < format.length(); i++) {
+	for (int i = m_resultOffset; i >= 0 && i < format.length(); i++) {
 		switch (format.at(i)) {
 			case 's':
 				m_results.resize(m_results.size() + 1);
 				memset(&m_results.back(), 0, sizeof(MYSQL_BIND));
 				m_results.back().buffer_type= MYSQL_TYPE_STRING;
 				break;
 			case 'i':
 				m_results.resize(m_results.size() + 1);
 				memset(&m_results.back(), 0, sizeof(MYSQL_BIND));
 				m_results.back().buffer_type= MYSQL_TYPE_LONG;
-				m_results.back().buffer= (unsigned long *) malloc(sizeof(unsigned long));
+				m_results.back().buffer= (int *) malloc(sizeof(int));
 				m_results.back().is_null= 0;
 				m_results.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				break;
 			case 'b':
 				m_results.resize(m_results.size() + 1);
 				memset(&m_results.back(), 0, sizeof(MYSQL_BIND));
@@ @@ -182,35 +182,34 @@ MySQLBackend::Statement::~Statement() { @@
 	FINALIZE_STMT(m_stmt);
+}
 bool MySQLBackend::Statement::execute() {
 	// If statement has some input and doesn't have any output, we have
 	// to clear the offset now, because operator>> will not be called.
 	if (m_resultOffset != 0 && m_offset + 1 == m_params.size()) {
 		m_offset = 0;
+	}
 	m_offset = 0;
 	m_resultOffset = 0;
 	if (mysql_stmt_execute(m_stmt)) {
 		LOG4CXX_ERROR(logger, m_string << " " << mysql_error(m_conn));
 		return false;
+	}
 	return true;
+}
-bool MySQLBackend::Statement::fetch() {
+int MySQLBackend::Statement::fetch() {
 	return mysql_stmt_fetch(m_stmt);
+}
 template <typename T>
 MySQLBackend::Statement& MySQLBackend::Statement::operator << (const T& t) {
 	if (m_offset >= m_params.size())
 		return *this;
 	T *data = (T *) m_params[m_offset].buffer;
 	*data = t;
 	int *data = (int *) m_params[m_offset].buffer;
 	*data = (int) t;
 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << t);
+	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << (int) t);
 	m_offset++;
 	return *this;
+}
 MySQLBackend::Statement& MySQLBackend::Statement::operator << (const std::string& str) {
 	if (m_offset >= m_params.size())
 	if (m_resultOffset > m_results.size())
 		return *this;
 	if (!m_results[m_resultOffset].is_null) {
 		T *data = (T *) m_results[m_resultOffset].buffer;
 		t = *data;
 		std::cout << "getting " << m_resultOffset << " " << (int) t << "\n";
+	}
 	if (++m_resultOffset == m_results.size())
 		m_resultOffset = 0;
 	return *this;
+}
 MySQLBackend::Statement& MySQLBackend::Statement::operator >> (std::string& t) {
-	std::cout << "getting " << m_offset << " " << m_resultOffset << "\n";
 	std::cout << "getting " << m_resultOffset << "\n";
 	if (m_resultOffset > m_results.size())
 		return *this;
 	if (!m_results[m_resultOffset].is_null) {
 		t = (char *) m_results[m_resultOffset].buffer;
+	}
@@ @@ -258,24 +258,24 @@ MySQLBackend::MySQLBackend(Config *config) { @@
+}
 MySQLBackend::~MySQLBackend(){
 // 	FINALIZE_STMT(m_setUser);
 	delete m_setUser;
 	delete m_getUser;
 	FINALIZE_STMT(m_removeUser);
 	FINALIZE_STMT(m_removeUserBuddies);
 	FINALIZE_STMT(m_removeUserSettings);
 	FINALIZE_STMT(m_removeUserBuddiesSettings);
 	FINALIZE_STMT(m_addBuddy);
 	delete m_removeUser;
 	delete m_removeUserBuddies;
 	delete m_removeUserSettings;
 	delete m_removeUserBuddiesSettings;
 	delete m_addBuddy;
 	FINALIZE_STMT(m_updateBuddy);
 	FINALIZE_STMT(m_getBuddies);
 	FINALIZE_STMT(m_getBuddiesSettings);
 	FINALIZE_STMT(m_getUserSetting);
 	FINALIZE_STMT(m_setUserSetting);
 	FINALIZE_STMT(m_updateUserSetting);
-	FINALIZE_STMT(m_updateBuddySetting);
+	delete m_updateBuddySetting;
 	mysql_close(&m_conn);
+}
 bool MySQLBackend::connect() {
 	LOG4CXX_INFO(logger, "Connecting MySQL server " << CONFIG_STRING(m_config, "database.server") << ", user " <<
 		CONFIG_STRING(m_config, "database.user") << ", database " << CONFIG_STRING(m_config, "database.database") <<
@@ @@ -293,22 +293,22 @@ bool MySQLBackend::connect() { @@
 	createDatabase();
 	m_setUser = new Statement(&m_conn, "sssssb", "INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES (?, ?, ?, ?, ?, NOW(), ?)");
 	m_getUser = new Statement(&m_conn, "s|isssssb", "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=?");
 	m_removeUser = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "users WHERE id=?");
 	m_removeUserBuddies = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "buddies WHERE user_id=?");
 	m_removeUserSettings = new Statement(&m_conn, "i", "DELETE FROM " + m_prefix + "users_settings WHERE user_id=?");
 	m_removeUserBuddiesSettings = new Statement(&m_conn, "i", "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 (?, ?, ?, ?, ?, ?)");
+	m_addBuddy = new Statement(&m_conn, "issssi", "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");
 	PREP_STMT(m_getBuddiesSettings, "SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=? ORDER BY buddy_id ASC");
-	PREP_STMT(m_updateBuddySetting, "INSERT INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE value=?");
+	m_updateBuddySetting = new Statement(&m_conn, "iisiss", "INSERT INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE value=?");
 	PREP_STMT(m_getUserSetting, "SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=? AND var=?");
 	PREP_STMT(m_setUserSetting, "INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES (?,?,?,?)");
 	PREP_STMT(m_updateUserSetting, "UPDATE " + m_prefix + "users_settings SET value=? WHERE user_id=? AND var=?");
 	return true;
@@ @@ -383,40 +383,71 @@ bool MySQLBackend::exec(const std::string &query) { @@
 void MySQLBackend::setUser(const UserInfo &user) {
 	*m_setUser << user.jid << user.uin << user.password << user.language << user.encoding << user.vip;
 	m_setUser->execute();
+}
 bool MySQLBackend::getUser(const std::string &barejid, UserInfo &user) {
 	user.id = -1;
 	*m_getUser << barejid;
 	if (!m_getUser->execute())
 		return false;
 	m_getUser->fetch();
 	if (m_getUser->fetch() == MYSQL_NO_DATA)
 		return false;
 	*m_getUser >> user.id >> user.jid >> user.uin >> user.password >> user.encoding >> user.language >> user.vip;
 	std::cout << user.id << " " << user.jid << " " <<  user.uin << " " <<  user.password << " " <<  user.encoding << " " <<  user.language << " " <<  user.vip << "\n";
 	return true;
+}
 void MySQLBackend::setUserOnline(long id, bool online) {
+}
 long MySQLBackend::addBuddy(long userId, const BuddyInfo &buddyInfo) {
 	return 1;
 // 	"INSERT INTO " + m_prefix + "buddies (user_id, uin, subscription, groups, nickname, flags) VALUES (?, ?, ?, ?, ?, ?)"
 	*m_addBuddy << userId << buddyInfo.legacyName << buddyInfo.subscription;
 	*m_addBuddy << (buddyInfo.groups.size() == 0 ? "" : buddyInfo.groups[0]);
 	*m_addBuddy << buddyInfo.alias << buddyInfo.flags;
 	m_addBuddy->execute();
 	long id = (long) mysql_insert_id(&m_conn);
 // 	INSERT OR REPLACE INTO " + m_prefix + "buddies_settings (user_id, buddy_id, var, type, value) VALUES (?, ?, ?, ?, ?)
 	*m_updateBuddySetting << userId << id << buddyInfo.settings.find("icon_hash")->first << (int) TYPE_STRING << buddyInfo.settings.find("icon_hash")->second.s;
 	m_updateBuddySetting->execute();
 	return id;
+}
 void MySQLBackend::updateBuddy(long userId, const BuddyInfo &buddyInfo) {
+}
 bool MySQLBackend::getBuddies(long id, std::list<BuddyInfo> &roster) {
 	return true;
+}
 bool MySQLBackend::removeUser(long id) {
 	*m_removeUser << (int) id;
 	if (!m_removeUser->execute())
 		return false;
 	*m_removeUserSettings << (int) id;
 	if (!m_removeUserSettings->execute())
 		return false;
 	*m_removeUserBuddies << (int) id;
 	if (!m_removeUserBuddies->execute())
 		return false;
 	*m_removeUserBuddiesSettings << (int) id;
 	if (!m_removeUserBuddiesSettings->execute())
 		return false;
 	return true;
+}
 void MySQLBackend::getUserSetting(long id, const std::string &variable, int &type, std::string &value) {
 void MySQLBackend::updateUserSetting(long id, const std::string &variable, const std::string &value) {
+}
 void MySQLBackend::beginTransaction() {
-// 	exec("BEGIN TRANSACTION;");
+	exec("START TRANSACTION;");
+}
 void MySQLBackend::commitTransaction() {
-// 	exec("COMMIT TRANSACTION;");
 	exec("COMMIT;");
+}
+}

0 comments (0 inline, 0 general)