Update CDComponentsRegistryTable.h

Database: Rename and add further comments

Datavbase: Add comments

Add some comments

Build: Fix PCH directories

Database: Fix time

thanks apple

Database: Fix compiler warnings

Overload destructor
Define specialty for time_t
Use string instead of string_view for temp empty string

Update CDTable.h

Property: Update queries to use mapId

Database: Reorganize

Reorganize into CDClient folder and GameDatabase folder for clearer meanings and file structure

Folders: Rename to GameDatabase

MySQL: Remove MySQL Specifier from table

Database: Move Tables to Interfaces

Database: Reorder functions in header

Database: Simplify property queries

Database: Remove unused queries

Remove extra query definitions as well

Database: Consolidate User getters

Database: Comment logs

Update MySQLDatabase.cpp

Database: Use generic code

Playkey: Fix bad optional access

Database: Move stuff around

WorldServer: Update queries

Ugc reduced by many scopes
use new queries
very fast
tested that ugc still loads

Database: Add auth queries

I tested that only the correct password can sign into an account.
Tested that disabled playkeys do not allow the user to play the game

Database: Add donation query

Database: add objectId queries

Database: Add master queries

Database: Fix mis-named function

Database: Add slash command queries

Mail: Fix itemId type

CharFilter: Use new query

ObjectID: Remove duplicate code

SlashCommand: Update query with function

Database: Add mail queries

Ugc: Fix issues with saving models

Resolve large scope blocks as well

CMakeLists.txt

@@ -214,8 +214,12 @@ set(INCLUDED_DIRECTORIES
 	"dNavigation/dTerrain"
 	"dZoneManager"
 	"dDatabase"
-	"dDatabase/Tables"
-	"dDatabase/Databases"
+	"dDatabase/CDClientDatabase"
+	"dDatabase/CDClientDatabase/CDClientTables"
+	"dDatabase/GameDatabase"
+	"dDatabase/GameDatabase/ITables"
+	"dDatabase/GameDatabase/MySQL"
+	"dDatabase/GameDatabase/MySQL/Tables"
 	"dNet"
 	"dScripts"
 	"dScripts/02_server"
@@ -330,8 +334,9 @@ add_subdirectory(thirdparty)
 file(
 	GLOB HEADERS_DDATABASE
 	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dDatabase/*.h
-	${PROJECT_SOURCE_DIR}/dDatabase/Tables/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/CDClientDatabase/CDClientTables/*.h
+	${PROJECT_SOURCE_DIR}/dDatabase/GameDatabase/ITables/*.h
 	${PROJECT_SOURCE_DIR}/thirdparty/SQLite/*.h
 )
 

dChatFilter/dChatFilter.cpp

@@ -33,8 +33,7 @@ dChatFilter::dChatFilter(const std::string& filepath, bool dontGenerateDCF) {
 
 	//Read player names that are ok as well:
 	auto approvedNames = Database::Get()->GetApprovedCharacterNames();
-	if (!approvedNames) return;
-	for (auto& name : approvedNames->names) {
+	for (auto& name : approvedNames) {
 		std::transform(name.begin(), name.end(), name.begin(), ::tolower); //Transform to lowercase
 		m_ApprovedWords.push_back(CalculateHash(name));
 	}

dChatServer/ChatPacketHandler.cpp

@@ -31,34 +31,32 @@ void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	if (!player) return;
 
 	auto friendsList = Database::Get()->GetFriendsList(playerID);
-	if (friendsList) {
-		for (const auto& friendData : friendsList->friends) {
-			FriendData fd;
-			fd.isFTP = false; // not a thing in DLU
-			fd.friendID = friendData.friendID;
-			GeneralUtils::SetBit(fd.friendID, eObjectBits::PERSISTENT);
-			GeneralUtils::SetBit(fd.friendID, eObjectBits::CHARACTER);
-
-			fd.isBestFriend = friendData.isBestFriend; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
-			if (fd.isBestFriend) player->countOfBestFriends += 1;
-			fd.friendName = friendData.friendName;
-
-			//Now check if they're online:
-			auto fr = playerContainer.GetPlayerData(fd.friendID);
-
-			if (fr) {
-				fd.isOnline = true;
-				fd.zoneID = fr->zoneID;
-
-				//Since this friend is online, we need to update them on the fact that we've just logged in:
-				SendFriendUpdate(fr, player, 1, fd.isBestFriend);
-			} else {
-				fd.isOnline = false;
-				fd.zoneID = LWOZONEID();
-			}
-
-			player->friends.push_back(fd);
+	for (const auto& friendData : friendsList) {
+		FriendData fd;
+		fd.isFTP = false; // not a thing in DLU
+		fd.friendID = friendData.friendID;
+		GeneralUtils::SetBit(fd.friendID, eObjectBits::PERSISTENT);
+		GeneralUtils::SetBit(fd.friendID, eObjectBits::CHARACTER);
+
+		fd.isBestFriend = friendData.isBestFriend; //0 = friends, 1 = left_requested, 2 = right_requested, 3 = both_accepted - are now bffs
+		if (fd.isBestFriend) player->countOfBestFriends += 1;
+		fd.friendName = friendData.friendName;
+
+		//Now check if they're online:
+		auto fr = playerContainer.GetPlayerData(fd.friendID);
+
+		if (fr) {
+			fd.isOnline = true;
+			fd.zoneID = fr->zoneID;
+
+			//Since this friend is online, we need to update them on the fact that we've just logged in:
+			SendFriendUpdate(fr, player, 1, fd.isBestFriend);
+		} else {
+			fd.isOnline = false;
+			fd.zoneID = LWOZONEID();
 		}
+
+		player->friends.push_back(fd);
 	}
 
 	//Now, we need to send the friendlist to the server they came from:
@@ -142,7 +140,7 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	if (!requestee) {
 		requestee.reset(new PlayerData());
 		requestee->playerName = playerName;
-		auto responseType = Database::Get()->DoesCharacterExist(playerName)
+		auto responseType = Database::Get()->GetCharacterInfo(playerName)
 			? eAddFriendResponseType::NOTONLINE
 			: eAddFriendResponseType::INVALIDCHARACTER;
 
@@ -300,9 +298,9 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
 	//First, we need to find their ID:
 	LWOOBJID friendID = 0;
-	auto friendIdResult = Database::Get()->GetAccountIdFromCharacterName(friendName);
+	auto friendIdResult = Database::Get()->GetCharacterInfo(friendName);
 	if (friendIdResult) {
-		friendID = friendIdResult.value();
+		friendID = friendIdResult->id;
 	}
 
 	// Convert friendID to LWOOBJID

dCommon/BrickByBrickFix.cpp

@@ -23,7 +23,7 @@ bool CheckSd0Magic(std::istream& streamToCheck);
  */
 uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
 	uint32_t modelsTruncated{};
-	auto modelsToTruncate = Database::Get()->GetUgcModels();
+	auto modelsToTruncate = Database::Get()->GetAllUgcModels();
 	bool previousCommitValue = Database::Get()->GetAutoCommit();
 	Database::Get()->SetAutoCommit(false);
 	for (auto& model : modelsToTruncate) {
@@ -95,7 +95,7 @@ uint32_t BrickByBrickFix::TruncateBrokenBrickByBrickXml() {
  */
 uint32_t BrickByBrickFix::UpdateBrickByBrickModelsToSd0() {
 	uint32_t updatedModels = 0;
-	auto modelsToUpdate = Database::Get()->GetUgcModels();
+	auto modelsToUpdate = Database::Get()->GetAllUgcModels();
 	auto previousAutoCommitState = Database::Get()->GetAutoCommit();
 	Database::Get()->SetAutoCommit(false);
 	for (auto& model : modelsToUpdate) {

dDatabase/Tables/CDComponentsRegistryTable.h → dDatabase/CDClientDatabase/CDClientTables/CDComponentsRegistryTable.h

@@ -3,6 +3,8 @@
 // Custom Classes
 #include "CDTable.h"
 
+#include <unordered_map>
+
 enum class eReplicaComponentType : uint32_t;
 struct CDComponentsRegistry {
 	unsigned int id;                    //!< The LOT is used as the ID

dDatabase/Tables/CMakeLists.txt → dDatabase/CDClientDatabase/CDClientTables/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(DDATABASE_TABLES_SOURCES "CDActivitiesTable.cpp"
+set(DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES "CDActivitiesTable.cpp"
 	"CDActivityRewardsTable.cpp"
 	"CDAnimationsTable.cpp"
 	"CDBehaviorParameterTable.cpp"

dDatabase/CDClientDatabase/CMakeLists.txt

@@ -0,0 +1,12 @@
+set(DDATABASE_CDCLIENTDATABASE_SOURCES
+	"CDClientDatabase.cpp"
+	"CDClientManager.cpp"
+)
+
+add_subdirectory(CDClientTables)
+
+foreach(file ${DDATABASE_CDCLIENTDATABASE_CDCLIENTTABLES_SOURCES})
+	set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} "CDClientTables/${file}")
+endforeach()
+
+set(DDATABASE_CDCLIENTDATABASE_SOURCES ${DDATABASE_CDCLIENTDATABASE_SOURCES} PARENT_SCOPE)

dDatabase/CMakeLists.txt

@@ -1,18 +1,15 @@
-set(DDATABASE_SOURCES "CDClientDatabase.cpp"
-		"CDClientManager.cpp"
-		"Database.cpp"
-		"MigrationRunner.cpp")
+set(DDATABASE_SOURCES)
 
-add_subdirectory(Tables)
+add_subdirectory(CDClientDatabase)
 
-foreach(file ${DDATABASE_TABLES_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Tables/${file}")
+foreach(file ${DDATABASE_CDCLIENTDATABASE_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "CDClientDatabase/${file}")
 endforeach()
 
-add_subdirectory(Databases)
+add_subdirectory(GameDatabase)
 
-foreach(file ${DDATABASE_DATABASES_SOURCES})
-	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "Databases/${file}")
+foreach(file ${DDATABASE_GAMEDATABASE_SOURCES})
+	set(DDATABASE_SOURCES ${DDATABASE_SOURCES} "GameDatabase/${file}")
 endforeach()
 
 add_library(dDatabase STATIC ${DDATABASE_SOURCES})