Merge branch 'master' of https://github.com/LukeShu/leaguer

1 files changed, 17 insertions, 8 deletions

diff --git a/generate.sh b/generate.sh
index 7f70d56..4d70de1 100755
--- a/generate.sh
+++ b/generate.sh
@@ -13,23 +13,32 @@
 NOTEST='--skip-test-unit'
 
 set -x
-bundle exec rails generate scaffold server $NOTEST
+bundle exec rails generate scaffold server --force $NOTEST
 bundle exec rails generate scaffold tournament game:references $NOTEST
-bundle exec rails generate scaffold match tournament:references $NOTEST
+bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
 bundle exec rails generate scaffold team $NOTEST
-bundle exec rails generate controller users $NOTEST
-bundle exec rails generate controller Sessions
-bundle exec rails generate model user name:string email:string user_name:string $NOTEST
-bundle exec rails generate model user_team_pair user:references team:references $NOTEST
-bundle exec rails generate model team_match_pair team:references match:references $NOTEST
 bundle exec rails generate scaffold alert author:references message:text $NOTEST
 bundle exec rails generate scaffold pm author:references recipient:references message:text $NOTEST
-bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer $NOTEST
+bundle exec rails generate scaffold game name:text players_per_team:integer teams_per_match:integer set_rounds:integer randomized_teams:integer --force $NOTEST
+
 bundle exec rails generate model game_attribute game:references key:text type:integer $NOTEST
 bundle exec rails generate model server_settings $NOTEST
+bundle exec rails generate model user name:string email:string user_name:string $NOTEST
+bundle exec rails generate model user_team_pair user:references team:references $NOTEST
+bundle exec rails generate model team_match_pair team:references match:references $NOTEST
+
 bundle exec rails generate controller search $NOTEST
 bundle exec rails generate controller main $NOTEST
 bundle exec rails generate controller static $NOTEST
+bundle exec rails generate controller users $NOTEST
+bundle exec rails generate controller Sessions
+
+#added some stuff to the database
+
+rails generate migration add_index_to_user_email
+rails generate migration add_index_to_user_name
+rails generate migration add_password_digest_to_users
+rails generate migration add_remember_token_to_users
 
 #for the tournament controller to generate options
 bundle exec rails generate model tournament_option $NOTEST