kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #41892 from kamipo/fix_default_scope_table_alias

Browse source 
Fix user-defined `self.default_scope` to respect table alias
This commit is contained in:
Ryuta Kamizono 2021-04-09 20:22:05 +09:00 committed by GitHub
commit f7e19dee02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/scoping/default.rb
View file

@ -146,9 +146,7 @@ module ActiveRecord
if default_scope_override
# The user has defined their own default scope method, so call that
evaluate_default_scope do
if scope = default_scope
relation.merge!(scope)
end
relation.scoping { default_scope }
end
elsif default_scopes.any?
evaluate_default_scope do

7
activerecord/test/cases/adapters/postgresql/schema_test.rb
View file

@ -76,6 +76,7 @@ class SchemaTest < ActiveRecord::PostgreSQLTestCase
class Album < ActiveRecord::Base
self.table_name = "music.albums"
has_and_belongs_to_many :songs
def self.default_scope; where(deleted: false); end
end
def setup
@ -149,14 +150,14 @@ class SchemaTest < ActiveRecord::PostgreSQLTestCase
ActiveRecord::Base.connection.drop_schema "music", if_exists: true
ActiveRecord::Base.connection.create_schema "music"
ActiveRecord::Base.connection.execute <<~SQL
CREATE TABLE music.albums (id serial primary key);
CREATE TABLE music.albums (id serial primary key, deleted boolean default false);
CREATE TABLE music.songs (id serial primary key);
CREATE TABLE music.albums_songs (album_id integer, song_id integer);
SQL
song = Song.create
Album.create
assert_equal song, Song.includes(:albums).references(:albums).first
album = song.albums.create
assert_equal song, Song.includes(:albums).where("albums.id": album.id).first
ensure
ActiveRecord::Base.connection.drop_schema "music", if_exists: true
end