arel_extensions 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c6d289ba78d7e49faf19e2cadd6b5a1fcf2bb93b091301c5a9acfb8504eceb
-  data.tar.gz: b3d0fb5c72905e2ec3b4a73b6ee52212c6adf4fcbb5058e610e9696e2a5d7ad5
+  metadata.gz: 48eb9493e32b9bb48577dcf68c740ee6158a820262c0b65f6a4aa0cd7a0173f1
+  data.tar.gz: d519a1a091554ed7685a40ec2aa59d0662cd287047aab28d9471651d5d0c3ef0
 SHA512:
-  metadata.gz: 1f9d7e3cf6617d2b51db82177478e29e0694291838318e275ba6f7dad44fb7ce9f3fa5d3fecbe87c7d26c3c1b003e2b5543d220a22578dab7251f902e8deaed9
-  data.tar.gz: eeaab7ea5e5f9a12268b750aa9c50dcb6d16d3706f08ed229ef4118ef8f225424f42b602d0539e2bc2797e2e2307883c1017f3ec83e971104a5d1fa0c443c39f
+  metadata.gz: a96114271d98ebabcdf5b8eea621eaa2ec009bc44677043b8e785a728730c8cfd6b33809b4afa13adf795c7912fe5535760b621f35909cd4710bae57e0d1c22c
+  data.tar.gz: 03febb4e85ef9d0169e9e23b661f9e20d93ade2b57b2a22bec2821b292e654b161a4108ae2ee49d5d8043cc626778c31851d16533467f16a3ae8bae5e953c7ee

data/lib/arel_extensions.rb

@@ -128,7 +128,11 @@ class Arel::Nodes::Function
 
   alias_method(:old_as, :as) rescue nil
   def as other
-    Arel::Nodes::As.new(self, Arel.sql(other))
+    res = Arel::Nodes::As.new(self.clone, Arel.sql(other))
+    if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("9.0.0")
+      self.alias = Arel.sql(other)
+    end
+    res
   end
 end
 

data/lib/arel_extensions/nodes/function.rb

@@ -21,7 +21,11 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::As.new(self, Arel.sql(other))
+        res = Arel::Nodes::As.new(self.clone, Arel.sql(other))
+        if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("9.0.0")
+          self.alias = Arel.sql(other)
+        end
+        res
       end
 
       def expr

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.16".freeze
+  VERSION = "2.0.17".freeze
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -348,6 +348,9 @@ module ArelExtensions
       # override
       remove_method(:visit_Arel_Nodes_As) rescue nil # if Arel::Visitors::ToSql.method_defined?(:visit_Arel_Nodes_As)
       def visit_Arel_Nodes_As o, collector
+        if o.left.respond_to?(:alias)
+          o.left.alias = nil
+        end
         if o.left.is_a?(Arel::Nodes::Binary)
           collector << '('
           collector = visit o.left, collector

data/test/with_ar/all_agnostic_test.rb

@@ -162,6 +162,12 @@ module ArelExtensions
         end
       end
 
+      def test_aggregation_with_ar_calculation
+        # Since Arel10 (Rails6.1), some unwanted behaviors on aggregated calculation were present.
+        # This should works no matter which version of rails is used
+        assert User.group(:score).average(:id).values.all?{|e| !e.nil?}
+      end
+
       # String Functions
       def test_concat
         assert_equal 'Camille Camille', t(@camille, @name + ' ' + @name)

data/version_v1.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.19".freeze
+  VERSION = "1.2.20".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.16".freeze
+  VERSION = "2.0.17".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord