diff options
| -rw-r--r-- | activerecord/CHANGELOG.md | 12 | ||||
| -rw-r--r-- | guides/source/active_record_querying.md | 4 | ||||
| -rw-r--r-- | guides/source/upgrading_ruby_on_rails.md | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 926270ddda..337730b831 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -16,10 +16,10 @@ # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.where(state: 'inactive') - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' After: @@ -33,10 +33,10 @@ # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'active' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'active' User.where(state: 'inactive') - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'inactive' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'inactive' To get the previous behavior it is needed to explicitly remove the `default_scope` condition using `unscoped`, `unscope`, `rewhere` or @@ -54,10 +54,10 @@ # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.inactive - # => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' * Perform necessary deeper encoding when hstore is inside an array. diff --git a/guides/source/active_record_querying.md b/guides/source/active_record_querying.md index 31d109a1ca..6f02da3423 100644 --- a/guides/source/active_record_querying.md +++ b/guides/source/active_record_querying.md @@ -1275,10 +1275,10 @@ User.all # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'active' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'active' User.where(state: 'inactive') -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'inactive' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'inactive' ``` As you can see above the `default_scope` is being merged in both diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 74cfa23649..d2b0b084b4 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -283,10 +283,10 @@ User.all # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.where(state: 'inactive') -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' ``` After: @@ -302,10 +302,10 @@ User.all # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'active' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'active' User.where(state: 'inactive') -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'inactive' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'inactive' ``` To get the previous behavior it is needed to explicitly remove the @@ -323,10 +323,10 @@ User.all # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.inactive -# => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' +# => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' ``` Upgrading from Rails 3.2 to Rails 4.0 |