Skip to content

Commit

Permalink
Merge pull request #87 from FundingCircle/fix-rails-db-create
Browse files Browse the repository at this point in the history
Fix crashes when there isn't a database
  • Loading branch information
bliof-fc authored Jan 11, 2022
2 parents 887e708 + 006f61c commit 93bd3f2
Show file tree
Hide file tree
Showing 17 changed files with 78 additions and 830 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ aliases:
environment: &environment
RACK_ENV: test
VAULT_VERSION: 0.10.4
BUNDLER_VERSION: 2.1.4
command: &ruby-command |
gem install bundler:$BUNDLER_VERSION
bundle check --path=vendor/bundle || bundle install --binstubs --jobs 4 --path=vendor/bundle --retry 3
bundle exec rake app:db:create
bundle exec rake app:db:schema:load
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ build/
Gemfile.lock
.ruby-version
.ruby-gemset
gemfiles/*.gemfile.lock

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
Expand Down
25 changes: 15 additions & 10 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
appraise "rails-4.2" do
gem "rails", "~> 4.2.0"
appraise 'rails-4.2' do
gem 'rails', '~> 4.2.0'
gem 'sqlite3', '~> 1.3.13'
gem 'bundler', '~> 1.17.3'
end
appraise "rails-5.0" do
gem "rails", "~> 5.0.0"

appraise 'rails-5.0' do
gem 'rails', '~> 5.0.0'
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-5.1" do
gem "rails", "~> 5.1.0"

appraise 'rails-5.1' do
gem 'rails', '~> 5.1.0'
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-5.2" do
gem "rails", "~> 5.2.0"

appraise 'rails-5.2' do
gem 'rails', '~> 5.2.0'
gem 'sqlite3', '~> 1.3.13'
end
appraise "rails-6" do
gem "rails", "~> 6"

appraise 'rails-6' do
gem 'rails', '~> 6'
gem 'sqlite3', '~> 1.4'
end
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Vault Rails Changelog

## 2.1.0 (January 11, 2022)

Prevent db queries on boot -> so that db:create / assets:precompile work

## 2.0.5 (October 19, 2020)

- Fix compatibility with `#with_lock` / `#lock!` - on initialization the `#changes` is no longer polluted. Fixed error:
Expand Down
1 change: 1 addition & 0 deletions gemfiles/rails_4.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ source "https://rubygems.org"

gem "rails", "~> 4.2.0"
gem "sqlite3", "~> 1.3.13"
gem "bundler", "~> 1.17.3"

gemspec path: "../"
149 changes: 0 additions & 149 deletions gemfiles/rails_4.2.gemfile.lock

This file was deleted.

155 changes: 0 additions & 155 deletions gemfiles/rails_5.0.gemfile.lock

This file was deleted.

Loading

0 comments on commit 93bd3f2

Please sign in to comment.