squeel 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.1.1 (2013-09-03)
+
+* Update relation extensions to support new count behavior in Active Record
+  4.0.1 (see rails/rails@da9b5d4a)
+* Support two-argument version of Relation#from in AR4
+* Allow equality/inequality conditions against the name of a belongs_to
+  association with an AR::Base value object. Fixes issue #265.
+
 ## 1.1.0 (2013-07-14)
 
 * Support for Active Record 4.0.0!

data/README.md

@@ -205,7 +205,7 @@ Person.where{name == 'Joe Blow'}
 Not a very exciting example since equality is handled just fine via the
 first example in standard Active Record. But consider the following query:
 
-```
+```sql
 SELECT "people".* FROM people
 WHERE ("people"."name" LIKE 'Ernie%' AND "people"."salary" < 50000)
   OR  ("people"."name" LIKE 'Joe%' AND "people"."salary" > 100000)
@@ -467,6 +467,18 @@ p.flanderized_name
 
 As you can see, just like functions, these operations can be given aliases.
 
+To select more than one attribute (or calculated attribute) simply put them into an array:
+
+```ruby
+p = Person.select{[ name.op('||', '-diddly').as(flanderized_name), 
+                    coalesce(name, '<no name given>').as(name_with_default) ]}.first
+p.flanderized_name
+# => "Aric Smith-diddly"
+p.name_with_default
+# => "Aric Smith"
+```
+
+
 ## Compatibility with Active Record
 
 Most of the new functionality provided by Squeel is accessed with the new block-style `where{}`
@@ -493,13 +505,13 @@ Person.where(:first_name => :last_name)
 
 produces this SQL query in plain Active Record:
 
-```
+```sql
 SELECT people.* FROM people WHERE people.first_name = 'last_name'.
 ```
 
 but produces this SQL query if you are using Squeel:
 
-```
+```sql
 SELECT people.* FROM people WHERE people.first_name = people.last_name
 ```
 

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

@@ -196,3 +196,14 @@ module Arel
   end
 
 end
+
+module ActiveRecord
+  module Reflection
+    class AssociationReflection < MacroReflection
+      alias :foreign_key :primary_key_name
+      def foreign_type
+        options[:foreign_type]
+      end
+    end
+  end
+end

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

@@ -49,12 +49,26 @@ module Squeel
           build_select(arel, select_visit(select_values.uniq))
 
           arel.distinct(distinct_value)
-          arel.from(from_visit(from_value)) if from_value
+          arel.from(build_from) if from_value
           arel.lock(lock_value) if lock_value
 
           arel
         end
 
+        def build_from
+          opts, name = from_visit(from_value)
+          case opts
+          when ::ActiveRecord::Relation
+            name ||= 'subquery'
+            opts.arel.as(name.to_s)
+          when ::Arel::SelectManager
+            name ||= 'subquery'
+            opts.as(name.to_s)
+          else
+            opts
+          end
+        end
+
         def build_order(arel)
           orders = order_visit(dehashified_order_values)
           orders = reverse_sql_order(attrs_to_orderings(orders)) if reverse_order_value
@@ -73,17 +87,6 @@ module Squeel
           arel.order(*orders) unless orders.empty?
         end
 
-        def build_from
-          opts, name = from_value
-          case opts
-          when Relation
-            name ||= 'subquery'
-            opts.arel.as(name.to_s)
-          else
-            opts
-          end
-        end
-
         # This is copied directly from 4.0.0's implementation, but adds an extra
         # exclusion for Squeel::Nodes::Node to fix #248. Can be removed if/when
         # rails/rails#11439 is merged.
@@ -117,7 +120,6 @@ module Squeel
             end
           }
         end
-
       end
     end
   end

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

@@ -99,6 +99,8 @@ module Squeel
             end
 
             str_select if str_select && str_select !~ /[,*]/
+          else
+            :all
           end
         end
 

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/squeel/visitors/predicate_visitation.rb

@@ -1,6 +1,7 @@
 module Squeel
   module Visitors
     module PredicateVisitation
+      EXPAND_BELONGS_TO_METHODS = [:eq, :not_eq]
 
       private
 
@@ -28,6 +29,16 @@ module Squeel
       def visit_Squeel_Nodes_Predicate(o, parent)
         value = o.value
 
+        # Short-circuit for stuff like `where{ author.eq User.first }`
+        # This filthy hack emulates similar behavior in AR PredicateBuilder
+        if ActiveRecord::Base === value &&
+          EXPAND_BELONGS_TO_METHODS.include?(o.method_name) &&
+          association = classify(parent).reflect_on_association(
+            symbolify(o.expr)
+          )
+          return expand_belongs_to(o, parent, association)
+        end
+
         case value
         when Nodes::KeyPath
           value = can_visit?(value.endpoint) ? visit(value, parent) : contextualize(traverse(value, parent))[value.endpoint.to_s]

data/lib/squeel/visitors/predicate_visitor.rb

@@ -8,6 +8,31 @@ module Squeel
 
       private
 
+      # Expand a belongs_to association that has an AR::Base value. This allows
+      # for queries like:
+      #
+      #   Post.where(:author => User.first)
+      #   Post.where{author.eq User.first}
+      #
+      # @param [Squeel::Nodes::Predicate] o A predicate node (eq/not_eq)
+      # @param parent The current parent object in the context
+      # @return [Arel::Nodes::Node] An Arel predicate node
+      def expand_belongs_to(o, parent, association)
+        context = contextualize(parent)
+        ar_base = o.value
+        conditions = [
+          context[association.foreign_key.to_s].send(o.method_name, ar_base.id)
+        ]
+        if association.options[:polymorphic]
+          conditions << [
+            context[association.foreign_type].send(
+              o.method_name, ar_base.class.base_class.name
+            )
+          ]
+        end
+        conditions.inject(o.method_name == :not_eq ? :or : :and)
+      end
+
       # Visit a Hash. This entails iterating through each key and value and
       # visiting each value in turn.
       #
@@ -47,6 +72,13 @@ module Squeel
       # @param parent The current parent object in the context
       # @return An Arel predicate
       def visit_without_hash_context_shift(k, v, parent)
+        # Short-circuit for stuff like `where(:author => User.first)`
+        # This filthy hack emulates similar behavior in AR PredicateBuilder
+        if ActiveRecord::Base === v &&
+          association = classify(parent).reflect_on_association(k.to_sym)
+          return expand_belongs_to(Nodes::Predicate.new(k, :eq, v), parent, association)
+        end
+
         case v
         when Nodes::Stub, Symbol
           v = contextualize(parent)[v.to_s]

data/lib/squeel/visitors/visitor.rb

@@ -46,6 +46,15 @@ module Squeel
 
       private
 
+      def symbolify(o)
+        case o
+        when Symbol, String, Nodes::Stub
+          o.to_sym
+        else
+          nil
+        end
+      end
+
       # A hash that caches the method name to use for a visitor for a given class
       DISPATCH = Hash.new do |hash, klass|
         hash[klass] = "visit_#{(klass.name || '').gsub('::', '_')}"

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

@@ -389,6 +389,10 @@ module Squeel
             expect { people.first.name }.to raise_error ActiveModel::MissingAttributeError
           end
 
+          it 'works with multiple fields in select' do
+            Article.select("title, body").count.should eq 51
+          end
+
           it 'allows a function in the select values via Symbol#func' do
             relation = Person.select(:max.func(:id).as('max_id'))
             relation.first.max_id.should eq 332
@@ -421,11 +425,7 @@ module Squeel
         describe '#count' do
 
           it 'works with non-strings in select' do
-            if activerecord_version_at_least '4.0.0'
-              pending 'broken on current 4-0-stable'
-            else
-              Article.select{distinct(title)}.count.should eq 51
-            end
+            Article.select{distinct(title)}.count.should eq 51
           end
 
           it 'works with non-strings in wheres' do
@@ -514,6 +514,42 @@ module Squeel
             end
           end
 
+          it 'allows equality conditions against a belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Article.where { person.eq first_person }
+            relation.to_sql.should match /"articles"."person_id" = #{first_person.id}/
+          end
+
+          it 'allows equality conditions against a polymorphic belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Note.where { notable.eq first_person }
+            relation.to_sql.should match /"notes"."notable_id" = #{first_person.id} AND "notes"."notable_type" = 'Person'/
+          end
+
+          it 'allows inequality conditions against a belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Article.where { person.not_eq first_person }
+            relation.to_sql.should match /"articles"."person_id" != #{first_person.id}/
+          end
+
+          it 'allows inequality conditions against a polymorphic belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Note.where { notable.not_eq first_person }
+            relation.to_sql.should match /\("notes"."notable_id" != #{first_person.id} OR "notes"."notable_type" != 'Person'\)/
+          end
+
+          it 'allows hash equality conditions against a belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Article.where(:person => first_person)
+            relation.to_sql.should match /"articles"."person_id" = #{first_person.id}/
+          end
+
+          it 'allows hash equality conditions against a polymorphic belongs_to with an AR::Base value' do
+            first_person = Person.first
+            relation = Note.where(:notable => first_person)
+            relation.to_sql.should match /"notes"."notable_id" = #{first_person.id} AND "notes"."notable_type" = 'Person'/
+          end
+
         end
 
         describe '#joins' do
@@ -643,6 +679,24 @@ module Squeel
             sql = block.to_sql
             sql.should match expected
           end
+
+          it 'creates froms from literals' do
+            expected = /SELECT "people".* FROM sub/
+            relation = Person.from('sub')
+            sql = relation.to_sql
+            sql.should match expected
+          end
+
+          it 'creates froms from relations' do
+            if activerecord_version_at_least '4.0.0'
+              expected = "SELECT \"people\".* FROM (SELECT \"people\".* FROM \"people\") alias"
+              relation = Person.from(Person.all, 'alias')
+              sql = relation.to_sql
+              sql.should == expected
+            else
+              pending 'Unsupported before ActiveRecord 4.0'
+            end
+          end
         end
 
         describe '#build_where' do

data/spec/support/models.rb

@@ -3,7 +3,7 @@ class Person < ActiveRecord::Base
   has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :articles
   has_many   :comments
-  if ActiveRecord::VERSION::MAJOR == 4
+  if ActiveRecord::VERSION::MAJOR > 3
     has_many   :articles_with_condition, lambda { where :title => 'Condition' },
       :class_name => 'Article'
     has_many   :article_comments_with_first_post,
@@ -17,9 +17,6 @@ class Person < ActiveRecord::Base
       :through => :articles, :source => :comments
   end
   has_many   :condition_article_comments, :through => :articles_with_condition, :source => :comments
-  if ActiveRecord::VERSION::MAJOR == 4
-  else
-  end
   has_many   :authored_article_comments, :through => :articles,
              :source => :comments
   has_many   :notes, :as => :notable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3013172818139711392
+      hash: 2299455513016806786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,10 +271,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3013172818139711392
+      hash: 2299455513016806786
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Active Record 3, improved.