squeel 0.8.7 → 0.8.8

data/README.md

@@ -1,4 +1,4 @@
-# Squeel [![Build Status](http://travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel)
+# Squeel [![Build Status](https://secure.travis-ci.org/ernie/squeel.png)](http://travis-ci.org/ernie/squeel)
 
 Squeel lets you write your ActiveRecord queries with with fewer strings, and more Ruby,
 by making the ARel awesomeness that lies beneath ActiveRecord more accessible.

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

@@ -11,7 +11,7 @@ module Squeel
           super
           @base = object.join_base
           @engine = @base.arel_engine
-          @arel_visitor = Arel::Visitors.visitor_for @engine
+          @arel_visitor = @engine.connection.visitor
           @default_table = Arel::Table.new(@base.table_name, :as => @base.aliased_table_name, :engine => @engine)
         end
 

data/lib/squeel/version.rb

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

data/lib/squeel/visitors/predicate_visitor.rb

@@ -92,8 +92,14 @@ module Squeel
       def visit_Squeel_Nodes_Predicate(o, parent)
         value = o.value
 
-        if Nodes::KeyPath === value
+        case value
+        when Nodes::KeyPath
           value = can_visit?(value.endpoint) ? visit(value, parent) : contextualize(traverse(value, parent))[value.endpoint.to_sym]
+        when ActiveRecord::Relation
+          value = visit(
+            value.select_values.empty? ? value.select(value.klass.arel_table[value.klass.primary_key]) : value,
+            parent
+          )
         else
           value = visit(value, parent) if can_visit?(value)
         end
@@ -295,7 +301,12 @@ module Squeel
       # @param value The value to be compared against
       # @return [Arel::Nodes::Node] An ARel predicate node
       def arel_predicate_for(attribute, value, parent)
-        value = can_visit?(value) ? visit(value, parent) : value
+        if ActiveRecord::Relation === value && value.select_values.empty?
+          value = visit(value.select(value.klass.arel_table[value.klass.primary_key]), parent)
+        else
+          value = can_visit?(value) ? visit(value, parent) : value
+        end
+
         case value
         when Array
           attribute_in_array(attribute, value)

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -99,6 +99,30 @@ module Squeel
         predicate.right.should be_a Arel::Nodes::SelectStatement
       end
 
+      it 'selects the primary key of a relation with no select_values with an explicit predicate' do
+        predicate = @v.accept dsl{name.in(PersonWithNamePrimaryKey.where{name.in(['Aric Smith', 'Gladyce Kulas'])})}
+        predicate.right.should be_a Arel::Nodes::SelectStatement
+        predicate.right.to_sql.should match /SELECT "people"."name"/
+      end
+
+      it 'selects the primary key of a relation with no select_values with an implicit predicate' do
+        predicate = @v.accept(:name => PersonWithNamePrimaryKey.where{name.in(['Aric Smith', 'Gladyce Kulas'])})
+        predicate.right.should be_a Arel::Nodes::SelectStatement
+        predicate.right.to_sql.should match /SELECT "people"."name"/
+      end
+
+      it "doesn't clobber a relation value's existing select_values if present with an explicit predicate" do
+        predicate = @v.accept dsl{name.in(Person.select{name})}
+        predicate.right.should be_a Arel::Nodes::SelectStatement
+        predicate.right.to_sql.should match /SELECT "people"."name"/
+      end
+
+      it "doesn't clobber a relation value's existing select_values if present with an implicit predicate" do
+        predicate = @v.accept(:name => Person.select{name})
+        predicate.right.should be_a Arel::Nodes::SelectStatement
+        predicate.right.to_sql.should match /SELECT "people"."name"/
+      end
+
       it 'converts ActiveRecord::Base objects to their id' do
         predicate = @v.accept(:id => Person.first)
         predicate.should be_a Arel::Nodes::Equality

data/spec/support/schema.rb

@@ -19,7 +19,13 @@ class Person < ActiveRecord::Base
 
   has_many   :outgoing_messages, :class_name => 'Message', :foreign_key => :author_id
   has_many   :incoming_messages, :class_name => 'Message', :foreign_key => :recipient_id
+end
 
+class PersonWithNamePrimaryKey < ActiveRecord::Base
+  set_primary_key 'name'
+  # Set this second, because I'm lazy and don't want to populate another table,
+  # and also don't want to clobber the AR connection's primary_key cache.
+  set_table_name 'people'
 end
 
 class Message < ActiveRecord::Base

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-08 00:00:00.000000000Z
+date: 2011-08-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70170737358180 !ruby/object:Gem::Requirement
+  requirement: &70108702043340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170737358180
+  version_requirements: *70108702043340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70170737357560 !ruby/object:Gem::Requirement
+  requirement: &70108702042780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170737357560
+  version_requirements: *70108702042780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70170737356940 !ruby/object:Gem::Requirement
+  requirement: &70108702042220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70170737356940
+  version_requirements: *70108702042220
 - !ruby/object:Gem::Dependency
   name: machinist
-  requirement: &70170737356480 !ruby/object:Gem::Requirement
+  requirement: &70108702041580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *70170737356480
+  version_requirements: *70108702041580
 - !ruby/object:Gem::Dependency
   name: faker
-  requirement: &70170737356000 !ruby/object:Gem::Requirement
+  requirement: &70108702040920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.5
   type: :development
   prerelease: false
-  version_requirements: *70170737356000
+  version_requirements: *70108702040920
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70170737355320 !ruby/object:Gem::Requirement
+  requirement: &70108702040300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *70170737355320
+  version_requirements: *70108702040300
 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