Skip to content

Commit 1aeeb02

Browse files
committed
Fix ActiveRecord connect/disconect
1 parent 61cb51b commit 1aeeb02

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

lib/spring/application.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,11 @@ def loaded_application_features
246246
end
247247

248248
def disconnect_database
249-
ActiveRecord::Base.remove_connection if defined?(ActiveRecord::Base)
249+
ActiveRecord::Base.remove_connection if active_record_configured?
250250
end
251251

252252
def connect_database
253-
ActiveRecord::Base.establish_connection if defined?(ActiveRecord::Base)
253+
ActiveRecord::Base.establish_connection if active_record_configured?
254254
end
255255

256256
# This feels very naughty
@@ -289,5 +289,12 @@ def reset_streams
289289
[STDOUT, STDERR].each { |stream| stream.reopen(spring_env.log_file) }
290290
STDIN.reopen("/dev/null")
291291
end
292+
293+
private
294+
295+
def active_record_configured?
296+
defined?(ActiveRecord::Base) && ActiveRecord::Base.configurations.present?
297+
end
298+
292299
end
293300
end

0 commit comments

Comments
 (0)