arel_extensions 1.2.19 → 1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b1349341148022d22f5f1db49226c8279bfc9474e48dfbeed4741f68dedc1bc
-  data.tar.gz: 8ef43ffbefa6e47f95bde8e9212b195e877cd97700ec113cb0a394fd0eff8014
+  metadata.gz: dd9036278df59b6ea574de919e8c2ad7a4326aa40466b00f84be093d8352e591
+  data.tar.gz: d3cca86041854d9d1dcc940782719d95f21c26d02f6afc8cb6442a4173bf40b8
 SHA512:
-  metadata.gz: 962602c8cf871c1456401b48edd21e8348af1a54b851873c634ce64248bd0dbd293a798adb3bb3f3e9f62fe4778f74f3627c54bffbd8fb5aa62a920cdc0c3846
-  data.tar.gz: df1669b0b8b3a87dce3d68d402d1e89d3abca492e66b9032bb70a2817471b6a1a64f879674c6b84a201e3f8865d62920d694229bcd65ec0dde2da4818a72a3de
+  metadata.gz: 5594429c88e9ba8217fbd963a7555c7003c3417dad17ed3b394b92552fb6e2e7ff49073d197ef483aa108a06baf7a6b067fc18d7e4b18d331b8f4b0d3dad0568
+  data.tar.gz: 53888ec183dd96d146565d2814586155cbbc76a7b3c1e25a60c2d14b9d0d41bf10c581d2bb3b87fe577ae66451d3f2a2deb2dcc378a271faf2bb462252cba9ec

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/math_functions.rb

@@ -71,7 +71,11 @@ module ArelExtensions
     end
 
     def sum opts = {unbiased: true}
-      ArelExtensions::Nodes::Sum.new self, **opts
+      if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("9.0.0")
+        Arel::Nodes::Sum.new [self]
+      else
+        ArelExtensions::Nodes::Sum.new self, **opts
+      end
     end
 
     # function that can be invoked to produce random numbers between 0 and 1

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
@@ -76,7 +80,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
         when Array
-          Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
+          Arel::Nodes::Grouping.new(object.map{|e| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/oracle12.rb

@@ -2,18 +2,6 @@ module ArelExtensions
   module Visitors
     Arel::Visitors.send(:remove_const,'Oracle12') if Arel::Visitors.const_defined?('Oracle12')
     Arel::Visitors.const_set('Oracle12',Class.new(Arel::Visitors::Oracle)).class_eval do
-      def visit_Arel_Nodes_SelectStatement(o, collector)
-        # Oracle does not allow LIMIT clause with select for update
-        if o.limit && o.lock
-          raise ArgumentError, <<-MSG
-          'Combination of limit and lock is not supported.
-          because generated SQL statements
-          `SELECT FOR UPDATE and FETCH FIRST n ROWS` generates ORA-02014.`
-          MSG
-        end
-
-        super
-      end
 
       def visit_Arel_Nodes_SelectOptions(o, collector)
         collector = maybe_visit o.offset, collector

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.23".freeze
 end

data/version_v2.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 1.2.19
+  version: 1.2.23
 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-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Extending Arel