From: Ant Zucaro <azucaro@gmail.com>
Date: Mon, 29 Oct 2012 16:03:08 +0000 (-0400)
Subject: Fix merge.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97df06a925ca8b0154f74bef543ed7e5224d4295;p=xonotic%2Fxonstatdb.git

Fix merge.
---

97df06a925ca8b0154f74bef543ed7e5224d4295
diff --cc tables/player_game_stats.tab
index 219e84a,e09f351..9a9f681
mode 100644,100755..100755
--- a/tables/player_game_stats.tab
+++ b/tables/player_game_stats.tab
@@@ -42,8 -39,10 +42,9 @@@ WITH 
  
  CREATE INDEX player_game_stats_ix01 on player_game_stats(create_dt);
  CREATE INDEX player_game_stats_ix02 on player_game_stats(game_id);
+ CREATE INDEX player_game_stats_ix03 on player_game_stats(player_id);
  ALTER TABLE xonstat.player_game_stats OWNER TO xonstat;
  
 -
  CREATE TABLE xonstat.player_game_stats_2011Q2 (
      CHECK ( create_dt >= DATE '2011-04-01' AND create_dt < DATE '2011-07-01' ) 
  ) INHERITS (player_game_stats);
@@@ -122,5 -129,6 +131,5 @@@ CREATE TABLE xonstat.player_game_stats_
  
  CREATE INDEX player_game_stats_2013Q2_ix01 on player_game_stats_2013Q2(create_dt);
  CREATE INDEX player_game_stats_2013Q2_ix02 on player_game_stats_2013Q2(game_id);
+ CREATE INDEX player_game_stats_2013Q2_ix03 on player_game_stats_2013Q2(player_id);
  ALTER TABLE xonstat.player_game_stats_2013Q2 OWNER TO xonstat;
--
diff --cc tables/player_weapon_stats.tab
index 54e4234,8bef1f5..8670753
mode 100644,100755..100755
--- a/tables/player_weapon_stats.tab
+++ b/tables/player_weapon_stats.tab
@@@ -31,6 -31,7 +31,8 @@@ WITH 
  
  CREATE INDEX player_weap_stats_ix01 on player_weapon_stats(create_dt);
  CREATE INDEX player_weap_stats_ix02 on player_weapon_stats(game_id);
+ CREATE INDEX player_weap_stats_ix03 on player_weapon_stats(player_id);
++
  ALTER TABLE xonstat.player_weapon_stats OWNER TO xonstat;
  
  CREATE TABLE xonstat.player_weapon_stats_2011Q2 (