Skip to content

Commit

Permalink
refatctoring of some code repetition in spawn_methods
Browse files Browse the repository at this point in the history
  • Loading branch information
acapilleri committed Dec 31, 2012
1 parent 2b773e1 commit 1564b08
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions activerecord/lib/active_record/relation/spawn_methods.rb
Expand Up @@ -50,22 +50,24 @@ def merge!(other) # :nodoc:
# Post.order('id asc').except(:order) # discards the order condition
# Post.where('id > 10').order('id asc').except(:where) # discards the where condition but keeps the order
def except(*skips)
result = Relation.new(klass, table, values.except(*skips))
result.default_scoped = default_scoped
result.extend(*extending_values) if extending_values.any?
result
relation_with values.except(*skips)
end

# Removes any condition from the query other than the one(s) specified in +onlies+.
#
# Post.order('id asc').only(:where) # discards the order condition
# Post.order('id asc').only(:where, :order) # uses the specified order
def only(*onlies)
result = Relation.new(klass, table, values.slice(*onlies))
result.default_scoped = default_scoped
result.extend(*extending_values) if extending_values.any?
result
relation_with values.slice(*onlies)
end

private

def relation_with(values) # :nodoc:
result = Relation.new(klass, table, values)
result.default_scoped = default_scoped
result.extend(*extending_values) if extending_values.any?
result
end
end
end

0 comments on commit 1564b08

Please sign in to comment.