squeel 1.0.15 → 1.0.16

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.16 (2013-02-12)
+
+* Port workaround for MySQL's "helpful" casting behavior from Rails 3.2.12
+
 ## 1.0.15 (2013-01-23)
 
 * Fix issue #214, don't alter table name when mergine a relation with a default

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

@@ -142,6 +142,8 @@ module Arel
         table   = attr.relation.table_name
 
         column_cache[table][name]
+      rescue ActiveRecord::StatementInvalid # non-existent tables
+        nil
       end
 
       def column_cache

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.15"
+  VERSION = "1.0.16"
 end

data/lib/squeel/visitors/predicate_visitation.rb

@@ -40,7 +40,7 @@ module Squeel
           value = visit(value, parent) if can_visit?(value)
         end
 
-        value = quote_for_node(o.expr, value)
+        value = quote_for_node(value, o.expr, parent)
 
         attribute = case o.expr
         when Nodes::Stub, Nodes::Function, Nodes::Literal, Nodes::Grouping
@@ -68,6 +68,7 @@ module Squeel
           value = visit(value.select(value.klass.arel_table[value.klass.primary_key]), parent)
         else
           value = can_visit?(value) ? visit(value, parent) : value
+          value = quote_for_attribute(value, attribute)
         end
 
         case value
@@ -108,14 +109,48 @@ module Squeel
       # can end up with annoyances like having "joe" quoted to 0, if the
       # last visited column was of an integer type.
       #
-      # @param node The node we (might) be quoting for
       # @param v The value to (possibly) quote
-      def quote_for_node(node, v)
+      # @param node The node we (might) be quoting for
+      # @param parent The parent of the node being quoted for
+      def quote_for_node(v, node, parent)
         case node
         when Nodes::Function, Nodes::Literal
           quote(v)
         when Nodes::Predicate
-          quote_for_node(node.expr, v)
+          quote_for_node(v, node.expr, parent)
+        when Symbol, Nodes::Stub # MySQL hates freedom
+          quote_for_attribute v, visit(node, parent)
+        else
+          v
+        end
+      end
+
+      # Because MySQL hates doing sane things, we are forced to try to quote
+      # certain values for a specific column type. Otherwise, MySQL might
+      # "helpfully" cast the column we're checking to the type we're comparing
+      # it to, resulting in such wonderful queries as...
+      #
+      #   SELECT * FROM table WHERE str_column = 0
+      #
+      # ...returning every record in the table that doesn't have a number in
+      # str_column.
+      #
+      # Everything about this method is awful. 2 x private method calls to ARel,
+      # wrapping a pre-quoted value in an SqlLiteral... Everything. My only
+      # solace is that I think we can fix it in ARel in the longer term.
+      def quote_for_attribute(v, attr)
+        case v
+        when Array
+          v.map { |v| quote_for_attribute(v, attr) }
+        when Range
+          Range.new(
+            quote_for_attribute(v.begin, attr),
+            quote_for_attribute(v.end, attr),
+            v.exclude_end?
+          )
+        when Bignum, Fixnum, Integer, ActiveSupport::Duration
+          column = arel_visitor.send(:column_for, attr)
+          Arel::Nodes::SqlLiteral.new arel_visitor.send(:quote, v, column)
         else
           v
         end

data/lib/squeel/visitors/predicate_visitor.rb

@@ -56,11 +56,11 @@ module Squeel
 
         case k
         when Nodes::Predicate
-          visit(k % quote_for_node(k.expr, v), parent)
+          visit(k % quote_for_node(v, k.expr, parent), parent)
         when Nodes::Function, Nodes::Literal
           arel_predicate_for(visit(k, parent), quote(v), parent)
         when Nodes::KeyPath
-          visit(k % quote_for_node(k.endpoint, v), parent)
+          visit(k % quote_for_node(v, k.endpoint, parent), parent)
         else
           attr_name = k.to_s
           attribute = if !hash_context_shifted? && attr_name.include?('.')

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -23,6 +23,44 @@ module Squeel
         node.right.should be_a Arel::Nodes::SelectStatement
       end
 
+      it 'quotes the value of a predicate based on its key' do
+        predicate = Nodes::Predicate.new(Nodes::Stub.new(:id), :eq, 1)
+        node = @v.accept(predicate)
+        node.to_sql.should be_like '"people"."id" = 1'
+        predicate = Nodes::Predicate.new(Nodes::Stub.new(:name), :eq, 1)
+        node = @v.accept(predicate)
+        node.to_sql.should be_like '"people"."name" = \'1\''
+      end
+
+      it 'quotes the value of a hash based on its key' do
+        node = @v.accept(:id => 1)
+        node.to_sql.should be_like '"people"."id" = 1'
+        node = @v.accept(:name => 1)
+        node.to_sql.should be_like '"people"."name" = \'1\''
+      end
+
+      it 'quotes array values for a Predicate based on its key' do
+        predicate = Nodes::Predicate.new(Nodes::Stub.new(:name), :in, [1, 2])
+        node = @v.accept(predicate)
+        node.to_sql.should be_like '"people"."name" IN (\'1\', \'2\')'
+      end
+
+      it 'quotes array values for a hash based on their key' do
+        node = @v.accept(:name => [1, 2])
+        node.to_sql.should be_like '"people"."name" IN (\'1\', \'2\')'
+      end
+
+      it 'quotes range values for a predicate based on its key' do
+        predicate = Nodes::Predicate.new(Nodes::Stub.new(:name), :in, 1..2)
+        node = @v.accept(predicate)
+        node.to_sql.should be_like '"people"."name" BETWEEN \'1\' AND \'2\''
+      end
+
+      it 'quotes range values for a hash based on its key' do
+        node = @v.accept(:name => 1..2)
+        node.to_sql.should be_like '"people"."name" BETWEEN \'1\' AND \'2\''
+      end
+
       it 'creates Equality nodes for simple hashes' do
         predicate = @v.accept(:name => 'Joe')
         predicate.should be_a Arel::Nodes::Equality
@@ -150,15 +188,13 @@ module Squeel
       it 'converts ActiveRecord::Base objects to their id' do
         predicate = @v.accept(:id => Person.first)
         predicate.should be_a Arel::Nodes::Equality
-        predicate.left.name.to_s.should eq 'id'
-        predicate.right.should eq 1
+        predicate.to_sql.should be_like '"people"."id" = 1'
       end
 
       it 'converts arrays of ActiveRecord::Base objects to their ids' do
         predicate = @v.accept(:id => [Person.first, Person.last])
         predicate.should be_a Arel::Nodes::In
-        predicate.left.name.to_s.should eq 'id'
-        predicate.right.should eq [1, 332]
+        predicate.to_sql.should be_like '"people"."id" IN (1, 332)'
       end
 
       it 'creates the node against the proper table for nested hashes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -255,7 +255,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3781393016892573538
+      hash: -3974244035788001518
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -264,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3781393016892573538
+      hash: -3974244035788001518
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24