Extract ActiveRecord::SessionStore from Rails

This functionality will be available from gem
`active_record-session_store` instead.

5 files changed, 0 insertions, 55 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 7f05b2e7e1..f8ddeeb99e 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -125,8 +125,6 @@ module Rails
           case @session_store
           when :disabled
             nil
-          when :active_record_store
-            ActiveRecord::SessionStore
           when Symbol
             ActionDispatch::Session.const_get(@session_store.to_s.camelize)
           else
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 4fa990171d..a8c0626a41 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -173,7 +173,6 @@ module Rails
           "#{orm}:migration",
           "#{orm}:model",
           "#{orm}:observer",
-          "#{orm}:session_migration",
           "#{test}:controller",
           "#{test}:helper",
           "#{test}:integration",
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
index ff676280cb..4a099a4ce2 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
@@ -1,8 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
 <%= app_const %>.config.session_store :cookie_store, key: <%= "'_#{app_name}_session'" %>
-
-# Use the database for sessions instead of the cookie-based default,
-# which shouldn't be used to store highly confidential information
-# (create the session table with "rails generate session_migration").
-# <%= app_const %>.config.session_store :active_record_store
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index c2d4a0f2c8..d3bbac811c 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -163,26 +163,6 @@ module ApplicationTests
     end
 
     # AR
-    test "database middleware doesn't initialize when session store is not active_record" do
-      add_to_config <<-RUBY
-        config.root = "#{app_path}"
-        config.session_store :cookie_store, { :key => "blahblahblah" }
-      RUBY
-      require "#{app_path}/config/environment"
-
-      assert !Rails.application.config.middleware.include?(ActiveRecord::SessionStore)
-    end
-
-    test "database middleware initializes when session store is active record" do
-      add_to_config "config.session_store :active_record_store"
-
-      require "#{app_path}/config/environment"
-
-      expects = [ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::QueryCache, ActiveRecord::SessionStore]
-      middleware = Rails.application.config.middleware.map { |m| m.klass }
-      assert_equal expects, middleware & expects
-    end
-
     test "active_record extensions are applied to ActiveRecord" do
       add_to_config "config.active_record.table_name_prefix = 'tbl_'"
       require "#{app_path}/config/environment"
diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb
deleted file mode 100644
index b590047ff0..0000000000
--- a/railties/test/generators/session_migration_generator_test.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'generators/generators_test_helper'
-require 'rails/generators/rails/session_migration/session_migration_generator'
-
-class SessionMigrationGeneratorTest < Rails::Generators::TestCase
-  include GeneratorsTestHelper
-
-  def test_session_migration_with_default_name
-    run_generator
-    assert_migration "db/migrate/add_sessions_table.rb", /class AddSessionsTable < ActiveRecord::Migration/
-  end
-
-  def test_session_migration_with_given_name
-    run_generator ["create_session_table"]
-    assert_migration "db/migrate/create_session_table.rb", /class CreateSessionTable < ActiveRecord::Migration/
-  end
-
-  def test_session_migration_with_custom_table_name
-    ActiveRecord::SessionStore::Session.table_name = "custom_table_name"
-    run_generator
-    assert_migration "db/migrate/add_sessions_table.rb" do |migration|
-      assert_match(/class AddSessionsTable < ActiveRecord::Migration/, migration)
-      assert_match(/create_table :custom_table_name/, migration)
-    end
-  ensure
-    ActiveRecord::SessionStore::Session.table_name = "sessions"
-  end
-end