From 6370e69143b5edce1b61135259e1f81006aaee6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 18 Feb 2014 12:04:26 -0300 Subject: Document the default scopes change on the release notes, CHANGELOG and upgrating guides [ci skip] --- activerecord/CHANGELOG.md | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 458b9d77c2..926270ddda 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,64 @@ +* Default scopes are no longer overriden by chained conditions. + + Before this change when you defined a `default_scope` in a model + it was overriden by chained conditions in the same field. Now it + is merged like any other scope. + + Before: + + class User < ActiveRecord::Base + default_scope { where state: 'pending' } + scope :active, -> { where state: 'active' } + scope :inactive, -> { where state: 'inactive' } + end + + User.all + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + + User.active + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' + + User.where(state: 'inactive') + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' + + After: + + class User < ActiveRecord::Base + default_scope { where state: 'pending' } + scope :active, -> { where state: 'active' } + scope :inactive, -> { where state: 'inactive' } + end + + User.all + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + + User.active + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'active' + + User.where(state: 'inactive') + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'pending' AND "users"."status" = 'inactive' + + To get the previous behavior it is needed to explicitly remove the + `default_scope` condition using `unscoped`, `unscope`, `rewhere` or + `except`. + + Example: + + class User < ActiveRecord::Base + default_scope { where state: 'pending' } + scope :active, -> { unescope(where: :state).where(state: 'active') } + scope :inactive, -> { rewhere state: 'inactive' } + end + + User.all + # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + + User.active + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'active' + + User.inactive + # => SELECT "users".* FROM "users" WHERE "users"."status" = 'inactive' + * Perform necessary deeper encoding when hstore is inside an array. Fixes #11135. -- cgit v1.2.3 From 967a6dc8985ee5d9956b23ba23f0f9d39a0c07d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 18 Feb 2014 12:08:51 -0300 Subject: Fix the column name [ci skip] --- activerecord/CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'activerecord') 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. -- cgit v1.2.3 From fc641a1a5b2162530482697bc1fec2a6d4ca1d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Tue, 18 Feb 2014 13:48:26 -0300 Subject: Don't use `# =>` when it is not the expression values [ci skip] --- activerecord/CHANGELOG.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 337730b831..51de53a277 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -13,13 +13,13 @@ end User.all - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.where(state: 'inactive') - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' After: @@ -30,13 +30,13 @@ end User.all - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'active' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = 'active' User.where(state: 'inactive') - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' AND "users"."state" = '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 @@ -51,13 +51,13 @@ end User.all - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'pending' User.active - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'active' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'active' User.inactive - # => SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' + # SELECT "users".* FROM "users" WHERE "users"."state" = 'inactive' * Perform necessary deeper encoding when hstore is inside an array. -- cgit v1.2.3