Implement usage of new map_reg_*_db tables

2 files changed, 263 insertions, 0 deletions

diff --git a/src/map/mapreg.h b/src/map/mapreg.h
index bd0e13e21..772a6cb61 100644
--- a/src/map/mapreg.h
+++ b/src/map/mapreg.h
@@ -60,7 +60,11 @@ struct mapreg_interface {
 	char* (*readregstr) (int64 uid);
 	bool (*setreg) (int64 uid, int val);
 	bool (*setregstr) (int64 uid, const char *str);
+	void (*load_num_db) (void);
+	void (*load_str_db) (void);
 	void (*load) (void);
+	void (*save_num_db) (const char *name, unsigned int index, int value);
+	void (*save_str_db) (const char *name, unsigned int index, const char *value);
 	void (*save) (void);
 	int (*save_timer) (int tid, int64 tick, int id, intptr_t data);
 	int (*destroyreg) (union DBKey key, struct DBData *data, va_list ap);
diff --git a/src/map/mapreg_sql.c b/src/map/mapreg_sql.c
index a461763fa..376e582f9 100644
--- a/src/map/mapreg_sql.c
+++ b/src/map/mapreg_sql.c
@@ -105,6 +105,25 @@ static bool mapreg_setreg(int64 uid, int val)
 				SQL->EscapeStringLen(map->mysql_handle, tmp_str, name, strnlen(name, SCRIPT_VARNAME_LENGTH+1));
 				if( SQL_ERROR == SQL->Query(map->mysql_handle, "INSERT INTO `%s`(`varname`,`index`,`value`) VALUES ('%s','%u','%d')", mapreg->table, tmp_str, i, val) )
 					Sql_ShowDebug(map->mysql_handle);
+
+				struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+				if (stmt == NULL) {
+					SqlStmt_ShowDebug(stmt);
+				} else {
+					const char *query = "INSERT INTO `%s` (`key`, `index`, `value`) VALUES (?, ?, ?)";
+					size_t len = strnlen(name, SCRIPT_VARNAME_LENGTH);
+
+					if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->num_db)
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_STRING, name, len)
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_UINT32, &i, sizeof(i))
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 2, SQLDT_INT32, &val, sizeof(val))
+					    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+						SqlStmt_ShowDebug(stmt);
+					}
+
+					SQL->StmtFree(stmt);
+				}
 			}
 			i64db_put(mapreg->regs.vars, uid, m);
 		}
@@ -119,6 +138,24 @@ static bool mapreg_setreg(int64 uid, int val)
 		if( name[1] != '@' ) {// Remove from database because it is unused.
 			if( SQL_ERROR == SQL->Query(map->mysql_handle, "DELETE FROM `%s` WHERE `varname`='%s' AND `index`='%u'", mapreg->table, name, i) )
 				Sql_ShowDebug(map->mysql_handle);
+
+			struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+			if (stmt == NULL) {
+				SqlStmt_ShowDebug(stmt);
+			} else {
+				const char *query = "DELETE FROM `%s` WHERE `key`=? AND `index`=?";
+				size_t len = strnlen(name, SCRIPT_VARNAME_LENGTH);
+
+				if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->num_db)
+				    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_STRING, name, len)
+				    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_UINT32, &i, sizeof(i))
+				    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+					SqlStmt_ShowDebug(stmt);
+				}
+
+				SQL->StmtFree(stmt);
+			}
 		}
 	}
 
@@ -147,6 +184,24 @@ static bool mapreg_setregstr(int64 uid, const char *str)
 		if(name[1] != '@') {
 			if (SQL_ERROR == SQL->Query(map->mysql_handle, "DELETE FROM `%s` WHERE `varname`='%s' AND `index`='%u'", mapreg->table, name, i))
 				Sql_ShowDebug(map->mysql_handle);
+
+			struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+			if (stmt == NULL) {
+				SqlStmt_ShowDebug(stmt);
+			} else {
+				const char *query = "DELETE FROM `%s` WHERE `key`=? AND `index`=?";
+				size_t len = strnlen(name, SCRIPT_VARNAME_LENGTH);
+
+				if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->str_db)
+				    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_STRING, name, len)
+				    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_UINT32, &i, sizeof(i))
+				    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+					SqlStmt_ShowDebug(stmt);
+				}
+
+				SQL->StmtFree(stmt);
+			}
 		}
 		if( (m = i64db_get(mapreg->regs.vars, uid)) ) {
 			if( m->u.str != NULL )
@@ -181,6 +236,26 @@ static bool mapreg_setregstr(int64 uid, const char *str)
 				SQL->EscapeStringLen(map->mysql_handle, tmp_str2, str, strnlen(str, SCRIPT_STRING_VAR_LENGTH));
 				if( SQL_ERROR == SQL->Query(map->mysql_handle, "INSERT INTO `%s`(`varname`,`index`,`value`) VALUES ('%s','%u','%s')", mapreg->table, tmp_str, i, tmp_str2) )
 					Sql_ShowDebug(map->mysql_handle);
+
+				struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+				if (stmt == NULL) {
+					SqlStmt_ShowDebug(stmt);
+				} else {
+					const char *query = "INSERT INTO `%s` (`key`, `index`, `value`) VALUES (?, ?, ?)";
+					size_t len_n = strnlen(name, SCRIPT_VARNAME_LENGTH);
+					size_t len_v = strnlen(str, SCRIPT_STRING_VAR_LENGTH);
+
+					if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->str_db)
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_STRING, name, len_n)
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_UINT32, &i, sizeof(i))
+					    || SQL_ERROR == SQL->StmtBindParam(stmt, 2, SQLDT_STRING, str, len_v)
+					    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+						SqlStmt_ShowDebug(stmt);
+					}
+
+					SQL->StmtFree(stmt);
+				}
 			}
 			i64db_put(mapreg->regs.vars, uid, m);
 		}
@@ -190,6 +265,108 @@ static bool mapreg_setregstr(int64 uid, const char *str)
 }
 
 /**
+ * Loads permanent global interger variables from the database.
+ *
+ **/
+static void mapreg_load_num_db(void)
+{
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+	if (stmt == NULL) {
+		SqlStmt_ShowDebug(stmt);
+		return;
+	}
+
+	const char *query = "SELECT `key`, `index`, `value` FROM `%s`";
+	char name[SCRIPT_VARNAME_LENGTH + 1];
+	unsigned int index;
+	int value;
+
+	if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->num_db)
+	    || SQL_ERROR == SQL->StmtExecute(stmt)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 0, SQLDT_STRING, &name, sizeof(name), NULL, NULL)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 1, SQLDT_UINT32, &index, sizeof(index), NULL, NULL)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 2, SQLDT_INT32, &value, sizeof(value), NULL, NULL)) {
+		SqlStmt_ShowDebug(stmt);
+		SQL->StmtFree(stmt);
+		return;
+	}
+
+	if (SQL->StmtNumRows(stmt) < 1) {
+		SQL->StmtFree(stmt);
+		return;
+	}
+
+	mapreg->skip_insert = true;
+
+	while (SQL_SUCCESS == SQL->StmtNextRow(stmt)) {
+		int var_key = script->add_variable(name);
+		int64 uid = reference_uid(var_key, index);
+
+		if (i64db_exists(mapreg->regs.vars, uid)) {
+			ShowWarning("mapreg_load_num_db: Duplicate! '%s' => '%d' Skipping...\n", name, value);
+			continue;
+		}
+
+		mapreg->setreg(uid, value);
+	}
+
+	mapreg->skip_insert = false;
+	SQL->StmtFree(stmt);
+}
+
+/**
+ * Loads permanent global string variables from the database.
+ *
+ **/
+static void mapreg_load_str_db(void)
+{
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+	if (stmt == NULL) {
+		SqlStmt_ShowDebug(stmt);
+		return;
+	}
+
+	const char *query = "SELECT `key`, `index`, `value` FROM `%s`";
+	char name[SCRIPT_VARNAME_LENGTH + 1];
+	unsigned int index;
+	char value[SCRIPT_STRING_VAR_LENGTH + 1];
+
+	if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->str_db)
+	    || SQL_ERROR == SQL->StmtExecute(stmt)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 0, SQLDT_STRING, &name, sizeof(name), NULL, NULL)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 1, SQLDT_UINT32, &index, sizeof(index), NULL, NULL)
+	    || SQL_ERROR == SQL->StmtBindColumn(stmt, 2, SQLDT_STRING, &value, sizeof(value), NULL, NULL)) {
+		SqlStmt_ShowDebug(stmt);
+		SQL->StmtFree(stmt);
+		return;
+	}
+
+	if (SQL->StmtNumRows(stmt) < 1) {
+		SQL->StmtFree(stmt);
+		return;
+	}
+
+	mapreg->skip_insert = true;
+
+	while (SQL_SUCCESS == SQL->StmtNextRow(stmt)) {
+		int var_key = script->add_variable(name);
+		int64 uid = reference_uid(var_key, index);
+
+		if (i64db_exists(mapreg->regs.vars, uid)) {
+			ShowWarning("mapreg_load_str_db: Duplicate! '%s' => '%s' Skipping...\n", name, value);
+			continue;
+		}
+
+		mapreg->setregstr(uid, value);
+	}
+
+	mapreg->skip_insert = false;
+	SQL->StmtFree(stmt);
+}
+
+/**
  * Loads permanent variables from database.
  */
 static void script_load_mapreg(void)
@@ -240,10 +417,84 @@ static void script_load_mapreg(void)
 
 	mapreg->skip_insert = false;
 
+	mapreg->load_num_db();
+	mapreg->load_str_db();
+
 	mapreg->dirty = false;
 }
 
 /**
+ * Saves a permanent global integer variable to the database.
+ *
+ * @param name The variable's name.
+ * @param index The variable's array index.
+ * @param value The variable's value.
+ *
+ **/
+static void mapreg_save_num_db(const char *name, unsigned int index, int value)
+{
+	nullpo_retv(name);
+	Assert_retv(*name != '\0');
+	Assert_retv(strlen(name) <= SCRIPT_VARNAME_LENGTH);
+
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+	if (stmt == NULL) {
+		SqlStmt_ShowDebug(stmt);
+		return;
+	}
+
+	const char *query = "UPDATE `%s` SET `value`=? WHERE `key`=? AND `index`=? LIMIT 1";
+
+	if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->num_db)
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_INT32, &value, sizeof(value))
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_STRING, name, strlen(name))
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 2, SQLDT_UINT32, &index, sizeof(index))
+	    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+		SqlStmt_ShowDebug(stmt);
+	}
+
+	SQL->StmtFree(stmt);
+}
+
+/**
+ * Saves a permanent global string variable to the database.
+ *
+ * @param name The variable's name.
+ * @param index The variable's array index.
+ * @param value The variable's value.
+ *
+ **/
+static void mapreg_save_str_db(const char *name, unsigned int index, const char *value)
+{
+	nullpo_retv(name);
+	nullpo_retv(value);
+	Assert_retv(*name != '\0');
+	Assert_retv(strlen(name) <= SCRIPT_VARNAME_LENGTH);
+	Assert_retv(*value != '\0');
+	Assert_retv(strlen(value) <= SCRIPT_STRING_VAR_LENGTH);
+
+	struct SqlStmt *stmt = SQL->StmtMalloc(map->mysql_handle);
+
+	if (stmt == NULL) {
+		SqlStmt_ShowDebug(stmt);
+		return;
+	}
+
+	const char *query = "UPDATE `%s` SET `value`=? WHERE `key`=? AND `index`=? LIMIT 1";
+
+	if (SQL_ERROR == SQL->StmtPrepare(stmt, query, mapreg->str_db)
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 0, SQLDT_STRING, value, strlen(value))
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 1, SQLDT_STRING, name, strlen(name))
+	    || SQL_ERROR == SQL->StmtBindParam(stmt, 2, SQLDT_UINT32, &index, sizeof(index))
+	    || SQL_ERROR == SQL->StmtExecute(stmt)) {
+		SqlStmt_ShowDebug(stmt);
+	}
+
+	SQL->StmtFree(stmt);
+}
+
+/**
  * Saves permanent variables to database.
  */
 static void script_save_mapreg(void)
@@ -260,11 +511,15 @@ static void script_save_mapreg(void)
 				if (!m->is_string) {
 					if( SQL_ERROR == SQL->Query(map->mysql_handle, "UPDATE `%s` SET `value`='%d' WHERE `varname`='%s' AND `index`='%d' LIMIT 1", mapreg->table, m->u.i, name, i) )
 						Sql_ShowDebug(map->mysql_handle);
+
+					mapreg->save_num_db(name, i, m->u.i);
 				} else {
 					char tmp_str2[SCRIPT_STRING_VAR_LENGTH * 2 + 1];
 					SQL->EscapeStringLen(map->mysql_handle, tmp_str2, m->u.str, safestrnlen(m->u.str, SCRIPT_STRING_VAR_LENGTH));
 					if( SQL_ERROR == SQL->Query(map->mysql_handle, "UPDATE `%s` SET `value`='%s' WHERE `varname`='%s' AND `index`='%d' LIMIT 1", mapreg->table, tmp_str2, name, i) )
 						Sql_ShowDebug(map->mysql_handle);
+
+					mapreg->save_str_db(name, i, m->u.str);
 				}
 				m->save = false;
 			}
@@ -442,7 +697,11 @@ void mapreg_defaults(void)
 	mapreg->readregstr = mapreg_readregstr;
 	mapreg->setreg = mapreg_setreg;
 	mapreg->setregstr = mapreg_setregstr;
+	mapreg->load_num_db = mapreg_load_num_db;
+	mapreg->load_str_db = mapreg_load_str_db;
 	mapreg->load = script_load_mapreg;
+	mapreg->save_num_db = mapreg_save_num_db;
+	mapreg->save_str_db = mapreg_save_str_db;
 	mapreg->save = script_save_mapreg;
 	mapreg->save_timer = script_autosave_mapreg;
 	mapreg->destroyreg = mapreg_destroyreg;