libtransport.git Changeset - 89602a464810

Changeset - 89602a464810

Parent rev.

Child rev.

[Not reviewed]

Merge

0 1 0

Jan Kaluza - 12 years ago 2013-03-22 10:28:03
hanzz.k@gmail.com

Merge pull request #28 from madsl/master

Fix PostgreSQL backend for spectrum

1 file changed with 5 insertions and 5 deletions:

src/pqxxbackend.cpp

0 comments (0 inline, 0 general)

src/pqxxbackend.cpp

➞

Show inline comments

@@ @@ -96,97 +96,97 @@ bool PQXXBackend::createDatabase() { @@
 				"user_id integer NOT NULL,"
 				"buddy_id integer NOT NULL,"
 				"var varchar(50) NOT NULL,"
 				"type smallint NOT NULL,"
 				"value varchar(255) NOT NULL,"
 				"PRIMARY KEY (buddy_id,var)"
 			");");
 		exec("CREATE TYPE Subscription AS ENUM ('to','from','both','ask','none');");
 		exec("CREATE TABLE " + m_prefix + "buddies ("
 							"id SERIAL,"
 							"user_id integer NOT NULL,"
 							"uin varchar(255) NOT NULL,"
 							"subscription Subscription NOT NULL,"
 							"nickname varchar(255) NOT NULL,"
 							"groups varchar(255) NOT NULL,"
 							"flags smallint NOT NULL DEFAULT '0',"
 							"PRIMARY KEY (id),"
 							"UNIQUE (user_id,uin)"
 						");");
 		exec("CREATE TABLE " + m_prefix + "users ("
 				"id SERIAL,"
 				"jid varchar(255) NOT NULL,"
 				"uin varchar(4095) NOT NULL,"
 				"password varchar(255) NOT NULL,"
 				"language varchar(25) NOT NULL,"
 				"encoding varchar(50) NOT NULL default 'utf8',"
 				"last_login timestamp,"
 				"vip boolean NOT NULL  default 'false',"
 				"online boolean NOT NULL  default 'false',"
 				"PRIMARY KEY (id),"
 				"UNIQUE (jid)"
 			");");
 		exec("CREATE TABLE " + m_prefix + "users_settings ("
 				"user_id integer NOT NULL,"
 				"var varchar(50) NOT NULL,"
 				"type smallint NOT NULL,"
 				"value varchar(255) NOT NULL,"
 				"PRIMARY KEY (user_id,var)"
 			");");
 		exec("CREATE TABLE " + m_prefix + "db_version ("
 				"ver integer NOT NULL default '1',"
 				"UNIQUE (ver)"
 			");");
  		exec("INSERT INTO db_version (ver) VALUES ('1');");
+ 		exec("INSERT INTO " + m_prefix + "db_version (ver) VALUES ('1');");
+	}
 	return true;
+}
 template<typename T>
 std::string PQXXBackend::quote(pqxx::nontransaction &txn, const T &t) {
 	return "'" + txn.esc(pqxx::to_string(t)) + "'";
+}
 bool PQXXBackend::exec(const std::string &query, bool show_error) {
 	pqxx::nontransaction txn(*m_conn);
 	return exec(txn, query, show_error);
+}
 bool PQXXBackend::exec(pqxx::nontransaction &txn, const std::string &query, bool show_error) {
 	try {
 		txn.exec(query);
 		txn.commit();
+	}
 	catch (std::exception& e) {
 		if (show_error)
 			LOG4CXX_ERROR(logger, e.what());
 		return false;
+	}
 	return true;
+}
 void PQXXBackend::setUser(const UserInfo &user) {
 	std::string encrypted = user.password;
 	if (!CONFIG_STRING(m_config, "database.encryption_key").empty()) {
 		encrypted = StorageBackend::encryptPassword(encrypted, CONFIG_STRING(m_config, "database.encryption_key"));
+	}
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		txn.exec("INSERT INTO " + m_prefix + "users (jid, uin, password, language, encoding, last_login, vip) VALUES "
 			+ "(" + quote(txn, user.jid) + ","
 			+ quote(txn, user.uin) + ","
 			+ quote(txn, encrypted) + ","
 			+ quote(txn, user.language) + ","
 			+ quote(txn, user.encoding) + ","
 			+ "NOW(),"
 			+ (user.vip ? "'true'" : "'false'") +")");
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 			roster.push_back(b);
+		}
 		r = txn.exec("SELECT buddy_id, type, var, value FROM " + m_prefix + "buddies_settings WHERE user_id=" + pqxx::to_string(id) + " ORDER BY buddy_id ASC");
 		for (pqxx::result::const_iterator it = r.begin(); it != r.end(); it++)  {
 			SettingVariableInfo var;
 			long buddy_id = -1;
 			std::string key;
 			std::string val;
 			buddy_id = (*it)[0].as<long>();
 			var.type = (*it)[1].as<long>();
 			key = (*it)[2].as<std::string>();
 			val = (*it)[3].as<std::string>();
 			switch (var.type) {
 				case TYPE_BOOLEAN:
 					var.b = atoi(val.c_str());
 					break;
 				case TYPE_STRING:
 					var.s = val;
 					break;
 				default:
 					continue;
 					break;
+			}
 			BOOST_FOREACH(BuddyInfo &b, roster) {
 				if (buddy_id == b.id) {
 					b.settings[key] = var;
 					break;
+				}
+			}
+		}
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
 	return false;
+}
 bool PQXXBackend::removeUser(long id) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		txn.exec("DELETE FROM " + m_prefix + "users SET id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "user_settings SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies_settings SET user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "users WHERE id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies WHERE user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "users_settings WHERE user_id=" + pqxx::to_string(id));
 		txn.exec("DELETE FROM " + m_prefix + "buddies_settings WHERE user_id=" + pqxx::to_string(id));
 		return true;
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
 	return false;
+}
 void PQXXBackend::getUserSetting(long id, const std::string &variable, int &type, std::string &value) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		pqxx::result r = txn.exec("SELECT type, value FROM " + m_prefix + "users_settings WHERE user_id=" + pqxx::to_string(id) + " AND var=" + quote(txn, variable));
 		if (r.size() == 0) {
 			txn.exec("INSERT INTO " + m_prefix + "users_settings (user_id, var, type, value) VALUES(" + pqxx::to_string(id) + "," + quote(txn, variable) + "," + pqxx::to_string((int)type) + "," + quote(txn, value) + ")");
+		}
 		else {
 			type = r[0][0].as<int>();
 			value = r[0][1].as<std::string>();
+		}
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 void PQXXBackend::updateUserSetting(long id, const std::string &variable, const std::string &value) {
 	try {
 		pqxx::nontransaction txn(*m_conn);
 		txn.exec("UPDATE " + m_prefix + "users_settings SET value=" + quote(txn, value) + " WHERE user_id=" + pqxx::to_string(id) + " AND var=" + quote(txn, variable));
+	}
 	catch (std::exception& e) {
 		LOG4CXX_ERROR(logger, e.what());
+	}
+}
 void PQXXBackend::beginTransaction() {
 	exec("BEGIN;");
+}
 void PQXXBackend::commitTransaction() {
 	exec("COMMIT;");
+}
+}
 #endif

0 comments (0 inline, 0 general)