squeel 1.1.1 → 1.2.1

data/lib/squeel/visitors/order_visitor.rb

@@ -11,9 +11,16 @@ module Squeel
       # @param parent The node's parent within the context
       # @return [Arel::Nodes::Ordering] An ascending or desending ordering
       def visit_Squeel_Nodes_Order(o, parent)
-        visit(o.expr, parent).send(o.descending? ? :desc : :asc)
+        if defined?(Arel::Nodes::Descending)
+          if o.descending?
+            Arel::Nodes::Descending.new(visit(o.expr, parent))
+          else
+            Arel::Nodes::Ascending.new(visit(o.expr, parent))
+          end
+        else
+          visit(o.expr, parent).send(o.descending? ? :desc : :asc)
+        end
       end
-
     end
   end
 end

data/lib/squeel/visitors/predicate_visitor.rb

@@ -49,6 +49,16 @@ module Squeel
         end
       end
 
+      def visit_Hash!(o, parent)
+        predicates = super
+
+        if predicates.size > 1
+          Arel::Nodes::Grouping.new(Arel::Nodes::And.new predicates)
+        else
+          predicates.first
+        end
+      end
+
 
       # @return [Boolean] Whether the given value implies a context change
       # @param v The value to consider
@@ -74,6 +84,7 @@ module Squeel
       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)

data/lib/squeel/visitors/preload_visitor.rb

@@ -11,6 +11,10 @@ module Squeel
         visit(object, parent)
       end
 
+      def accept!(object, parent = nil)
+        visit!(object, parent)
+      end
+
       private
 
       def visit_Hash(o, parent)
@@ -21,6 +25,14 @@ module Squeel
         end
       end
 
+      def visit_Hash!(o, parent)
+        {}.tap do |hash|
+          o.each do |key, value|
+            hash[visit!(key, parent)] = visit!(value, parent)
+          end
+        end
+      end
+
       def visit_Symbol(o, parent)
         o
       end

data/lib/squeel/visitors/visitor.rb

@@ -6,7 +6,7 @@ module Squeel
     # The Base visitor class, containing the default behavior common to subclasses.
     class Visitor
       attr_accessor :context
-      delegate :contextualize, :classify, :find, :traverse, :engine, :arel_visitor, :to => :context
+      delegate :contextualize, :classify, :find, :traverse, :engine, :arel_visitor, :find!, :traverse!, :to => :context
 
       # Create a new Visitor that uses the supplied context object to contextualize
       # visited nodes.
@@ -27,6 +27,10 @@ module Squeel
         visit(object, parent)
       end
 
+      def accept!(object, parent = context.base)
+        visit!(object, parent)
+      end
+
       # @param object The object to check
       # @return [Boolean] Whether or not the visitor can visit the given object
       def can_visit?(object)
@@ -98,6 +102,21 @@ module Squeel
         @hash_context_depth -= 1
       end
 
+      def visit_with_hash_context_shift!(k, v, parent)
+        @hash_context_depth += 1
+
+        parent = case k
+          when Nodes::KeyPath
+            traverse!(k, parent, true)
+          else
+            find!(k, parent)
+          end
+
+        can_visit?(v) ? visit!(v, parent || k) : v
+      ensure
+        @hash_context_depth -= 1
+      end
+
       # If there is no context change, the default behavior is to return the
       # value unchanged. Subclasses will alter this behavior as needed.
       #
@@ -119,9 +138,11 @@ module Squeel
       #   object if not passed as an SqlLiteral.
       def quoted?(object)
         case object
-        when NilClass, Arel::Nodes::SqlLiteral, Bignum, Fixnum,
+        when Arel::Nodes::SqlLiteral, Bignum, Fixnum,
           Arel::SelectManager
           false
+        when NilClass
+          defined?(Arel::Nodes::Quoted) ? true : false
         else
           true
         end
@@ -142,7 +163,11 @@ module Squeel
           when Range
             Range.new(quote(value.begin), quote(value.end), value.exclude_end?)
           else
-            Arel.sql(arel_visitor.accept value)
+            if defined?(Arel::Collectors::SQLString)
+              Arel.sql(arel_visitor.compile(Arel::Nodes.build_quoted(value)))
+            else
+              Arel.sql(arel_visitor.accept value)
+            end
           end
         else
           value
@@ -166,6 +191,12 @@ module Squeel
         retry
       end
 
+      def visit!(object, parent)
+        send("#{DISPATCH[object.class]}!", object, parent)
+      rescue NoMethodError => e
+        visit(object, parent)
+      end
+
       # Pass an object through the visitor unmodified. This is
       # in order to allow objects that don't require modification
       # to be handled by Arel directly.
@@ -176,6 +207,7 @@ module Squeel
       def visit_passthrough(object, parent)
         object
       end
+
       alias :visit_Fixnum :visit_passthrough
       alias :visit_Bignum :visit_passthrough
 
@@ -189,6 +221,10 @@ module Squeel
         o.map { |v| can_visit?(v) ? visit(v, parent) : v }.flatten
       end
 
+      def visit_Array!(o, parent)
+        o.map { |v| can_visit?(v) ? visit!(v, parent) : v }.flatten
+      end
+
       # Visit a Hash. This entails iterating through each key and value and
       # visiting each value in turn.
       #
@@ -205,6 +241,16 @@ module Squeel
         end.flatten
       end
 
+      def visit_Hash!(o, parent)
+        o.map do |k, v|
+          if implies_hash_context_shift?(v)
+            visit_with_hash_context_shift!(k, v, parent)
+          else
+            visit_without_hash_context_shift(k, v, parent)
+          end
+        end.flatten
+      end
+
       # Visit a symbol. This will return an attribute named after the symbol
       # against the current parent's contextualized table.
       #
@@ -240,6 +286,12 @@ module Squeel
         visit(o.endpoint, parent)
       end
 
+      def visit_Squeel_Nodes_KeyPath!(o, parent)
+        parent = traverse!(o, parent)
+
+        visit!(o.endpoint, parent)
+      end
+
       # Visit a Literal by converting it to an Arel SqlLiteral
       #
       # @param [Nodes::Literal] o The Literal to visit
@@ -255,13 +307,25 @@ module Squeel
       # @param parent The parent object in the context
       # @return [Arel::Nodes::As] The resulting as node.
       def visit_Squeel_Nodes_As(o, parent)
-        left = visit(o.left, parent)
-        # Some nodes, like Arel::SelectManager, have their own #as methods,
-        # with behavior that we don't want to clobber.
-        if left.respond_to?(:as)
-          left.as(o.right)
+        # patch for 4+, binds params using native to_sql before transforms to sql string
+        if ::ActiveRecord::VERSION::MAJOR >= 4 && o.left.is_a?(::ActiveRecord::Relation)
+          Arel::Nodes::TableAlias.new(
+            Arel::Nodes::Grouping.new(
+              Arel::Nodes::SqlLiteral.new(
+                o.left.respond_to?(:to_sql_with_binding_params) ? o.left.to_sql_with_binding_params : o.left.to_sql
+              )
+            ),
+            o.right
+          )
         else
-          Arel::Nodes::As.new(left, o.right)
+          left = visit(o.left, parent)
+          # Some nodes, like Arel::SelectManager, have their own #as methods,
+          # with behavior that we don't want to clobber.
+          if left.respond_to?(:as)
+            left.as(o.right)
+          else
+            Arel::Nodes::As.new(left, o.right)
+          end
         end
       end
 
@@ -313,18 +377,22 @@ module Squeel
       def visit_Squeel_Nodes_Function(o, parent)
         args = o.args.map do |arg|
           case arg
-          when Nodes::Function, Nodes::As, Nodes::Literal, Nodes::Grouping, Nodes::KeyPath, Nodes::KeyPath
+          when Nodes::Function, Nodes::As, Nodes::Literal, Nodes::Grouping, Nodes::KeyPath
             visit(arg, parent)
           when ActiveRecord::Relation
             arg.arel.ast
           when Symbol, Nodes::Stub
-            Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_s])
+            if defined?(Arel::Collectors::SQLString)
+              Arel.sql(arel_visitor.compile(contextualize(parent)[arg.to_s]))
+            else
+              Arel.sql(arel_visitor.accept(contextualize(parent)[arg.to_s]))
+            end
           else
             quote arg
           end
         end
 
-        Arel::Nodes::NamedFunction.new(o.function_name, args)
+        Arel::Nodes::NamedFunction.new(o.function_name.to_s, args)
       end
 
       # Visit a Squeel operation node, convering it to an Arel InfixOperation
@@ -340,7 +408,11 @@ module Squeel
           when Nodes::Function, Nodes::As, Nodes::Literal, Nodes::Grouping, Nodes::KeyPath
             visit(arg, parent)
           when Symbol, Nodes::Stub
-            Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_s])
+            if defined?(Arel::Collectors::SQLString)
+              Arel.sql(arel_visitor.compile(contextualize(parent)[arg.to_s]))
+            else
+              Arel.sql(arel_visitor.accept(contextualize(parent)[arg.to_s]))
+            end
           else
             quote arg
           end
@@ -381,6 +453,10 @@ module Squeel
         o.id
       end
 
+      def visit_Arel_Nodes_Node(o, parent)
+        o
+      end
+
     end
   end
 end

data/spec/config.travis.yml

@@ -0,0 +1,13 @@
+databases:
+  mysql:
+    database: squeel_test_examples
+    username: travis
+    encoding: utf8
+  mysql2:
+    database: squeel_test_examples
+    username: travis
+    encoding: utf8
+  postgresql:
+    database: squeel_test_examples
+    min_messages: warning
+    username: postgres

data/spec/config.yml

@@ -0,0 +1,12 @@
+databases:
+  mysql:
+    database: squeel_test_examples
+    username: squeel
+    encoding: utf8
+  mysql2:
+    database: squeel_test_examples
+    username: squeel
+    encoding: utf8
+  postgresql:
+    database: squeel_test_examples
+    min_messages: warning

data/spec/console.rb

@@ -1,6 +1,7 @@
 Bundler.setup
-require 'machinist/active_record'
-require 'sham'
+require 'pp'
+require 'active_record'
+require 'active_support'
 require 'faker'
 
 Dir[File.expand_path('../helpers/*.rb', __FILE__)].each do |f|
@@ -9,16 +10,6 @@ end
 require File.expand_path('../support/schema.rb', __FILE__)
 require File.expand_path('../support/models.rb', __FILE__)
 
-Sham.define do
-  name        { Faker::Name.name }
-  title       { Faker::Lorem.sentence }
-  body        { Faker::Lorem.paragraph }
-  salary      {|index| 30000 + (index * 1000)}
-  tag_name    { Faker::Lorem.words(3).join(' ') }
-  note        { Faker::Lorem.words(7).join(' ') }
-  object_name { Faker::Lorem.words(1).first }
-end
-
 Models.make
 
 require 'squeel'

data/spec/core_ext/symbol_spec.rb

@@ -56,13 +56,13 @@ describe Symbol do
   it 'creates inner joins' do
     join = :join.inner
     join.should be_a Squeel::Nodes::Join
-    join._type.should eq Arel::InnerJoin
+    join._type.should eq Squeel::InnerJoin
   end
 
   it 'creates outer joins' do
     join = :join.outer
     join.should be_a Squeel::Nodes::Join
-    join._type.should eq Arel::OuterJoin
+    join._type.should eq Squeel::OuterJoin
   end
 
   it 'creates as nodes' do
@@ -72,4 +72,4 @@ describe Symbol do
     as.right.should eq 'other_name'
   end
 
-end
+end

data/spec/helpers/squeel_helper.rb

@@ -1,4 +1,11 @@
 module SqueelHelper
+  JoinDependency =
+    if defined?(::ActiveRecord::Associations::JoinDependency)
+      ::ActiveRecord::Associations::JoinDependency
+    else
+      ::ActiveRecord::Associations::ClassMethods::JoinDependency
+    end
+
   def dsl(&block)
     Squeel::DSL.eval(&block)
   end
@@ -16,11 +23,7 @@ module SqueelHelper
   end
 
   def new_join_dependency(*args)
-    if defined?(ActiveRecord::Associations::JoinDependency)
-      ActiveRecord::Associations::JoinDependency.new(*args)
-    else
-      ActiveRecord::Associations::ClassMethods::JoinDependency.new(*args)
-    end
+    JoinDependency.new(*args)
   end
 
   def activerecord_version_at_least(version_string)

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'machinist/active_record'
-require 'sham'
 require 'faker'
+require 'active_record'
+require 'active_support'
 
 module ActiveRecord
   # Shamelessly swiped from the AR test code
@@ -21,11 +21,11 @@ module ActiveRecord
       end
     end
   end
-  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
+  ::ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end
 
 unless ENV['DEPRECATIONS']
-  ActiveSupport::Deprecation.silenced = true
+  ::ActiveSupport::Deprecation.silenced = true
 end
 
 Dir[File.expand_path('../helpers/*.rb', __FILE__)].each do |f|
@@ -34,16 +34,6 @@ end
 require File.expand_path('../support/schema.rb', __FILE__)
 require File.expand_path('../support/models.rb', __FILE__)
 
-Sham.define do
-  name     { Faker::Name.name }
-  title    { Faker::Lorem.sentence }
-  body     { Faker::Lorem.paragraph }
-  salary   {|index| 30000 + (index * 1000)}
-  tag_name { Faker::Lorem.words(3).join(' ') }
-  note     { Faker::Lorem.words(7).join(' ') }
-  object_name { Faker::Lorem.words(1).first }
-end
-
 RSpec.configure do |config|
   config.before(:suite) do
     puts '=' * 80
@@ -51,8 +41,6 @@ RSpec.configure do |config|
     puts '=' * 80
     Models.make
   end
-  config.before(:all)   { Sham.reset(:before_all) }
-  config.before(:each)  { Sham.reset(:before_each) }
 
   config.include SqueelHelper
 end

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

@@ -16,7 +16,11 @@ module Squeel
         end
 
         it 'contextualizes join parts with the proper alias' do
-          table = @c.contextualize @jd._join_parts.last
+          table = if activerecord_version_at_least('4.1.0')
+              @c.contextualize @jd.join_root.children.last.children.last.children.last.children.last
+            else
+              @c.contextualize @jd.join_associations.last
+            end
           table.table_alias.should eq 'parents_people_2'
         end
 
@@ -27,13 +31,13 @@ module Squeel
         end
 
         it 'contextualizes polymorphic Join nodes to the arel_table of their klass' do
-          table = @c.contextualize Nodes::Join.new(:notable, Arel::InnerJoin, Article)
+          table = @c.contextualize Nodes::Join.new(:notable, Squeel::InnerJoin, Article)
           table.name.should eq 'articles'
           table.table_alias.should be_nil
         end
 
         it 'contextualizes non-polymorphic Join nodes to the table for their name' do
-          table = @c.contextualize Nodes::Join.new(:notes, Arel::InnerJoin)
+          table = @c.contextualize Nodes::Join.new(:notes, Squeel::InnerJoin)
           table.name.should eq 'notes'
           table.table_alias.should be_nil
         end
@@ -41,4 +45,4 @@ module Squeel
       end
     end
   end
-end
+end