Merge pull request #27503 from rails/activerecord-deprecation

Remove all ActiveRecord deprecations

3 files changed, 5 insertions, 23 deletions

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 5c809807a1..66e2804a67 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -246,6 +246,7 @@ module Rails
 
       def rails_gemfile_entry
         dev_edge_common = [
+          GemfileEntry.github("arel", "rails/arel")
         ]
         if options.dev?
           [
diff --git a/railties/test/application/bin_setup_test.rb b/railties/test/application/bin_setup_test.rb
index 0bbd25db2b..f62313f3e1 100644
--- a/railties/test/application/bin_setup_test.rb
+++ b/railties/test/application/bin_setup_test.rb
@@ -6,17 +6,10 @@ module ApplicationTests
 
     def setup
       build_app
-
-      create_gemfile
-      update_boot_file_to_use_bundler
-      @old_gemfile_env = ENV["BUNDLE_GEMFILE"]
-      ENV["BUNDLE_GEMFILE"] = app_path + "/Gemfile"
     end
 
     def teardown
       teardown_app
-
-      ENV["BUNDLE_GEMFILE"] = @old_gemfile_env
     end
 
     def test_bin_setup
@@ -47,6 +40,7 @@ module ApplicationTests
         output = `bin/setup 2>&1`
         assert_equal(<<-OUTPUT, output)
 == Installing dependencies ==
+Resolving dependencies...
 The Gemfile's dependencies are satisfied
 
 == Preparing database ==
@@ -59,16 +53,5 @@ Created database 'db/test.sqlite3'
         OUTPUT
       end
     end
-
-    private
-      def create_gemfile
-        app_file("Gemfile", "source 'https://rubygems.org'")
-        app_file("Gemfile", "gem 'rails', path: '#{RAILS_FRAMEWORK_ROOT}'", "a")
-        app_file("Gemfile", "gem 'sqlite3'", "a")
-      end
-
-      def update_boot_file_to_use_bundler
-        app_file("config/boot.rb", "require 'bundler/setup'")
-      end
   end
 end
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 32bce7d372..90927159dd 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -219,7 +219,7 @@ module ApplicationTests
       end
       require "#{app_path}/config/environment"
       ActiveRecord::Base.connection.drop_table("posts") # force drop posts table for test.
-      assert ActiveRecord::Base.connection.schema_cache.tables("posts")
+      assert ActiveRecord::Base.connection.schema_cache.data_sources("posts")
     end
 
     test "expire schema cache dump" do
@@ -227,10 +227,8 @@ module ApplicationTests
         `rails generate model post title:string;
          bin/rails db:migrate db:schema:cache:dump db:rollback`
       end
-      silence_warnings {
-        require "#{app_path}/config/environment"
-        assert !ActiveRecord::Base.connection.schema_cache.tables("posts")
-      }
+      require "#{app_path}/config/environment"
+      assert !ActiveRecord::Base.connection.schema_cache.data_sources("posts")
     end
 
     test "active record establish_connection uses Rails.env if DATABASE_URL is not set" do