BUSTED: what a mess. trying to get tournament round generation bits working. ack.

rails/map-mash/db/migrate/20120304164625_create_mashes.rb

@@ -1,21 +1,22 @@
 class CreateMashes < ActiveRecord::Migration
   def self.up
     create_table :mashes do |t|
-      t.integer :requester_id, :null => false
-      t.integer :map_a_id, :null => false
-      t.integer :map_b_id, :null => false
-      t.integer :winner_id, :null => false
+      t.integer :mash_tournament_id, :null => false
+      t.integer :map_a_id
+      t.integer :map_b_id
+      t.integer :winner_id
+      t.integer :mash_tournament_round_id
 
       t.timestamps
     end
 
     add_index :mashes, [:winner_id]
-    add_index :mashes, [:requester_id]
+    add_index :mashes, [:mash_tournament_id]
   end
 
   def self.down
     remove_index :mashes, [:winner_id]
-    remove_index :mashes, [:requester_id]
+    remove_index :mashes, [:mash_tournament_id]
     drop_table :mashes
   end
 end

rails/map-mash/db/migrate/20120309130609_create_mash_tournaments.rb

@@ -2,15 +2,18 @@ class CreateMashTournaments < ActiveRecord::Migration
   def self.up
     create_table :mash_tournaments do |t|
       t.references :requester, :null => false
+      t.integer :total_rounds, :default => 1
 
       t.timestamps
     end
 
     add_index :mash_tournaments, [:requester_id]
+    add_index :mash_tournaments, [:total_rounds]
   end
 
   def self.down
-    drop_table :mash_tournaments
+    remove_index :mash_tournaments, [:total_rounds]
     remove_index :mash_tournaments, [:requester_id]
+    drop_table :mash_tournaments
   end
 end

rails/map-mash/db/migrate/20120310035133_create_mash_tournament_rounds.rb

@@ -0,0 +1,20 @@
+class CreateMashTournamentRounds < ActiveRecord::Migration
+  def self.up
+    create_table :mash_tournament_rounds do |t|
+      t.references :mash_tournament
+      t.integer :number, :null => false
+      t.integer :mash_count, :null => false
+
+      t.timestamps
+    end
+
+    add_index :mash_tournament_rounds, [:mash_tournament_id, :number]
+    add_index :mash_tournament_rounds, [:mash_count]
+  end
+
+  def self.down
+    remove_index :mash_tournament_rounds, [:mash_tournament_id, :number]
+    remove_index :mash_tournament_rounds, [:mash_count]
+    drop_table :mash_tournament_rounds
+  end
+end