From: Ant Zucaro <azucaro@gmail.com>
Date: Fri, 25 Nov 2016 15:04:41 +0000 (-0500)
Subject: On second thought, let XonStat handle the attribute updates.
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonstatdb.git;a=commitdiff_plain;h=93821bee615d1cc2f70c200f920867a31602129b

On second thought, let XonStat handle the attribute updates.
---

diff --git a/functions/merge_servers.sql b/functions/merge_servers.sql
index f929064..602c808 100644
--- a/functions/merge_servers.sql
+++ b/functions/merge_servers.sql
@@ -17,19 +17,11 @@ begin
         raise exception 'Both servers have hashkeys and they are different! Not merging.';
     end if;
 
-    -- fill in the "important" missing attributes
-    if w_server.ip_addr is null and l_server.ip_addr is not null then
-        w_server.ip_addr := l_server.ip_addr;
-    end if;
-
+    -- fill in the hashkey (everything else will be handled by xonstat)
     if w_server.hashkey is null and l_server.hashkey is not null then
         w_server.hashkey := l_server.hashkey;
     end if;
 
-    if w_server.revision is null and l_server.revision is not null then
-        w_server.revision := l_server.revsion;
-    end if;
-
     -- games get moved to the new server
     update games set server_id = p_winner_server_id where server_id = p_loser_server_id;