Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly disconnect databases when using Spring, fixes #97 #99

Merged
merged 1 commit into from
Oct 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions lib/sequel_rails/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
require 'sequel_rails/migrations'
require 'sequel_rails/railties/log_subscriber'
require 'sequel_rails/railties/i18n_support'
require 'sequel_rails/railties/spring_support'
require 'sequel_rails/railties/controller_runtime'
require 'sequel_rails/sequel/database/active_support_notification'
require 'action_dispatch/middleware/session/sequel_store'
Expand Down Expand Up @@ -70,6 +71,15 @@ class Railtie < Rails::Railtie
::SequelRails.setup ::Rails.env unless app.config.sequel[:skip_connect]
end

initializer 'sequel.spring' do |app|
if defined?(::Spring)
class ::Spring::Application
include ::SequelRails::SpringSupport
alias_method_chain :disconnect_database, :sequel
end
end
end

# Support overwriting crucial steps in subclasses
def configure_sequel(app)
rails_db_config = begin
Expand Down
13 changes: 13 additions & 0 deletions lib/sequel_rails/railties/spring_support.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module SequelRails
module SpringSupport
def disconnect_database_with_sequel
Sequel::DATABASES.each { |db| db.disconnect } if sequel_configured?
disconnect_database_without_sequel
end

private
def sequel_configured?
defined?(Sequel::DATABASES)
end
end
end