squeel 0.9.4 → 0.9.5

data/lib/squeel/adapters/active_record/3.1/relation_extensions.rb

@@ -135,24 +135,20 @@ module Squeel
 
           association_joins         = buckets['association_join'] || []
           stashed_association_joins = buckets['stashed_join'] || []
-          join_nodes                = buckets['join_node'] || []
+          join_nodes                = (buckets['join_node'] || []).uniq
           string_joins              = (buckets['string_join'] || []).map { |x|
             x.strip
           }.uniq
 
-          join_list = custom_join_ast(manager, string_joins)
+          join_list = join_nodes + custom_join_ast(manager, string_joins)
 
-          # All of this duplication just to add
+          # All of that duplication just to do this...
           self.join_dependency = JoinDependency.new(
             @klass,
             association_joins,
             join_list
           )
 
-          join_nodes.each do |join|
-            join_dependency.alias_tracker.aliased_name_for(join.left.name.downcase)
-          end
-
           join_dependency.graft(*stashed_association_joins)
 
           @implicit_readonly = true unless association_joins.empty? && stashed_association_joins.empty?
@@ -161,7 +157,6 @@ module Squeel
             association.join_to(manager)
           end
 
-          manager.join_sources.concat join_nodes.uniq
           manager.join_sources.concat join_list
 
           manager

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

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

@@ -477,6 +477,10 @@ module Squeel
             relation = Person.joins(:authored_article_comments)
             relation.first.authored_article_comments.first.should eq Comment.first
           end
+          
+          it 'creates a unique join when joining a table used in a has_many :through association' do
+            Person.first.authored_article_comments.joins(:article).first.should eq Comment.first
+          end
 
           it 'joins polymorphic belongs_to associations' do
             relation = Note.joins{notable(Article)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70129585123660 !ruby/object:Gem::Requirement
+  requirement: &70289249898780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129585123660
+  version_requirements: *70289249898780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70129585122480 !ruby/object:Gem::Requirement
+  requirement: &70289249898020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70129585122480
+  version_requirements: *70289249898020
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70129585121660 !ruby/object:Gem::Requirement
+  requirement: &70289249897260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70129585121660
+  version_requirements: *70289249897260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70129585121080 !ruby/object:Gem::Requirement
+  requirement: &70289249896240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70129585121080
+  version_requirements: *70289249896240
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70129585120560 !ruby/object:Gem::Requirement
+  requirement: &70289249894040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70129585120560
+  version_requirements: *70289249894040
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70129585135820 !ruby/object:Gem::Requirement
+  requirement: &70289249893140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70129585135820
+  version_requirements: *70289249893140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70129585134740 !ruby/object:Gem::Requirement
+  requirement: &70289249892520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70129585134740
+  version_requirements: *70289249892520
 description: ! "\n      Squeel unlocks the power of ARel in your Rails 3 application
   with\n      a handy block-based syntax. You can write subqueries, access named\n
   \     functions provided by your RDBMS, and more, all without writing\n      SQL