aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-30 16:31:40 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-06-30 16:31:40 -0300
commitab72040b74f742b6676b2d2a5dd029bfdca25a7a (patch)
treeb53e91ea1436d932c418d77ca3dc93de0946ac97
parent49d069d797790bdfcce592f45e3cdb5d5cac3a55 (diff)
downloadrails-ab72040b74f742b6676b2d2a5dd029bfdca25a7a.tar.gz
rails-ab72040b74f742b6676b2d2a5dd029bfdca25a7a.tar.bz2
rails-ab72040b74f742b6676b2d2a5dd029bfdca25a7a.zip
Update AR and AP changelogs [ci skip]
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--activerecord/CHANGELOG.md14
2 files changed, 15 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 345b5aa330..3e10310179 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Remove Active Model dependency from Action Pack. *Guillermo Iguaran*
+
* Support unicode characters in routes. Route will be automatically escaped, so instead of manually escaping:
get Rack::Utils.escape('こんにちは') => 'home#index'
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index aeb3773c99..73f9212371 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,6 +1,18 @@
## Rails 4.0.0 (unreleased) ##
-* `ActiveRelation#inspect` no longer calls `#to_a`
+* Add `:default` and `:null` options to `column_exists?`.
+
+ column_exists?(:testings, :taggable_id, :integer, null: false)
+ column_exists?(:testings, :taggable_type, :string, default: 'Photo')
+
+ *Aleksey Magusev*
+
+* `ActiveRelation#inspect` no longer calls `#to_a`. This means that in places
+ where `#inspect` is implied (such as in the console), creating a relation
+ will not execute it anymore, you'll have to call `#to_a` when necessary:
+
+ User.where(:age => 30) # => returns the relation
+ User.where(:age => 30).to_a # => executes the query and returns the loaded objects, as before
*Brian Cardarella*