diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /generate.sh | |
parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) |
Fixed some merge errors in show.html.erb
Diffstat (limited to 'generate.sh')
-rwxr-xr-x | generate.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/generate.sh b/generate.sh index db9e84b..03225e7 100755 --- a/generate.sh +++ b/generate.sh @@ -39,10 +39,12 @@ bundle exec rails generate model server_settings $NOTEST bundle exec rails generate model tournament_option tournament:references vartype:integer name:string value:text $NOTEST bundle exec rails generate model game_option vartype:integer name:string default:text $NOTEST bundle exec rails generate model score user:references match:references value:integer $NOTEST -# Bridge Models -bundle exec rails generate model user_team_pair user:references team:references $NOTEST -bundle exec rails generate model user_tournament_pair user:references tournament:references -bundle exec rails generate model team_match_pair team:references match:references $NOTEST + +# Join tables +bundle exec rails generate migration CreateTournamentPlayersJoinTable players tournaments +bundle exec rails generate migration CreateTournamentHostsJoinTable hosts tournaments +bundle exec rails generate migration CreateUserTeamJoinTable users matches +bundle exec rails generate migration CreateMatchTeamJoinTable matches teams # Just controllers bundle exec rails generate controller search $NOTEST |