arel_extensions 2.0.16 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8c6d289ba78d7e49faf19e2cadd6b5a1fcf2bb93b091301c5a9acfb8504eceb
-  data.tar.gz: b3d0fb5c72905e2ec3b4a73b6ee52212c6adf4fcbb5058e610e9696e2a5d7ad5
+  metadata.gz: 57188b98a348ea5dd72994ef0edb94cb386104cbd50d863b3cc465bb81499f8f
+  data.tar.gz: 7235c655967c8058e24f85f96b1a3ea93803dc759906ea24aff360edf28ee6fb
 SHA512:
-  metadata.gz: 1f9d7e3cf6617d2b51db82177478e29e0694291838318e275ba6f7dad44fb7ce9f3fa5d3fecbe87c7d26c3c1b003e2b5543d220a22578dab7251f902e8deaed9
-  data.tar.gz: eeaab7ea5e5f9a12268b750aa9c50dcb6d16d3706f08ed229ef4118ef8f225424f42b602d0539e2bc2797e2e2307883c1017f3ec83e971104a5d1fa0c443c39f
+  metadata.gz: c60be09bdf31efe2b4a953c0b097bbc461d01a4d7005c1dc190af20efb12e659d2331e16d8ca47527b9757b89a2528069fa1a8a94cfd52bc80000633995b229f
+  data.tar.gz: b028042975ab07e0d28e919278c36f2652fae79dbced3776e16519f4fdfaaf45de32a0a375cb7e77d5157775d2a3ef8555f9096299b2c71f366367e6452a93a6

data/lib/arel_extensions.rb

@@ -33,6 +33,12 @@ class Arel::Nodes::Grouping
   include Arel::OrderPredications
 end
 
+class Arel::Nodes::Ordering
+	def eql? other
+		self.hash.eql? other.hash
+	end
+end
+
 class Arel::Nodes::Function
   include Arel::Math
   include Arel::Expressions
@@ -128,7 +134,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
 
@@ -148,6 +158,9 @@ class Arel::Nodes::Unary
   include ArelExtensions::MathFunctions
   include ArelExtensions::Comparators
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Binary
@@ -157,6 +170,9 @@ class Arel::Nodes::Binary
   include ArelExtensions::Comparators
   include ArelExtensions::BooleanFunctions
   include ArelExtensions::Predications
+  def eql? other
+    hash == other.hash
+  end
 end
 
 class Arel::Nodes::Equality

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/nodes/length.rb

@@ -2,6 +2,12 @@ module ArelExtensions
   module Nodes
     class Length < Function
       RETURN_TYPE = :integer
+      attr_accessor :bytewise
+
+      def initialize(node, bytewise = true)
+        @bytewise = bytewise
+        super([node])
+      end
     end
   end
 end

data/lib/arel_extensions/string_functions.rb

@@ -24,9 +24,17 @@ module ArelExtensions
       ArelExtensions::Nodes::FindInSet.new [other, self]
     end
 
-    # LENGTH function returns the length of the value in a text field.
+    # LENGTH function returns the length (bytewise) of the value in a text field.
     def length
-      ArelExtensions::Nodes::Length.new [self]
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def byte_length
+      ArelExtensions::Nodes::Length.new self, true
+    end
+
+    def char_length
+      ArelExtensions::Nodes::Length.new self, false
     end
 
     # LOCATE function returns the first starting position of a string in another string.

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -155,7 +155,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LEN("
+        collector << "#{o.bytewise ? 'DATALENGTH' : 'LEN'}("
         collector = visit o.expr, collector
         collector << ")"
         collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -5,7 +5,7 @@ module ArelExtensions
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
@@ -308,7 +308,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "LENGTH#{o.bytewise ? 'B' : ''}("
         collector = visit o.expr, collector
         collector << ")"
         collector

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

@@ -7,7 +7,7 @@ module ArelExtensions
       }.freeze
 
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY',
+        '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY',
         '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day', # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours

data/lib/arel_extensions/visitors/to_sql.rb

@@ -117,7 +117,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "#{o.bytewise ? '' : 'CHAR_'}LENGTH("
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -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.25".freeze
 end

data/version_v2.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.16".freeze
+  VERSION = "2.0.22".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.22
 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-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -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