From 5a0ea53618ef8c71ee8cd9408c68ad3e4af121e9 Mon Sep 17 00:00:00 2001
From: Ryan Yappert <ryappert@gmail.com>
Date: Fri, 8 Nov 2024 01:36:11 -0800
Subject: [PATCH] Fix bad SQL query for contacts list.

---
 .../Sql/Core/DdonSqlDbContactList.cs          | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbContactList.cs b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbContactList.cs
index a39dd6354..b31a91b2f 100644
--- a/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbContactList.cs
+++ b/Arrowgene.Ddon.Database/Sql/Core/DdonSqlDbContactList.cs
@@ -34,22 +34,22 @@ public abstract partial class DdonSqlDb<TCon, TCom, TReader> : SqlDb<TCon, TCom,
         
         private static readonly string SqlUpdateContactByCharIds = $"UPDATE \"{ContactListTableName}\" SET \"status\"=@status, \"type\"=@type, \"requester_favorite\"=@requester_favorite, \"requested_favorite\"=@requested_favorite WHERE \"requester_character_id\"=@requester_character_id and \"requested_character_id\"=@requested_character_id;";
 
-        private static readonly string SqlSelectFullContactsByCharacterId = "SELECT \"ddon_contact_list\".*,  " +
-            "\"ddon_character\".\"first_name\", \"ddon_character\".\"last_name\", " +
-            "\"ddon_character_job_data\".\"job\", \"ddon_character_job_data\".\"lv\"," +
-            "\"ddon_character_matching_profile\".\"comment\"," +
-            "CASE WHEN CASE WHEN \"ddon_contact_list\".\"requester_character_id\" = @character_id THEN \"ddon_contact_list\".\"requested_character_id\" ELSE \"ddon_contact_list\".\"requester_character_id\" END NOT IN (SELECT \"character_id\" FROM \"ddon_clan_membership\") THEN \"\"" +
-            "ELSE (SELECT \"ddon_clan_param\".\"name\" as \"clan_name\" FROM \"ddon_clan_param\" INNER JOIN \"ddon_clan_membership\" ON \"ddon_clan_membership\".\"clan_id\" = \"ddon_clan_param\".\"clan_id\" WHERE \"ddon_clan_membership\".\"character_id\" = CASE WHEN \"ddon_contact_list\".\"requester_character_id\" = 4 THEN \"ddon_contact_list\".\"requested_character_id\" ELSE \"ddon_contact_list\".\"requester_character_id\" END)" +
-            "END AS \"clan_name\"," +
-            "CASE WHEN \"ddon_contact_list\".\"requester_character_id\" = @character_id THEN \"ddon_contact_list\".\"requested_character_id\"" +
-            "ELSE \"ddon_contact_list\".\"requester_character_id\"" +
-            "END AS \"other_id\"" +
-            "FROM \"ddon_contact_list\" " +
-            "INNER JOIN \"ddon_character\" ON \"ddon_character\".\"character_id\" = \"other_id\"" +
-            "INNER JOIN \"ddon_character_common\" ON \"ddon_character_common\".\"character_common_id\" = \"ddon_character\".\"character_common_id\"" +
-            "INNER JOIN \"ddon_character_job_data\" ON \"ddon_character_job_data\".\"character_common_id\" = \"ddon_character\".\"character_common_id\" AND \"ddon_character_job_data\".\"job\" = \"ddon_character_common\".\"job\"" +
-            "INNER JOIN \"ddon_character_matching_profile\" ON \"ddon_character_matching_profile\".\"character_id\" = \"other_id\";";
-
+        private static readonly string SqlSelectFullContactsByCharacterId = @"SELECT ""ddon_contact_list"".*,  
+	        ""ddon_character"".""first_name"", ""ddon_character"".""last_name"", 
+	        ""ddon_character_job_data"".""job"", ""ddon_character_job_data"".""lv"",
+	        ""ddon_character_matching_profile"".""comment"",
+	        CASE WHEN CASE WHEN ""ddon_contact_list"".""requester_character_id"" = @character_id THEN ""ddon_contact_list"".""requested_character_id"" ELSE ""ddon_contact_list"".""requester_character_id"" END NOT IN (SELECT ""character_id"" FROM ""ddon_clan_membership"") THEN """"
+	        ELSE (SELECT ""ddon_clan_param"".""name"" as ""clan_name"" FROM ""ddon_clan_param"" INNER JOIN ""ddon_clan_membership"" ON ""ddon_clan_membership"".""clan_id"" = ""ddon_clan_param"".""clan_id"" WHERE ""ddon_clan_membership"".""character_id"" = CASE WHEN ""ddon_contact_list"".""requester_character_id"" = @character_id THEN ""ddon_contact_list"".""requested_character_id"" ELSE ""ddon_contact_list"".""requester_character_id"" END)
+	        END AS ""clan_name"",
+	        CASE WHEN ""ddon_contact_list"".""requester_character_id"" = @character_id THEN ""ddon_contact_list"".""requested_character_id""
+	        ELSE ""ddon_contact_list"".""requester_character_id""
+	        END AS ""other_id""
+	        FROM ""ddon_contact_list""
+	        INNER JOIN ""ddon_character"" ON ""ddon_character"".""character_id"" = ""other_id""
+	        INNER JOIN ""ddon_character_common"" ON ""ddon_character_common"".""character_common_id"" = ""ddon_character"".""character_common_id""
+	        INNER JOIN ""ddon_character_job_data"" ON ""ddon_character_job_data"".""character_common_id"" = ""ddon_character"".""character_common_id"" AND ""ddon_character_job_data"".""job"" = ""ddon_character_common"".""job""
+	        INNER JOIN ""ddon_character_matching_profile"" ON ""ddon_character_matching_profile"".""character_id"" = ""other_id""
+	        WHERE ""requested_character_id"" = @character_id OR ""requester_character_id"" = @character_id;";
 
         public int InsertContact(uint requestingCharacterId, uint requestedCharacterId, ContactListStatus status, ContactListType type, bool requesterFavorite, bool requestedFavorite)
         {