reconnection on sqlprep exec & prepare

CromFr · CromFr · commit c0dd54c7f583 · 2024-03-17T22:42:52.000+01:00
diff --git a/src/plugins/database/dbplugin.cpp b/src/plugins/database/dbplugin.cpp
@@ -122,6 +122,11 @@ int DBPlugin::GetInt(char* sFunction, char* sParam1, int nParam2)
 		int col    = (nParam2 >> 24) & 0xFF;
 		int stmtID = nParam2 & 0x00FFFFFF;
 		return PrepGetDataInt(stmtID, col);
+	} else if (function == "CON") {
+		return Connect();
+	} else if (function == "DISCON") {
+		Disconnect();
+		return 0;
 	} else {
 		logger->Err("! Unknown GetInt function '%s'", sFunction);
 		return -1;
@@ -223,6 +228,9 @@ char* DBPlugin::GetString(char* sFunction, char* sParam1, int nParam2)
 	return this->returnBuffer;
 }
 
+bool DBPlugin::Connect() { return TRUE; }
+void DBPlugin::Disconnect() { }
+
 bool DBPlugin::Execute(char* query)
 {
 	logger->Err("* %s not implemented for this plugin", __FUNCTION__);
diff --git a/src/plugins/database/dbplugin.h b/src/plugins/database/dbplugin.h
@@ -63,6 +63,9 @@ class DBPlugin : public Plugin {
 	virtual int GetLastInsertID();
 	void SetScorcoSQL(const char* request);
 
+	virtual bool Connect();
+	virtual void Disconnect();
+
 	// Prepared statements
 	virtual int PrepPrepareStatement(const char* query);
 
diff --git a/src/plugins/database/nwnx_sql.nss b/src/plugins/database/nwnx_sql.nss
@@ -489,27 +489,6 @@ void SetPersistentString(object oObject, string sVarName, string sValue, int iEx
                 + sPlayer + "','" + sTag + "','" + sVarName + "','" + sValue + "'," + IntToString(iExpiration) + ")"
             + " ON DUPLICATE KEY UPDATE `val`=VALUES(`val`), `expire`=VALUES(`expire`)"
         );
-
-        // string sSQL = "SELECT player FROM " + sTable + " WHERE player='" + sPlayer +
-        //     "' AND tag='" + sTag + "' AND name='" + sVarName + "'";
-        // SQLExecDirect(sSQL);
-
-        // if (SQLFetch() == SQL_SUCCESS)
-        // {
-        //     // row exists
-        //     sSQL = "UPDATE " + sTable + " SET val='" + sValue +
-        //         "',expire=" + IntToString(iExpiration) + " WHERE player='" + sPlayer +
-        //         "' AND tag='" + sTag + "' AND name='" + sVarName + "'";
-        //     SQLExecDirect(sSQL);
-        // }
-        // else
-        // {
-        //     // row doesn't exist
-        //     sSQL = "INSERT INTO " + sTable + " (player,tag,name,val,expire) VALUES" +
-        //         "('" + sPlayer + "','" + sTag + "','" + sVarName + "','" +
-        //         sValue + "'," + IntToString(iExpiration) + ")";
-        //     SQLExecDirect(sSQL);
-        // }
     }
 
 }
@@ -582,30 +561,6 @@ void SetPersistentInt(object oObject, string sVarName, int iValue, int iExpirati
 int GetPersistentInt(object oObject, string sVarName, string sTable = "pwdata")
 {
     return StringToInt(GetPersistentString(oObject, sVarName, sTable));
-    // string sPlayer;
-    // string sTag;
-
-    // if (GetIsPC(oObject))
-    // {
-    //     sPlayer = SQLEncodeSpecialChars(GetPCPlayerName(oObject));
-    //     sTag = SQLEncodeSpecialChars(GetName(oObject));
-    // }
-    // else
-    // {
-    //     sPlayer = "~";
-    //     sTag = GetTag(oObject);
-    // }
-
-    // sVarName = SQLEncodeSpecialChars(sVarName);
-
-    // string sSQL = "SELECT val FROM " + sTable + " WHERE player='" + sPlayer +
-    //     "' AND tag='" + sTag + "' AND name='" + sVarName + "'";
-    // SQLExecDirect(sSQL);
-
-    // if (SQLFetch() == SQL_SUCCESS)
-    //     return StringToInt(SQLGetData(1));
-    // else
-    //     return 0;
 }
 
 void SetPersistentFloat(object oObject, string sVarName, float fValue, int iExpiration =
@@ -617,30 +572,6 @@ void SetPersistentFloat(object oObject, string sVarName, float fValue, int iExpi
 float GetPersistentFloat(object oObject, string sVarName, string sTable = "pwdata")
 {
     return StringToFloat(GetPersistentString(oObject, sVarName, sTable));
-    // string sPlayer;
-    // string sTag;
-
-    // if (GetIsPC(oObject))
-    // {
-    //     sPlayer = SQLEncodeSpecialChars(GetPCPlayerName(oObject));
-    //     sTag = SQLEncodeSpecialChars(GetName(oObject));
-    // }
-    // else
-    // {
-    //     sPlayer = "~";
-    //     sTag = GetTag(oObject);
-    // }
-
-    // sVarName = SQLEncodeSpecialChars(sVarName);
-
-    // string sSQL = "SELECT val FROM " + sTable + " WHERE player='" + sPlayer +
-    //     "' AND tag='" + sTag + "' AND name='" + sVarName + "'";
-    // SQLExecDirect(sSQL);
-
-    // if (SQLFetch() == SQL_SUCCESS)
-    //     return StringToFloat(SQLGetData(1));
-    // else
-    //     return 0.0f;
 }
 
 void SetPersistentLocation(object oObject, string sVarName, location lLocation, int iExpiration =
diff --git a/src/plugins/xp_mysql/mysql_plugin.cpp b/src/plugins/xp_mysql/mysql_plugin.cpp
@@ -19,6 +19,7 @@
 
 #include "mysql_plugin.h"
 
+#include "../../nwnx_version.h"
 #include <cassert>
 #include <mysql/errmsg.h>
 
@@ -53,17 +54,17 @@ bool APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
 MySQL::MySQL()
     : DBPlugin()
 {
-	header = "NWNX MySQL Plugin V.1.1.0-dev\n"
+	header = "NWNX MySQL Plugin " NWNX_VERSION_INFO "\n"
 	         "(c) 2007 by Ingmar Stieger (Papillon)\n"
 	         "(c) 2008 by virusman\n"
-	         "visit us at http://www.nwnx.org\n"
-	         "(built using mysql-5.0.27 source)\n";
+	         "Source: https://github.com/nwn2dev/nwnx4 \n"
+	         "MySQL Connector: " MARIADB_CLIENT_VERSION_STR;
 
 	description = "This plugin provides database storage. It uses "
 	              "MySQL 4 or 5 as database server.";
 
 	subClass = "MySQL";
-	version  = "1.1.0-dev";
+	version  = NWNX_VERSION_INFO;
 
 	result = NULL;
 	row    = NULL;
@@ -106,15 +107,19 @@ bool MySQL::Init(char* nwnxhome)
 
 bool MySQL::Connect()
 {
+	logger->Info("* Connecting to MySQL server...");
 	// initialize the mysql structure
-	if (!mysql_init(&mysql))
-		return FALSE;
+	if (!mysql_init(&mysql)) {
+		logger->Err("!   Failed to init MySQL");
+		return false;
+	}
 
 	// try to connect to the mysql server
 	connection = mysql_real_connect(&mysql, server.c_str(), user.c_str(), password.c_str(),
 	                                schema.c_str(), port, NULL, CLIENT_MULTI_STATEMENTS);
 	if (connection == NULL) {
 		mysql_close(&mysql);
+		logger->Err("!   Failed to connect to server: %s", mysql_error(&mysql));
 		return false;
 	}
 
@@ -126,21 +131,38 @@ bool MySQL::Connect()
 		}
 	}
 
+	// Recover prepared statements
+	for (size_t stmtID = 0; stmtID < m_prepStmts.size(); stmtID++) {
+		auto& prepStmt = m_prepStmts[stmtID];
+
+		auto stmt = mysql_stmt_init(&mysql);
+		if (mysql_stmt_prepare(stmt, prepStmt->query.c_str(), -1) != 0) {
+			logger->Err("[Stmt %d] Failed to prepare statement. Error %d: %s", stmtID,
+			            mysql_stmt_errno(stmt), mysql_stmt_error(stmt));
+			mysql_stmt_close(stmt); // ignore closing error, just deallocate
+		} else {
+			logger->Debug("[Stmt %d] re-prepared statement after disconnection", stmtID);
+			prepStmt->stmt = stmt;
+		}
+	}
+
 	return true;
 }
 
 void MySQL::Disconnect()
 {
 	// close the connection
 	mysql_close(&mysql);
+	mysql_close(connection);
+	connection = NULL;
+	logger->Info("* Disconnected MySQL server");
 }
 
 bool MySQL::Reconnect()
 {
 	logger->Info("* Reconnecting to MySQL server...");
 	Disconnect();
 	if (!Connect()) {
-		logger->Info("* Connection to MySQL server failed:\n  %s", mysql_error(&mysql));
 		return false;
 	} else {
 		logger->Info("* Connection to MySQL server succeeded.");
@@ -421,6 +443,13 @@ BYTE* MySQL::ReadScorcoData(char* param, int* size)
 
 int MySQL::PrepPrepareStatement(const char* query)
 {
+	if (!connection) {
+		if (!Reconnect()) {
+			logger->Err("PrepPrepareStatement: Not connected.");
+			return FALSE;
+		}
+	}
+
 	auto stmtID = m_prepStmts.size() + 1;
 	logger->Info("[Stmt %d] Prepare query: %s", stmtID, query);
 
@@ -643,6 +672,13 @@ bool MySQL::PrepExecute(int stmtID)
 		return false;
 	}
 
+	if (!connection) {
+		if (!Reconnect()) {
+			logger->Err("[Stmt %d] PrepExecute: Not connected.", stmtID);
+			return FALSE;
+		}
+	}
+
 	logger->Info("[Stmt %d] PrepExecute: execute stmt", stmtID);
 
 	auto& stmt = m_prepStmts[stmtID - 1]->stmt;
diff --git a/src/plugins/xp_mysql/mysql_plugin.h b/src/plugins/xp_mysql/mysql_plugin.h
@@ -41,8 +41,8 @@ class MySQL : public DBPlugin {
 	BYTE* ReadScorcoData(char* param, int* size) override;
 
 private:
-	bool Connect();
-	void Disconnect();
+	bool Connect() override;
+	void Disconnect() override;
 	bool Reconnect();
 	bool Execute(char* query) override;
 	int Fetch(char* buffer) override;
diff --git a/test/modules/NWNX4UnitTests/onmoduleload.ncs b/test/modules/NWNX4UnitTests/onmoduleload.ncs
diff --git a/test/modules/NWNX4UnitTests/onmoduleload.nss b/test/modules/NWNX4UnitTests/onmoduleload.nss
