Merge pull request #26950 from bouk/exclude-dbmigrate

Don't put db:migrate and db:setup in binfiles if activerecord is excluded

railties/lib/rails/generators/rails/app/templates/bin/setup → railties/lib/rails/generators/rails/app/templates/bin/setup.tt

@@ -16,6 +16,7 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
+<% unless options.skip_active_record -%>
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
@@ -24,6 +25,7 @@ chdir APP_ROOT do
 
   puts "\n== Preparing database =="
   system! 'bin/rails db:setup'
+<% end -%>
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'

railties/lib/rails/generators/rails/app/templates/bin/update → railties/lib/rails/generators/rails/app/templates/bin/update.tt

@@ -16,9 +16,11 @@ chdir APP_ROOT do
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
+<% unless options.skip_active_record -%>
 
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'
+<% end -%>
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'

railties/test/generators/app_generator_test.rb

@@ -363,6 +363,12 @@ def test_generator_if_skip_active_record_is_given
     assert_file "test/test_helper.rb" do |helper_content|
       assert_no_match(/fixtures :all/, helper_content)
     end
+    assert_file "bin/setup" do |setup_content|
+      assert_no_match(/db:setup/, setup_content)
+    end
+    assert_file "bin/update" do |update_content|
+      assert_no_match(/db:migrate/, update_content)
+    end
 
     assert_file "config/initializers/new_framework_defaults.rb" do |initializer_content|
       assert_no_match(/belongs_to_required_by_default/, initializer_content)