Rails 2.3.1
Update to the release version of Rails 2.3.1.
This commit is contained in:
parent
bd9fa0ed0c
commit
5e7d2cf973
25 changed files with 199 additions and 26 deletions
2
vendor/rails/activerecord/CHANGELOG
vendored
2
vendor/rails/activerecord/CHANGELOG
vendored
|
@ -1,4 +1,4 @@
|
|||
*2.3.1 [RC2] (February ?, 2009)*
|
||||
*2.3.1 [RC2] (March 5, 2009)*
|
||||
|
||||
* Added ActiveRecord::Base.each and ActiveRecord::Base.find_in_batches for batch processing [DHH/Jamis Buck]
|
||||
|
||||
|
|
|
@ -287,8 +287,7 @@ module ActiveRecord
|
|||
def get_session(env, sid)
|
||||
Base.silence do
|
||||
sid ||= generate_sid
|
||||
session = @@session_class.find_by_session_id(sid)
|
||||
session ||= @@session_class.new(:session_id => sid, :data => {})
|
||||
session = find_session(sid)
|
||||
env[SESSION_RECORD_KEY] = session
|
||||
[sid, session.data]
|
||||
end
|
||||
|
@ -296,7 +295,7 @@ module ActiveRecord
|
|||
|
||||
def set_session(env, sid, session_data)
|
||||
Base.silence do
|
||||
record = env[SESSION_RECORD_KEY]
|
||||
record = env[SESSION_RECORD_KEY] ||= find_session(sid)
|
||||
record.data = session_data
|
||||
return false unless record.save
|
||||
|
||||
|
@ -310,5 +309,10 @@ module ActiveRecord
|
|||
|
||||
return true
|
||||
end
|
||||
|
||||
def find_session(id)
|
||||
@@session_class.find_by_session_id(id) ||
|
||||
@@session_class.new(:session_id => id, :data => {})
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue