Added --force flags for parts of the generator.

15 files changed, 4 insertions, 4 deletions

diff --git a/db/migrate/20140304020443_create_servers.rb b/db/migrate/20140304020531_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304020443_create_servers.rb
+++ b/db/migrate/20140304020531_create_servers.rb
diff --git a/db/migrate/20140304020445_create_tournaments.rb b/db/migrate/20140304020533_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304020445_create_tournaments.rb
+++ b/db/migrate/20140304020533_create_tournaments.rb
diff --git a/db/migrate/20140304020447_create_matches.rb b/db/migrate/20140304020536_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304020447_create_matches.rb
+++ b/db/migrate/20140304020536_create_matches.rb
diff --git a/db/migrate/20140304020450_create_teams.rb b/db/migrate/20140304020538_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304020450_create_teams.rb
+++ b/db/migrate/20140304020538_create_teams.rb
diff --git a/db/migrate/20140304020456_create_users.rb b/db/migrate/20140304020545_create_users.rb
index f0986d4..f0986d4 100644
--- a/db/migrate/20140304020456_create_users.rb
+++ b/db/migrate/20140304020545_create_users.rb
diff --git a/db/migrate/20140304020458_create_user_team_pairs.rb b/db/migrate/20140304020547_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304020458_create_user_team_pairs.rb
+++ b/db/migrate/20140304020547_create_user_team_pairs.rb
diff --git a/db/migrate/20140304020501_create_team_match_pairs.rb b/db/migrate/20140304020549_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304020501_create_team_match_pairs.rb
+++ b/db/migrate/20140304020549_create_team_match_pairs.rb
diff --git a/db/migrate/20140304020503_create_alerts.rb b/db/migrate/20140304020551_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304020503_create_alerts.rb
+++ b/db/migrate/20140304020551_create_alerts.rb
diff --git a/db/migrate/20140304020505_create_pms.rb b/db/migrate/20140304020554_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304020505_create_pms.rb
+++ b/db/migrate/20140304020554_create_pms.rb
diff --git a/db/migrate/20140304020508_create_games.rb b/db/migrate/20140304020556_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304020508_create_games.rb
+++ b/db/migrate/20140304020556_create_games.rb
diff --git a/db/migrate/20140304020510_create_game_attributes.rb b/db/migrate/20140304020558_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304020510_create_game_attributes.rb
+++ b/db/migrate/20140304020558_create_game_attributes.rb
diff --git a/db/migrate/20140304020512_create_server_settings.rb b/db/migrate/20140304020601_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304020512_create_server_settings.rb
+++ b/db/migrate/20140304020601_create_server_settings.rb
diff --git a/db/migrate/20140304020521_create_tournament_options.rb b/db/migrate/20140304020609_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304020521_create_tournament_options.rb
+++ b/db/migrate/20140304020609_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 87bf66d..847a686 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304020521) do
+ActiveRecord::Schema.define(version: 20140304020609) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/generate.sh b/generate.sh
index 7f70d56..ea96b9b 100755
--- a/generate.sh
+++ b/generate.sh
@@ -13,9 +13,9 @@
 NOTEST='--skip-test-unit'
 
 set -x
-bundle exec rails generate scaffold server $NOTEST
-bundle exec rails generate scaffold tournament game:references $NOTEST
-bundle exec rails generate scaffold match tournament:references $NOTEST
+bundle exec rails generate scaffold server --force $NOTEST
+bundle exec rails generate scaffold tournament game:references --force $NOTEST
+bundle exec rails generate scaffold match tournament:references --force $NOTEST
 bundle exec rails generate scaffold team $NOTEST
 bundle exec rails generate controller users $NOTEST
 bundle exec rails generate controller Sessions