File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -246,11 +246,11 @@ def loaded_application_features
246
246
end
247
247
248
248
def disconnect_database
249
- ActiveRecord ::Base . remove_connection if defined? ( ActiveRecord :: Base )
249
+ ActiveRecord ::Base . remove_connection if active_record_configured?
250
250
end
251
251
252
252
def connect_database
253
- ActiveRecord ::Base . establish_connection if defined? ( ActiveRecord :: Base )
253
+ ActiveRecord ::Base . establish_connection if active_record_configured?
254
254
end
255
255
256
256
# This feels very naughty
@@ -289,5 +289,12 @@ def reset_streams
289
289
[ STDOUT , STDERR ] . each { |stream | stream . reopen ( spring_env . log_file ) }
290
290
STDIN . reopen ( "/dev/null" )
291
291
end
292
+
293
+ private
294
+
295
+ def active_record_configured?
296
+ defined? ( ActiveRecord ::Base ) && ActiveRecord ::Base . configurations . present?
297
+ end
298
+
292
299
end
293
300
end
You can’t perform that action at this time.
0 commit comments