diff --git a/Gemfile b/Gemfile index ace6b97..0566526 100644 --- a/Gemfile +++ b/Gemfile @@ -42,16 +42,6 @@ end gem 'devise' gem 'cancan' gem 'bootstrap-sass' +gem 'mysql' -# Use ActiveModel has_secure_password -# gem 'bcrypt-ruby', '~> 3.1.2' - -# Use unicorn as the app server -# gem 'unicorn' - -# Use Capistrano for deployment -# gem 'capistrano', group: :development - -# Use debugger -# gem 'debugger', group: [:development, :test] diff --git a/config/database.yml b/config/database.yml index 51a4dd4..b1f3956 100644 --- a/config/database.yml +++ b/config/database.yml @@ -9,6 +9,14 @@ development: pool: 5 timeout: 5000 + + #adapter: mysql + #encoding: utf8 + #database: wrestlingtourney + #pool: 5 + #username: root + #password: password + # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. diff --git a/db/seeds.rb b/db/seeds.rb index 0a372d7..2d7063e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -28,4 +28,8 @@ if Rails.env.development? Wrestler.create(name: 'Guy 16', school_id: 200, weight_id: 200, original_seed: 16, season_win: 0, season_loss: 0, criteria: 'N/A') end +if Rails.env.production? + User.create(email: 'jacob.wimer@gmail.com', password: 'Welcome12', password_confirmation: 'Welcome12') +end + diff --git a/refresh_wrestling_db.sh b/refresh_wrestling_db.sh new file mode 100644 index 0000000..6201deb --- /dev/null +++ b/refresh_wrestling_db.sh @@ -0,0 +1 @@ +mysqldump -h db.codywimer.com -u heroku_jcw -p wrestlingtourney | mysql -h localhost -u root -ppassword wrestlingtourney diff --git a/set_up_dev_db.sh b/set_up_dev_db.sh new file mode 100644 index 0000000..98abc80 --- /dev/null +++ b/set_up_dev_db.sh @@ -0,0 +1 @@ +mysql -u root -ppassword -e 'CREATE DATABASE wrestlingtourney;'