Permalink
Browse files

Added ActiveRecord::Relation tests. Allow Relation to accept conditional

hashes and arrays like #find does.
  • Loading branch information...
1 parent ca1e62f commit c1cbf02e3170f1004daf4a146cbc41176c2458d3 @miloops miloops committed Jul 31, 2009
@@ -663,7 +663,11 @@ def last(*args)
# This is an alias for find(:all). You can pass in all the same arguments to this method as you can
# to find(:all)
def all(*args)
- construct_finder_arel(*args)
+ if args.empty? && !scoped?(:find)
+ arel_table
+ else
+ construct_finder_arel(*args)
+ end
end
# Executes a custom SQL query against your database and returns all the results. The results will
@@ -2992,7 +2996,7 @@ def attributes_protected_by_default
end
def arel_table(reload = nil)
- @arel_table = Relation.new(self, self.class.table_name) if reload || @arel_table.nil?
+ @arel_table = Relation.new(self.class, self.class.table_name) if reload || @arel_table.nil?
@arel_table
end
@@ -1,7 +1,7 @@
module ActiveRecord
class Relation
delegate :delete, :to_sql, :to => :relation
- CLAUSES_METHODS = ["where", "join", "project", "group", "order", "take", "skip"].freeze
+ CLAUSES_METHODS = ["project", "group", "order", "take", "skip"].freeze
attr_reader :relation, :klass
def initialize(klass, table = nil)
@@ -27,6 +27,19 @@ def #{clause}(_#{clause})
}
end
+ def join(joins)
+ @relation = @relation.join(@klass.send(:construct_join, joins, nil)) if !joins.blank?
+ self
+ end
+
+ def where(conditions)
+ if !conditions.blank?
+ conditions = @klass.send(:merge_conditions, conditions) if [String, Hash, Array].include?(conditions.class)
+ @relation = @relation.where(conditions)
+ end
+ self
+ end
+
private
def method_missing(method, *args, &block)
if @relation.respond_to?(method)
@@ -0,0 +1,78 @@
+require "cases/helper"
+require 'models/post'
+require 'models/topic'
+require 'models/reply'
+require 'models/author'
+require 'models/entrant'
+require 'models/developer'
+require 'models/company'
+
+class RealtionTest < ActiveRecord::TestCase
+ fixtures :authors, :topics, :entrants, :developers, :companies, :developers_projects, :accounts, :categories, :categorizations, :posts
+
+ def test_finding_with_conditions
+ authors = Author.all.where("name = 'David'")
+
+ assert_equal Author.find(:all, :conditions => "name = 'David'"), authors.to_a
+ end
+
+ def test_finding_with_order
+ topics = Topic.all.order('id')
+ assert_equal 4, topics.size
+ assert_equal topics(:first).title, topics.first.title
+ end
+
+ def test_finding_with_order_and_take
+ entrants = Entrant.all.order("id ASC").take(2).to_a
+
+ assert_equal(2, entrants.size)
+ assert_equal(entrants(:first).name, entrants.first.name)
+ end
+
+ def test_finding_with_order_limit_and_offset
+ entrants = Entrant.all.order("id ASC").take(2).skip(1)
+
+ assert_equal(2, entrants.size)
+ assert_equal(entrants(:second).name, entrants.first.name)
+
+ entrants = Entrant.all.order("id ASC").take(2).skip(2)
+ assert_equal(1, entrants.size)
+ assert_equal(entrants(:third).name, entrants.first.name)
+ end
+
+ def test_finding_with_group
+ developers = Developer.all.group("salary").project("salary").to_a
+ assert_equal 4, developers.size
+ assert_equal 4, developers.map(&:salary).uniq.size
+ end
+
+ def test_finding_with_hash_conditions_on_joined_table
+ firms = DependentFirm.all.join(:account).where({:name => 'RailsCore', :accounts => { :credit_limit => 55..60 }}).to_a
+ assert_equal 1, firms.size
+ assert_equal companies(:rails_core), firms.first
+ end
+
+ def test_find_all_with_join
+ developers_on_project_one = Developer.all.join('LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id').where('project_id=1').to_a
+
+ assert_equal 3, developers_on_project_one.length
+ developer_names = developers_on_project_one.map { |d| d.name }
+ assert developer_names.include?('David')
+ assert developer_names.include?('Jamis')
+ end
+
+ def test_find_on_hash_conditions
+ assert_equal Topic.find(:all, :conditions => {:approved => false}), Topic.all.where({ :approved => false }).to_a
+ end
+
+ def test_joins_with_string_array
+ person_with_reader_and_post = Post.all.join([
+ "INNER JOIN categorizations ON categorizations.post_id = posts.id",
+ "INNER JOIN categories ON categories.id = categorizations.category_id AND categories.type = 'SpecialCategory'"
+ ]
+ ).to_a
+ assert_equal 1, person_with_reader_and_post.size
+ end
+
+end
+

0 comments on commit c1cbf02

Please sign in to comment.