diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-14 10:05:02 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-07-14 10:05:02 -0700 |
| commit | 11563001daaa98112c7fed939ae95fca06489509 (patch) | |
| tree | c5689c47d4ec5e0e57b811daa26ac692d75a5fbd /activerecord/lib | |
| parent | b7ad71ba12ed8bf94b0f00584e6dc04a57795d53 (diff) | |
| parent | cd44862d7269c5ffe75a4947482918a7d4f1bb2e (diff) | |
| download | rails-11563001daaa98112c7fed939ae95fca06489509.tar.gz rails-11563001daaa98112c7fed939ae95fca06489509.tar.bz2 rails-11563001daaa98112c7fed939ae95fca06489509.zip | |
Merge pull request #7057 from kennyj/fix_sql_bypass_problem
Fix SqlBypass.data_column problem.
Diffstat (limited to 'activerecord/lib')
| -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 |