diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-02-11 10:19:31 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-02-11 10:19:31 -0800 |
| commit | f1efecfc3f009d7b25a0b72170914a2739cb3765 (patch) | |
| tree | 15dae76219c41374722ba4a678db3c3743ae6994 /activerecord | |
| parent | 62f01bec76f7e47a5d1dd14b34f5105885de5378 (diff) | |
| parent | 1dccd44a5c74f20b0406ecc8d39373226f73af35 (diff) | |
| download | rails-f1efecfc3f009d7b25a0b72170914a2739cb3765.tar.gz rails-f1efecfc3f009d7b25a0b72170914a2739cb3765.tar.bz2 rails-f1efecfc3f009d7b25a0b72170914a2739cb3765.zip | |
Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
bumping version
remove ruby-prof
Fix issue with attr_protected where malformed input could circumvent protection
fixing call to columns hash. run the damn tests when you backport!
Bump rack dependency to 1.4.5
Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric
Conflicts:
Gemfile
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 24 | ||||
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index c450adffe2..8fcab1c8f4 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,15 +1,3 @@ -## Rails 3.2.12 (unreleased) ## - -* Quote numeric values being compared to non-numeric columns. Otherwise, - in some database, the string column values will be coerced to a numeric - allowing 0, 0.0 or false to match any string starting with a non-digit. - - Example: - - App.where(apikey: 0) # => SELECT * FROM users WHERE apikey = '0' - - *Dylan Smith* - * Don't update `column_defaults` when calling destructive methods on column with default value. Backport c517602. Fix #6115. @@ -220,6 +208,18 @@ *Gabriel Sobrinho, Ricardo Henrique* +## Rails 3.2.12 ## + +* Quote numeric values being compared to non-numeric columns. Otherwise, + in some database, the string column values will be coerced to a numeric + allowing 0, 0.0 or false to match any string starting with a non-digit. + + Example: + + App.where(apikey: 0) # => SELECT * FROM users WHERE apikey = '0' + + *Dylan Smith* + ## Rails 3.2.11 (Jan 8, 2013) ## * Fix querying with an empty hash *Damien Mathieu* [CVE-2013-0155] diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index ff9fa279f4..a340cfaf7d 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 11 + TINY = 12 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |