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

@@ @@ -79,71 +79,71 @@ class MySQLBackend : public StorageBackend @@
 		/// \return true if user has been found in database and roster has been fetched
 		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 getUserSetting(long userId, const std::string &variable, int &type, std::string &value);
 		void updateUserSetting(long userId, const std::string &variable, const std::string &value);
 		void beginTransaction();
 		void commitTransaction();
 	private:
 		bool exec(const std::string &query);
 		class Statement {
 			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);
 				// Pulls fetched data by previous execute(); call.
 				template <typename T>
 				Statement& operator >> (T& t);
 				Statement& operator >> (std::string& t);
 			private:
 				MYSQL_STMT *m_stmt;
 				MYSQL *m_conn;
 				std::vector<MYSQL_BIND> m_params;
 				std::vector<MYSQL_BIND> m_results;
 				int m_resultOffset;
 				int m_offset;
 				int m_error;
 				std::string m_string;
 		};
 		MYSQL m_conn;
 		Config *m_config;
 		std::string m_prefix;
 		// statements
 // 		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

@@ @@ -6,49 +6,49 @@ @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 #pragma once
 #include <string>
 #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
 };
 typedef enum
+{
 	TYPE_UNKNOWN = 0,  /**< Unknown type.                     */
 	TYPE_SUBTYPE,      /**< Subtype.                          */
 	TYPE_CHAR,         /**< Character.                        */
 	TYPE_UCHAR,        /**< Unsigned character.               */
 	TYPE_BOOLEAN,      /**< Boolean.                          */
 	TYPE_SHORT,        /**< Short integer.                    */
 	TYPE_USHORT,       /**< Unsigned short integer.           */
 	TYPE_INT,          /**< Integer.                          */
 	TYPE_UINT,         /**< Unsigned integer.                 */
 	TYPE_LONG,         /**< Long integer.                     */
 	TYPE_ULONG,        /**< Unsigned long integer.            */
 	TYPE_INT64,        /**< 64-bit integer.                   */
 	TYPE_UINT64,       /**< 64-bit unsigned integer.          */
 	TYPE_STRING,       /**< String.                           */

spectrum/src/main.cpp

➞

Show inline comments

@@ @@ -65,54 +65,56 @@ int main(int argc, char **argv) @@
 	if (argc != 2) {
 		std::cout << desc << "\n";
 		return 1;
+	}
 	if (!config.load(argv[1])) {
 		std::cerr << "Can't load configuration file.\n";
 		return 1;
+	}
 	UserRegistry userRegistry(&config);
 	Swift::SimpleEventLoop eventLoop;
 	Component transport(&eventLoop, &config, NULL, &userRegistry);
 // 	Logger logger(&transport);
 	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) {
 		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);
 		userRegistration->start();
 // 		logger.setUserRegistration(&userRegistration);
+	}
 // 	logger.setUserManager(&userManager);
 	NetworkPluginServer plugin(&transport, &config, &userManager);
 	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend);
 	eventLoop_ = &eventLoop;
 	eventLoop.run();
 	if (userRegistration) {
 		userRegistration->stop();
 		delete userRegistration;
+	}
 	delete storageBackend;

src/mysqlbackend.cpp

➞

Show inline comments

 	m_string = statement;
 	m_stmt = mysql_stmt_init(conn);
 	if (mysql_stmt_prepare(m_stmt, statement.c_str(), statement.size())) {
 		LOG4CXX_ERROR(logger, statement << " " << mysql_error(conn));
 		return;
+	}
 	for (int i = 0; i < format.length() && m_resultOffset == -1; i++) {
 		switch (format.at(i)) {
 			case 's':
 				m_params.resize(m_params.size() + 1);
 				memset(&m_params.back(), 0, sizeof(MYSQL_BIND));
 				m_params.back().buffer_type= MYSQL_TYPE_STRING;
 				m_params.back().buffer= (char *) malloc(sizeof(char) * 4096);
 				m_params.back().buffer_length= 4096;
 				m_params.back().is_null= 0;
 				m_params.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				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));
 				m_params.back().buffer_type= MYSQL_TYPE_TINY;
 				m_params.back().buffer= (bool *) malloc(sizeof(bool));
 				m_params.back().is_null= 0;
 				m_params.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				break;
 			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;
 				m_results.back().buffer= (char *) malloc(sizeof(char) * 4096);
 				m_results.back().buffer_length= 4096;
 				m_results.back().is_null= 0;
 				m_results.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				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));
 				m_results.back().buffer_type= MYSQL_TYPE_TINY;
 				m_results.back().buffer= (bool *) malloc(sizeof(bool));
 				m_results.back().is_null= 0;
 				m_results.back().length= (unsigned long *) malloc(sizeof(unsigned long));
 				break;
+		}
+	}
 	if (mysql_stmt_bind_param(m_stmt, &m_params.front())) {
 		LOG4CXX_ERROR(logger, statement << " " << mysql_error(conn));
+	}
 	if (m_resultOffset < 0)
 		m_resultOffset = format.size();
 	else {
 		if (mysql_stmt_bind_result(m_stmt, &m_results.front())) {
 			LOG4CXX_ERROR(logger, statement << " " << mysql_error(conn));
+		}
+	}
 	m_resultOffset = 0;
+}
 MySQLBackend::Statement::~Statement() {
 	for (int i = 0; i < m_params.size(); i++) {
 		free(m_params[i].buffer);
 		free(m_params[i].length);
+	}
 	for (int i = 0; i < m_results.size(); i++) {
 		free(m_results[i].buffer);
 		free(m_results[i].length);
+	}
 	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())
 		return *this;
 	LOG4CXX_INFO(logger, "adding " << m_offset << ":" << str << "(" << str.size() << ")");
 	strncpy((char*) m_params[m_offset].buffer, str.c_str(), 4096);
 	*m_params[m_offset].length = str.size();
 	m_offset++;
 	return *this;
+}
 template <typename T>
 MySQLBackend::Statement& MySQLBackend::Statement::operator >> (T& t) {
 	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;
+	}
 	if (++m_resultOffset == m_results.size())
 		m_resultOffset = 0;
 	return *this;
+}
 MySQLBackend::MySQLBackend(Config *config) {
 	m_config = config;
 	mysql_init(&m_conn);
 	m_prefix = CONFIG_STRING(m_config, "database.prefix");
+}
 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") <<
 		", port " << CONFIG_INT(m_config, "database.port")
 	);
 	if (!mysql_real_connect(&m_conn, CONFIG_STRING(m_config, "database.server").c_str(),
 					   CONFIG_STRING(m_config, "database.user").c_str(),
 					   CONFIG_STRING(m_config, "database.password").c_str(),
 					   CONFIG_STRING(m_config, "database.database").c_str(),
 					   CONFIG_INT(m_config, "database.port"), NULL, 0)) {
 		LOG4CXX_ERROR(logger, "Can't connect database: " << mysql_error(&m_conn));
 		return false;
+	}
 	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;
+}
 bool MySQLBackend::createDatabase() {
 	int not_exist = exec("CREATE TABLE IF NOT EXISTS `" + m_prefix + "buddies` ("
 							"`id` int(10) unsigned NOT NULL auto_increment,"
 							"`user_id` int(10) unsigned NOT NULL,"
 							"`uin` varchar(255) collate utf8_bin NOT NULL,"
 							"`subscription` enum('to','from','both','ask','none') collate utf8_bin NOT NULL,"
 							"`nickname` varchar(255) collate utf8_bin NOT NULL,"
 							"`groups` varchar(255) collate utf8_bin NOT NULL,"
 							"`flags` smallint(4) NOT NULL DEFAULT '0',"
 							"PRIMARY KEY (`id`),"
 							"UNIQUE KEY `user_id` (`user_id`,`uin`)"
 						") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;");
 	if (not_exist) {
 		exec("CREATE TABLE IF NOT EXISTS `" + m_prefix + "buddies_settings` ("
 				"`user_id` int(10) unsigned NOT NULL,"
@@ @@ -365,73 +365,104 @@ bool MySQLBackend::createDatabase() { @@
 				"`ver` int(10) unsigned NOT NULL default '1',"
 				"UNIQUE KEY `ver` (`ver`)"
 			") ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;");
 		exec("INSERT INTO db_version (ver) VALUES ('2');");
+	}
 	return true;
+}
 bool MySQLBackend::exec(const std::string &query) {
 	if (mysql_query(&m_conn, query.c_str())) {
 		LOG4CXX_ERROR(logger, query << " " << mysql_error(&m_conn));
 		return false;
+	}
 	return true;
+}
 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)