lib/combustion.rb in combustion-0.5.2 vs lib/combustion.rb in combustion-0.5.3

@@ -24,10 +24,12 @@
     Bundler.require :default, Rails.env
 
     Combustion::Application.configure_for_combustion
 
     if modules.map(&:to_s).include? 'active_record'
-      Combustion::Database.setup
+      Combustion::Application.config.to_prepare do
+        Combustion::Database.setup
+      end
     end
 
     Combustion::Application.initialize!
 
     RSpec.configure do |config|