github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Relation#joins! should know what to join instead of delegating to

Browse Source 
construct_join.
This commit is contained in:
Emilio Tagua
2009-08-18 08:18:24 -03:00
parent 08f6af2d53
commit fa8f5c2667
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
activerecord/lib/active_record/relation.rb
View File

@@ -1,7 +1,7 @@
module ActiveRecord
class Relation
delegate :delete, :to_sql, :to => :relation
CLAUSES_METHODS = ["project", "where", "group", "order", "take", "skip", "on"].freeze
CLAUSES_METHODS = ["group", "order", "on"].freeze
attr_reader :relation, :klass
def initialize(klass, table = nil)
@@ -31,7 +31,6 @@ module ActiveRecord
}
end
def select!(selection)
@relation = @relation.project(selection) if selection
self
@@ -47,12 +46,19 @@ module ActiveRecord
self
end
def joins!(join, join_type = nil)
if !join.blank?
if [String, Hash, Array, Symbol].include?(join.class)
@relation = @relation.join(@klass.send(:construct_join, join, nil))
def joins!(joins, join_type = nil)
if !joins.blank?
@relation = case joins
when String
@relation.join(joins)
when Hash, Array, Symbol
if @klass.send(:array_of_strings?, joins)
@relation.join(joins.join(' '))
else
@relation.join(@klass.send(:build_association_joins, joins))
end
else
@relation = @relation.join(join, join_type)
@relation.join(joins, join_type)
end
end
self