Merge pull request #7057 from kennyj/fix_sql_bypass_problem

Fix SqlBypass.data_column problem.

2 files changed, 15 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 5a256b040b..700621632e 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -218,7 +218,7 @@ module ActiveRecord
 
         # Look up a session by id and unmarshal its data if found.
         def find_by_session_id(session_id)
-          if record = connection.select_one("SELECT * FROM #{@@table_name} WHERE #{@@session_id_column}=#{connection.quote(session_id.to_s)}")
+          if record = connection.select_one("SELECT #{connection.quote_column_name(data_column)} AS data FROM #{@@table_name} WHERE #{connection.quote_column_name(@@session_id_column)}=#{connection.quote(session_id.to_s)}")
             new(:session_id => session_id, :marshaled_data => record['data'])
           end
         end
diff --git a/activerecord/test/cases/session_store/sql_bypass_test.rb b/activerecord/test/cases/session_store/sql_bypass_test.rb
index 6749d4ce98..b8cf4cf2cc 100644
--- a/activerecord/test/cases/session_store/sql_bypass_test.rb
+++ b/activerecord/test/cases/session_store/sql_bypass_test.rb
@@ -56,6 +56,20 @@ module ActiveRecord
         s.destroy
         assert_nil SqlBypass.find_by_session_id session_id
       end
+
+      def test_data_column
+        SqlBypass.drop_table! if exists = Session.table_exists?
+        old, SqlBypass.data_column = SqlBypass.data_column, 'foo'
+        SqlBypass.create_table!
+
+        session_id = 20
+        SqlBypass.new(:data => 'hello', :session_id => session_id).save
+        assert_equal 'hello', SqlBypass.find_by_session_id(session_id).data
+      ensure
+        SqlBypass.drop_table!
+        SqlBypass.data_column = old
+        SqlBypass.create_table! if exists
+      end
     end
   end
 end