diff options
| author | kennyj <kennyj@gmail.com> | 2012-07-15 01:35:05 +0900 |
|---|---|---|
| committer | kennyj <kennyj@gmail.com> | 2012-07-15 01:46:02 +0900 |
| commit | cd44862d7269c5ffe75a4947482918a7d4f1bb2e (patch) | |
| tree | c5689c47d4ec5e0e57b811daa26ac692d75a5fbd /activerecord/lib/active_record | |
| parent | 088022ef262cc43318651cf7bd68e6eb4b5475f6 (diff) | |
| download | rails-cd44862d7269c5ffe75a4947482918a7d4f1bb2e.tar.gz rails-cd44862d7269c5ffe75a4947482918a7d4f1bb2e.tar.bz2 rails-cd44862d7269c5ffe75a4947482918a7d4f1bb2e.zip | |
Fix SqlBypass.data_column= problem. SqlBypass.find_by_session_id method didn't use this assignment.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/session_store.rb | 2 |
1 files changed, 1 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 |