squeel 1.0.4 → 1.0.5

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.5 (2012-06-08)
+
+* Stop visiting group_values on merge. AR hates ARel attributes in
+  group_values.
+
 ## 1.0.4 (2012-06-07)
 
 * Fix regression in merge causing issues with scopes returning nil

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

@@ -53,7 +53,8 @@ module Squeel
 
           @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?})
+          # FIXME: AR barfs on ARel attributes in group_values. Workaround?
+          # @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)
 

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

@@ -63,7 +63,8 @@ module Squeel
 
           @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?})
+          # FIXME: AR barfs on ARel attributes in group_values. Workaround?
+          # @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)
 

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

@@ -1,22 +1 @@
-module Arel
-
-  module Nodes
-
-    class Grouping < Unary
-      include Arel::Predications
-    end unless Grouping.include?(Arel::Predications)
-
-  end
-
-  module Visitors
-
-    class DepthFirst < Visitor
-
-      unless method_defined?(:visit_Arel_Nodes_InfixOperation)
-        alias :visit_Arel_Nodes_InfixOperation :binary
-      end
-
-    end
-
-  end
-end
+require 'squeel/adapters/active_record/3.1/compat'

data/lib/squeel/version.rb

@@ -1,3 +1,3 @@
 module Squeel
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

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

@@ -686,6 +686,11 @@ module Squeel
             relation.should eq Person.scoped
           end
 
+          it "doesn't ruin everything when a group exists" do
+            relation = Person.scoped.merge(Person.group{name})
+            count_hash = relation.count
+          end
+
         end
 
         describe '#to_a' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -240,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4164570062879011051
+      hash: -4324622899470909075
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -249,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4164570062879011051
+      hash: -4324622899470909075
 requirements: []
 rubyforge_project: squeel
 rubygems_version: 1.8.24