MYSQL objects cannot be copied in a well defined way, this removes th…

…e copy and replaces it with another connection
EQEmu · Feb 5, 2023 · 0b02b22 · 0b02b22
1 parent ee6f6f6
commit 0b02b22
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 12 deletions.
diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp
@@ -86,7 +86,16 @@ int main(int argc, char **argv)
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		if (!content_db.Connect(
+			Config->DatabaseHost.c_str(),
+			Config->DatabaseUsername.c_str(),
+			Config->DatabasePassword.c_str(),
+			Config->DatabaseDB.c_str(),
+			Config->DatabasePort
+		)) {
+			LogError("Cannot continue without a content database connection");
+			return 1;
+		}
 	}
 
 	LogSys.SetDatabase(&database)

diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp
@@ -83,7 +83,16 @@ int main(int argc, char **argv) {
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		if (!content_db.Connect(
+			Config->DatabaseHost.c_str(),
+			Config->DatabaseUsername.c_str(),
+			Config->DatabasePassword.c_str(),
+			Config->DatabaseDB.c_str(),
+			Config->DatabasePort
+		)) {
+			LogError("Cannot continue without a content database connection");
+			return 1;
+		}
 	}
 
 	LogSys.SetDatabase(&database)

diff --git a/common/dbcore.cpp b/common/dbcore.cpp
@@ -285,11 +285,6 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	}
 }
 
-void DBcore::SetMysql(MYSQL *mysql)
-{
-	DBcore::mysql = *mysql;
-}
-
 const std::string &DBcore::GetOriginHost() const
 {
 	return origin_host;

diff --git a/common/dbcore.h b/common/dbcore.h
@@ -29,8 +29,6 @@ class DBcore {
 	void TransactionRollback();
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);
 	void ping();
-	MYSQL *getMySQL() { return &mysql; }
-	void SetMysql(MYSQL *mysql);
 
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);

diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp
@@ -124,7 +124,16 @@ int main(int argc, char **argv)
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		if (!content_db.Connect(
+			Config->DatabaseHost.c_str(),
+			Config->DatabaseUsername.c_str(),
+			Config->DatabasePassword.c_str(),
+			Config->DatabaseDB.c_str(),
+			Config->DatabasePort
+		)) {
+			LogError("Cannot continue without a content database connection");
+			return 1;
+		}
 	}
 
 	LogSys.SetDatabase(&database)

diff --git a/world/world_boot.cpp b/world/world_boot.cpp
@@ -153,7 +153,17 @@ bool WorldBoot::LoadDatabaseConnections()
 		}
 	}
 	else {
-		content_db.SetMysql(database.getMySQL());
+		if (!content_db.Connect(
+			c->DatabaseHost.c_str(),
+			c->DatabaseUsername.c_str(),
+			c->DatabasePassword.c_str(),
+			c->DatabaseDB.c_str(),
+			c->DatabasePort,
+			"content"
+		)) {
+			LogError("Cannot continue without a content database connection");
+			return false;
+		}
 	}
 
 	return true;

diff --git a/zone/main.cpp b/zone/main.cpp
@@ -256,7 +256,17 @@ int main(int argc, char** argv) {
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		if (!content_db.Connect(
+			Config->DatabaseHost.c_str(),
+			Config->DatabaseUsername.c_str(),
+			Config->DatabasePassword.c_str(),
+			Config->DatabaseDB.c_str(),
+			Config->DatabasePort,
+			"content"
+		)) {
+			LogError("Cannot continue without a content database connection");
+			return 1;
+		}
 	}
 
 	/* Register Log System and Settings */