Fix merge.
authorAnt Zucaro <azucaro@gmail.com>
Mon, 29 Oct 2012 16:03:08 +0000 (12:03 -0400)
committerAnt Zucaro <azucaro@gmail.com>
Mon, 29 Oct 2012 16:03:08 +0000 (12:03 -0400)
build/build_full.sql
tables/player_game_stats.tab
tables/player_map_captimes.tab [new file with mode: 0644]
tables/player_weapon_stats.tab

index 7766c8f..f4eab05 100755 (executable)
@@ -1,4 +1,5 @@
 -- drop tables first in reverse order
+drop table if exists player_map_captimes;
 drop table if exists player_ladder_ranks;
 drop table if exists cd_ladder cascade;
 drop table if exists player_ranks_history cascade;
@@ -43,6 +44,7 @@ drop table if exists players cascade;
 \i tables/player_ranks_history.tab
 \i tables/cd_ladder.tab
 \i tables/player_ladder_ranks.tab
+\i tables/player_map_captimes.tab
 
 begin;
 
index e09f351..9a9f681 100755 (executable)
@@ -24,6 +24,9 @@ CREATE TABLE xonstat.player_game_stats
   pushes integer,
   pushed integer,
   carrier_frags integer,
+  elo_delta numeric,
+  fastest_cap interval,
+  avg_latency numeric,
   create_dt timestamp without time zone NOT NULL DEFAULT (current_timestamp at time zone 'UTC'),
   CONSTRAINT player_game_stats_pk PRIMARY KEY (player_game_stat_id),
   CONSTRAINT player_game_stats_fk001 FOREIGN KEY (player_id)
@@ -42,7 +45,6 @@ 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);
@@ -131,4 +133,3 @@ 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 --git a/tables/player_map_captimes.tab b/tables/player_map_captimes.tab
new file mode 100644 (file)
index 0000000..c9960a3
--- /dev/null
@@ -0,0 +1,28 @@
+CREATE TABLE xonstat.player_map_captimes
+(
+  player_map_captime_id serial NOT NULL,
+  player_id integer NOT NULL,
+  map_id integer NOT NULL,
+  game_id bigint NOT NULL,
+  fastest_cap interval NOT NULL,
+  create_dt timestamp without time zone NOT NULL DEFAULT (current_timestamp at time zone 'UTC'),
+  CONSTRAINT player_map_captimes_pk PRIMARY KEY (player_map_captime_id),
+  CONSTRAINT player_map_captimes_uk01 UNIQUE (player_id, map_id),
+  CONSTRAINT player_map_captimes_fk01 FOREIGN KEY (player_id)
+      REFERENCES xonstat.players (player_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION,
+  CONSTRAINT player_map_captimes_fk02 FOREIGN KEY (map_id)
+      REFERENCES xonstat.maps (map_id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION
+-- I have no idea why this causes an integrity constraint error,
+-- but it does. Since it is not critical, I'll drop it off for now,
+-- until I get a clue as to why the error happens.
+-- ,
+ -- CONSTRAINT player_map_captimes_fk03 FOREIGN KEY (game_id)
+      -- REFERENCES xonstat.games (game_id) MATCH SIMPLE
+      -- ON UPDATE NO ACTION ON DELETE NO ACTION
+)
+WITH (
+  OIDS=FALSE
+);
+ALTER TABLE xonstat.player_map_captimes OWNER TO xonstat;
index 8bef1f5..8670753 100755 (executable)
@@ -32,6 +32,7 @@ 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 (