From ac465d5dd2220acba26947ed3c6d29c11287e333 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 30 May 2012 17:26:15 -0700 Subject: Merge pull request #6558 from parndt/fix_regression Fix regression --- activerecord/lib/active_record/base.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8c8717b759..9746efc7d1 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -450,12 +450,12 @@ module ActiveRecord #:nodoc: private def relation #:nodoc: - relation ||= Relation.new(self, arel_table) + @relation ||= Relation.new(self, arel_table) if finder_needs_type_condition? - relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name) + @relation.where(type_condition).create_with(inheritance_column.to_sym => sti_name) else - relation + @relation end end end @@ -489,6 +489,7 @@ module ActiveRecord #:nodoc: @marked_for_destruction = false @previously_changed = {} @changed_attributes = {} + @relation = nil ensure_proper_type -- cgit v1.2.3 From d3e5d1c295365238412fc3aa2666d09ddb69bb1d Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 31 May 2012 10:19:29 -0700 Subject: updating changelogs --- activerecord/CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 8dab1f3db0..4c81698517 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,4 +1,4 @@ -## Rails 3.2.4 (unreleased) ## +## Rails 3.2.4 (May 31, 2012) ## * Perf fix: Don't load the records when doing assoc.delete_all. GH #6289. *Jon Leighton* @@ -7,6 +7,12 @@ This could cause infinite recursion and potentially other problems. See GH #5667. *Jon Leighton* +* Datetime attributes are forced to be changed. GH #3965 + +* Fix attribute casting. GH #5549 + +* Fix #5667. Preloading should ignore scoping. + ## Rails 3.2.3 (March 30, 2012) ## * Added find_or_create_by_{attribute}! dynamic method. *Andrew White* -- cgit v1.2.3 From 44aca7b29502995b3e2ed94f7288646f134ff612 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 31 May 2012 10:23:39 -0700 Subject: adding security notifications to CHANGELOGs --- activerecord/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 4c81698517..6767fb74f5 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -13,6 +13,9 @@ * Fix #5667. Preloading should ignore scoping. +* Predicate builder should not recurse for determining where columns. + Thanks to Ben Murphy for reporting this! CVE-2012-2661 + ## Rails 3.2.3 (March 30, 2012) ## * Added find_or_create_by_{attribute}! dynamic method. *Andrew White* -- cgit v1.2.3 From febd65223e2b3a40755d23a734f6a77e04b97c88 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 31 May 2012 10:27:47 -0700 Subject: bumping to 3.2.4 --- activerecord/lib/active_record/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index d48c7a70e8..bf1c540f3e 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module ActiveRecord MAJOR = 3 MINOR = 2 TINY = 4 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end -- cgit v1.2.3