squeel 0.6.1 → 0.7.0

data/lib/squeel/adapters/active_record/relation.rb

@@ -45,7 +45,6 @@ module Squeel
             r = r.clone
             association_name ||= infer_association_for_relation_merge(r)
             prepare_relation_for_association_merge!(r, association_name)
-            self.joins_values += [association_name] if reflect_on_association(association_name)
           end
 
           super(r)
@@ -64,7 +63,11 @@ module Squeel
         def prepare_relation_for_association_merge!(r, association_name)
           r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_accept?(w) ? {association_name => w} : w}
           r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_accept?(h) ? {association_name => h} : h}
-          r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join].include?(j.class) ? {association_name => j} : j}
+          r.group_values.map! {|g| Squeel::Visitors::AttributeVisitor.can_accept?(g) ? {association_name => g} : g}
+          r.order_values.map! {|o| Squeel::Visitors::AttributeVisitor.can_accept?(o) ? {association_name => o} : o}
+          r.select_values.map! {|s| Squeel::Visitors::AttributeVisitor.can_accept?(s) ? {association_name => s} : s}
+          r.joins_values.map! {|j| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(j.class) ? {association_name => j} : j}
+          r.includes_values.map! {|i| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(i.class) ? {association_name => i} : i}
         end
 
         def build_arel

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/squeel/adapters/active_record/{join_depdendency_spec.rb → join_dependency_spec.rb}

@@ -14,6 +14,12 @@ module Squeel
           end
         end
 
+        it 'joins has_many :through associations' do
+          @jd.send(:build, :authored_article_comments)
+          @jd.join_associations.should have(1).association
+          @jd.join_associations.first.table_name.should eq 'comments'
+        end
+
         it 'joins with stubs' do
           @jd.send(:build, Nodes::Stub.new(:articles) => Nodes::Stub.new(:comments))
           @jd.join_associations.should have(2).associations

data/spec/squeel/adapters/active_record/relation_spec.rb

@@ -444,6 +444,11 @@ module Squeel
             block.to_sql.should eq standard.to_sql
           end
 
+          it 'joins has_many :through associations' do
+            relation = Person.joins(:authored_article_comments)
+            relation.first.authored_article_comments.first.should eq Comment.first
+          end
+
           it 'joins polymorphic belongs_to associations' do
             relation = Note.joins{notable(Article)}
             relation.to_sql.should match /"notes"."notable_type" = 'Article'/
@@ -577,7 +582,7 @@ module Squeel
           end
 
           it 'merges relations with a different base' do
-            relation = Person.where{name == 'bob'}.merge(Article.where{title == 'Hello world!'})
+            relation = Person.where{name == 'bob'}.joins(:articles).merge(Article.where{title == 'Hello world!'})
             sql = relation.to_sql
             sql.should match /INNER JOIN "articles" ON "articles"."person_id" = "people"."id"/
             sql.should match /"people"."name" = 'bob'/

data/spec/support/schema.rb

@@ -11,7 +11,7 @@ class Person < ActiveRecord::Base
   has_many   :articles
   has_many   :comments
   has_many   :authored_article_comments, :through => :articles,
-             :class_name => 'Comment', :foreign_key => :person_id
+             :source => :comments
   has_many   :notes, :as => :notable
 end
 

metadata

@@ -2,7 +2,7 @@
 name: squeel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 Z
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -147,7 +147,7 @@ files:
 - spec/spec_helper.rb
 - spec/squeel/adapters/active_record/context_spec.rb
 - spec/squeel/adapters/active_record/join_association_spec.rb
-- spec/squeel/adapters/active_record/join_depdendency_spec.rb
+- spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
@@ -208,7 +208,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/squeel/adapters/active_record/context_spec.rb
 - spec/squeel/adapters/active_record/join_association_spec.rb
-- spec/squeel/adapters/active_record/join_depdendency_spec.rb
+- spec/squeel/adapters/active_record/join_dependency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb