squeel 0.8.6 → 0.8.7

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

@@ -38,14 +38,14 @@ module Squeel
         # already bound to the proper table.
         #
         # Squeel, on the other hand, needs to do its best to ensure the predicates are still
-        # winding up against the proper table. Merging relations is a really nifty shortcut
-        # but another little corner of ActiveRecord where the magic quickly fades. :(
-        def merge(r, association_name = nil)
-          if association_name || relation_with_different_base?(r)
-            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)
+        # winding up against the proper table. The most "correct" way I can think of to do
+        # this is to try to emulate the default AR behavior -- that is, de-squeelifying
+        # the *_values, erm... values by visiting them and converting them to ARel nodes
+        # before merging. Merging relations is a nifty little trick, but it's another
+        # little corner of ActiveRecord where the magic quickly fades. :(
+        def merge(r)
+          if relation_with_different_base?(r)
+            r = r.clone.visit!
           end
 
           super(r)
@@ -56,11 +56,6 @@ module Squeel
           base_class.name != r.klass.base_class.name
         end
 
-        def infer_association_for_relation_merge(r)
-          default_association = reflect_on_all_associations.detect {|a| a.class_name == r.klass.name}
-          default_association ? default_association.name : r.table_name.to_sym
-        end
-
         def prepare_relation_for_association_merge!(r, association_name)
           r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_visit?(w) ? {association_name => w} : w}
           r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_visit?(h) ? {association_name => h} : h}
@@ -71,6 +66,19 @@ module Squeel
           r.includes_values.map! {|i| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(i.class) ? {association_name => i} : i}
         end
 
+        def visit!
+          predicate_viz = predicate_visitor
+          attribute_viz = attribute_visitor
+
+          @where_values = predicate_viz.accept((@where_values - ['']).uniq)
+          @having_values = predicate_viz.accept(@having_values.uniq.reject{|h| h.blank?})
+          @group_values = attribute_viz.accept(@group_values.uniq.reject{|g| g.blank?})
+          @order_values = attribute_viz.accept(@order_values.uniq.reject{|o| o.blank?})
+          @select_values = attribute_viz.accept(@select_values.uniq)
+
+          self
+        end
+
         def build_arel
           arel = table
 

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

@@ -38,13 +38,14 @@ module Squeel
         # already bound to the proper table.
         #
         # Squeel, on the other hand, needs to do its best to ensure the predicates are still
-        # winding up against the proper table. Merging relations is a really nifty shortcut
-        # but another little corner of ActiveRecord where the magic quickly fades. :(
-        def merge(r, association_name = nil)
-          if association_name || relation_with_different_base?(r)
-            r = r.clone
-            association_name ||= infer_association_for_relation_merge(r)
-            prepare_relation_for_association_merge!(r, association_name)
+        # winding up against the proper table. The most "correct" way I can think of to do
+        # this is to try to emulate the default AR behavior -- that is, de-squeelifying
+        # the *_values, erm... values by visiting them and converting them to ARel nodes
+        # before merging. Merging relations is a nifty little trick, but it's another
+        # little corner of ActiveRecord where the magic quickly fades. :(
+        def merge(r)
+          if relation_with_different_base?(r)
+            r = r.clone.visit!
           end
 
           super(r)
@@ -55,11 +56,6 @@ module Squeel
           base_class.name != r.klass.base_class.name
         end
 
-        def infer_association_for_relation_merge(r)
-          default_association = reflect_on_all_associations.detect {|a| a.class_name == r.klass.name}
-          default_association ? default_association.name : r.table_name.to_sym
-        end
-
         def prepare_relation_for_association_merge!(r, association_name)
           r.where_values.map! {|w| Squeel::Visitors::PredicateVisitor.can_visit?(w) ? {association_name => w} : w}
           r.having_values.map! {|h| Squeel::Visitors::PredicateVisitor.can_visit?(h) ? {association_name => h} : h}
@@ -70,6 +66,19 @@ module Squeel
           r.includes_values.map! {|i| [Symbol, Hash, Nodes::Stub, Nodes::Join, Nodes::KeyPath].include?(i.class) ? {association_name => i} : i}
         end
 
+        def visit!
+          predicate_viz = predicate_visitor
+          attribute_viz = attribute_visitor
+
+          @where_values = predicate_viz.accept((@where_values - ['']).uniq)
+          @having_values = predicate_viz.accept(@having_values.uniq.reject{|h| h.blank?})
+          @group_values = attribute_viz.accept(@group_values.uniq.reject{|g| g.blank?})
+          @order_values = attribute_viz.accept(@order_values.uniq.reject{|o| o.blank?})
+          @select_values = attribute_viz.accept(@select_values.uniq)
+
+          self
+        end
+
         def build_arel
           arel = table.from table
 
@@ -263,7 +272,7 @@ module Squeel
         end
 
         def collapse_wheres(arel, wheres)
-          wheres = [wheres] unless Array === wheres
+          wheres = Array(wheres)
           binaries = wheres.grep(Arel::Nodes::Binary)
 
           groups = binaries.group_by {|b| [b.class, b.left]}

data/lib/squeel/nodes/binary.rb

@@ -21,9 +21,9 @@ module Squeel
 
       # Comparison with other nodes
       def eql?(other)
-        self.class == other.class &&
-        self.left  == other.left &&
-        self.right == other.right
+        self.class.eql?(other.class) &&
+        self.left.eql?(other.left) &&
+        self.right.eql?(other.right)
       end
       alias :== :eql?
 

data/lib/squeel/nodes/join.rb

@@ -52,10 +52,10 @@ module Squeel
 
       # Compare with other objects
       def eql?(other)
-        self.class == other.class &&
-        self._name  == other._name &&
-        self._type == other._type &&
-        self._klass == other._klass
+        self.class.eql?(other.class) &&
+        self._name.eql?(other._name) &&
+        self._type.eql?(other._type) &&
+        self._klass.eql?(other._klass)
       end
       alias :== :eql?
 

data/lib/squeel/nodes/key_path.rb

@@ -42,10 +42,10 @@ module Squeel
 
       # Object comparison
       def eql?(other)
-        self.class == other.class &&
-        self.path == other.path &&
+        self.class.eql?(other.class) &&
+        self.path.eql?(other.path) &&
         self.endpoint.eql?(other.endpoint) &&
-        self.absolute? == other.absolute?
+        self.absolute?.eql?(other.absolute?)
       end
 
       # Allow KeyPath to function like its endpoint, in the case where its endpoint
@@ -161,6 +161,7 @@ module Squeel
       # @return [KeyPath] The updated KeyPath
       def method_missing(method_id, *args)
         super if method_id == :to_ary
+
         if endpoint.respond_to? method_id
           @endpoint = @endpoint.send(method_id, *args)
           self

data/lib/squeel/nodes/literal.rb

@@ -42,8 +42,8 @@ module Squeel
 
       # Object comparison
       def eql?(other)
-        self.class == other.class &&
-        self.expr == other.expr
+        self.class.eql?(other.class) &&
+        self.expr.eql?(other.expr)
       end
 
       # To support object equality tests

data/lib/squeel/nodes/nary.rb

@@ -33,10 +33,15 @@ module Squeel
         self
       end
 
+      # Implemented for equality testing
+      def hash
+        [self.class].concat(self.children).hash
+      end
+
       # Object comparison
       def eql?(other)
-        self.class     == other.class &&
-        self.children  == other.children
+        self.class.eql?(other.class) &&
+        self.children.eql?(other.children)
       end
       alias :== :eql?
 

data/lib/squeel/nodes/stub.rb

@@ -37,8 +37,8 @@ module Squeel
 
       # Object comparison
       def eql?(other)
-        self.class == other.class &&
-        self.symbol == other.symbol
+        self.class.eql?(other.class) &&
+        self.symbol.eql?(other.symbol)
       end
 
       # To support object equality tests

data/lib/squeel/nodes/unary.rb

@@ -18,8 +18,8 @@ module Squeel
 
       # Object comparison
       def eql?(other)
-        self.class == other.class &&
-        self.expr  == other.expr
+        self.class.eql?(other.class) &&
+        self.expr.eql?(other.expr)
       end
       alias :== :eql?
 

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

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

@@ -189,6 +189,15 @@ module Squeel
             arel.to_sql.should match /ORDER BY "parents_people_2"."id" ASC/
           end
 
+          it 'does not inadvertently convert KeyPaths to booleans when uniqing where_values' do
+            100.times do # Doesn't happen reliably because of #hash behavior
+              persons = Person.joins{[outgoing_messages.outer, incoming_messages.outer]}
+              persons = persons.where { (outgoing_messages.author_id.not_eq 7) & (incoming_messages.author_id.not_eq 7) }
+              persons = persons.where{(outgoing_messages.recipient_id.not_eq 7) & (incoming_messages.recipient_id.not_eq 7)}
+              expect { persons.to_sql }.not_to raise_error TypeError
+            end
+          end
+
         end
 
         describe '#to_sql' do
@@ -616,7 +625,7 @@ module Squeel
           end
 
           it 'merges relations with a different base' do
-            relation = Person.where{name == 'bob'}.joins(:articles).merge(Article.where{title == 'Hello world!'}, :articles)
+            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/squeel/visitors/predicate_visitor_spec.rb

@@ -369,4 +369,4 @@ module Squeel
 
     end
   end
-end
+end

data/spec/support/schema.rb

@@ -16,6 +16,15 @@ class Person < ActiveRecord::Base
              :source => :comments
   has_many   :notes, :as => :notable
   has_many   :unidentified_objects
+
+  has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
+  has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
+
+end
+
+class Message < ActiveRecord::Base
+  belongs_to :author, :class_name => 'Person'
+  belongs_to :recipient, :class_name => 'Person'
 end
 
 class UnidentifiedObject < ActiveRecord::Base
@@ -55,6 +64,11 @@ module Schema
           t.integer  :salary
         end
 
+        create_table :messages, :force => true do |t|
+          t.integer :author_id
+          t.integer :recipient_id
+        end
+
         create_table :unidentified_objects, :id => false, :force => true do |t|
           t.integer  :person_id
           t.string   :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-01 00:00:00.000000000 -04:00
-default_executable: 
+date: 2011-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70148779727860 !ruby/object:Gem::Requirement
+  requirement: &70170737358180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148779727860
+  version_requirements: *70170737358180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70148779727360 !ruby/object:Gem::Requirement
+  requirement: &70170737357560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70148779727360
+  version_requirements: *70170737357560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70148779726900 !ruby/object:Gem::Requirement
+  requirement: &70170737356940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70148779726900
+  version_requirements: *70170737356940
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70148779726440 !ruby/object:Gem::Requirement
+  requirement: &70170737356480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70148779726440
+  version_requirements: *70170737356480
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70148779725980 !ruby/object:Gem::Requirement
+  requirement: &70170737356000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70148779725980
+  version_requirements: *70170737356000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70148779725520 !ruby/object:Gem::Requirement
+  requirement: &70170737355320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70148779725520
+  version_requirements: *70170737355320
 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
@@ -170,7 +169,6 @@ files:
 - spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb
 - squeel.gemspec
-has_rdoc: true
 homepage: http://metautonomo.us/projects/squeel
 licenses: []
 post_install_message: ! '
@@ -204,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3, improved.