arel_extensions 2.0.21 → 2.2.2

data/lib/arel_extensions/nodes/function.rb

@@ -22,14 +22,14 @@ module ArelExtensions
 
       def as other
         res = Arel::Nodes::As.new(self.clone, Arel.sql(other))
-        if Gem::Version.new(Arel::VERSION) >= Gem::Version.new("9.0.0")
+        if Gem::Version.new(Arel::VERSION) >= Gem::Version.new('9.0.0')
           self.alias = Arel.sql(other)
         end
         res
       end
 
       def expr
-         @expressions.first
+        @expressions.first
       end
 
       def left
@@ -41,21 +41,17 @@ module ArelExtensions
       end
 
       def ==(other)
-        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
       end
 
       def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
       end
 
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
-          begin
-            Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
-          rescue
-            att
-          end
+          Arel.column_of(att.relation.table_name, att.name.to_s)&.type || att
         when ArelExtensions::Nodes::Function
           att.return_type
           #        else
@@ -68,19 +64,19 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when DateTime
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when Time
-          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+          Arel.quoted(object.strftime('%H:%M:%S'), self)
         when MBSTRING, String, Symbol
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Date
-          Arel::Nodes.build_quoted(object.to_s, self)
+          Arel.quoted(object.to_s, self)
         when NilClass
           Arel.sql('NULL')
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
         when Array
-          Arel::Nodes::Grouping.new(object.map{|e| convert_to_node(e)})
+          Arel.grouping(object.map{|e| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
@@ -91,7 +87,7 @@ module ArelExtensions
         when Arel::Nodes::Node
           object
         when Integer
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Arel::Attributes::Attribute
           case self.type_of_attribute(object)
           when :date
@@ -102,17 +98,17 @@ module ArelExtensions
             object
           end
         when DateTime
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when Time
-          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+          Arel.quoted(object.strftime('%H:%M:%S'), self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(object.to_s)
+          Arel.quoted(object.to_s)
         when Date
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when NilClass
           Arel.sql(nil)
         when ActiveSupport::Duration
-          Arel::Nodes.build_quoted(object.to_i.to_s)
+          Arel.quoted(object.to_i.to_s)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
@@ -123,11 +119,11 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+          Arel.quoted(Date.new(object.year, object.month, object.day), self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(Date.parse(object.to_s), self)
+          Arel.quoted(Date.parse(object.to_s), self)
         when Date
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to Date")
         end
@@ -138,11 +134,11 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel::Nodes.build_quoted(object, self)
+          Arel.quoted(object, self)
         when MBSTRING, String
-          Arel::Nodes.build_quoted(Time.parse(object.to_s), self)
+          Arel.quoted(Time.parse(object.to_s), self)
         when Date
-          Arel::Nodes.build_quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
+          Arel.quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
         else
           raise(ArgumentError, "#{object.class} cannot be converted to Datetime")
         end

data/lib/arel_extensions/nodes/json.rb

@@ -11,15 +11,19 @@ module ArelExtensions
       end
 
       def get key
-        JsonGet.new(self,key)
+        JsonGet.new(self, key)
       end
 
       def set key, value
-        JsonSet.new(self,key,value)
+        JsonSet.new(self, key, value)
       end
 
-      def group as_array = true, orders = nil
-        JsonGroup.new(self,as_array, orders)
+      def group as_array = true, orders = nil, distinct: false
+        if distinct
+          JsonGroup.new(Arel::Nodes::NamedFunction.new('DISTINCT', [self]), as_array, orders)
+        else
+          JsonGroup.new(self, as_array, orders)
+        end
       end
 
       def hash
@@ -32,21 +36,23 @@ module ArelExtensions
           n.dict
         when Array
           n.map{|e|
-             (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
+            (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
           }
         when Hash
-          n.reduce({}){|acc,v|
+          n.reduce({}){|acc, v|
             acc[convert_to_json_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_json_node(v[1])
             acc
           }
         when String, Numeric, TrueClass, FalseClass
           convert_to_node(n)
         when Date
-          convert_to_node(n.strftime("%Y-%m-%d"))
+          convert_to_node(n.strftime('%Y-%m-%d'))
         when DateTime, Time
-          convert_to_node(n.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+          convert_to_node(n.strftime('%Y-%m-%dT%H:%M:%S.%L%:z'))
         when NilClass
-          Arel.sql('null')
+          Arel.null
+        when Arel::SelectManager
+          Arel.grouping(n)
         else
           convert_to_node(n)
         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/nodes/levenshtein_distance.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       RETURN_TYPE = :number
 
       def initialize expr
-        super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]
+        super [convert_to_node(expr.first), Arel.quoted(expr[1])]
       end
     end
   end

data/lib/arel_extensions/nodes/locate.rb

@@ -7,7 +7,7 @@ module ArelExtensions
         tab = expr.map do |arg|
           convert_to_node(arg)
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/matches.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
       def initialize(left, right, escape = nil)
-        r = Arel::Nodes.build_quoted(right)
+        r = Arel.quoted(right)
         if Arel::VERSION.to_i < 7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
           super(left, r, escape)
           @case_sensitive = false

data/lib/arel_extensions/nodes/repeat.rb

@@ -7,11 +7,11 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
   end

data/lib/arel_extensions/nodes/replace.rb

@@ -8,11 +8,7 @@ module ArelExtensions
         @left = convert_to_node(left)
         @pattern = convert_to_node(pattern)
         @substitute = convert_to_node(substitute)
-        super([@left,@pattern,@substitute])
-      end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        super([@left, @pattern, @substitute])
       end
     end
 
@@ -24,11 +20,7 @@ module ArelExtensions
         @left = convert_to_node(left)
         @pattern = (pattern.is_a?(Regexp) ? pattern : %r[#{pattern}])
         @substitute = convert_to_node(substitute)
-        super([@left,@pattern,@substitute])
-      end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        super([@left, @pattern, @substitute])
       end
     end
   end

data/lib/arel_extensions/nodes/rollup.rb

@@ -0,0 +1,36 @@
+# The following is a patch to activerecord when it doesn't
+# have RollUp defined, i.e. for rails < 5.2
+
+begin
+  Arel::Nodes.const_get('RollUp')
+rescue NameError => e
+  module Arel
+    module Nodes
+      class RollUp < Arel::Nodes::Unary
+      end
+    end
+  end
+
+  module Arel
+    module Visitors
+      class PostgreSQL
+        # Utilized by GroupingSet, Cube & RollUp visitors to
+        # handle grouping aggregation semantics
+        def grouping_array_or_grouping_element(o, collector)
+          if o.expr.is_a? Array
+            collector << "( "
+            visit o.expr, collector
+            collector << " )"
+          else
+            visit o.expr, collector
+          end
+        end
+
+        def visit_Arel_Nodes_RollUp(o, collector)
+          collector << "ROLLUP"
+          grouping_array_or_grouping_element o, collector
+        end
+      end
+    end
+  end
+end

data/lib/arel_extensions/nodes/select.rb

@@ -0,0 +1,10 @@
+module Arel
+  module Nodes
+    class SelectCore
+      # havings did not exist in rails < 5.2
+      if !method_defined?(:havings)
+        alias :havings :having
+      end
+    end
+  end
+end

data/lib/arel_extensions/nodes/soundex.rb

@@ -7,11 +7,11 @@ module ArelExtensions
       RETURN_TYPE = :string
 
       def ==(other)
-        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
       end
 
       def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
       end
     end
   end

data/lib/arel_extensions/nodes/substring.rb

@@ -8,7 +8,7 @@ module ArelExtensions
         if expr[2]
           tab << convert_to_node(expr[2])
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/then.rb

@@ -5,7 +5,7 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/trim.rb

@@ -7,11 +7,11 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
 

data/lib/arel_extensions/nodes/union.rb

@@ -1,20 +1,20 @@
 module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
-      def initialize left,right
-        return super(left,right)
+      def initialize left, right
+        super(left, right)
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Union.new(self,other)
+        ArelExtensions::Nodes::Union.new(self, other)
       end
 
       def union(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other)
+        ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/nodes/union_all.rb

@@ -1,16 +1,16 @@
 module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
-      def initialize left,right
-        return super(left,right)
+      def initialize left, right
+        super(left, right)
       end
 
       def union_all(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other)
+        ArelExtensions::Nodes::UnionAll.new(self, other)
       end
 
       def as other
-        Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
+        Arel::Nodes::TableAlias.new Arel.grouping(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
   end

data/lib/arel_extensions/null_functions.rb

@@ -3,6 +3,12 @@ require 'arel_extensions/nodes/is_null'
 
 module ArelExtensions
   module NullFunctions
+
+    # if_present returns nil if the the value is nil or blank
+    def if_present
+      Arel.when(self.cast(:string).present).then(self)
+    end
+
     # ISNULL function lets you return an alternative value when an expression is NULL.
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
@@ -19,5 +25,15 @@ module ArelExtensions
       args.unshift(self)
       ArelExtensions::Nodes::Coalesce.new args
     end
+
+    def coalesce_blank *args
+      res = Arel.when(self.cast(:string).present).then(self)
+      args[0...-1].each do |a|
+        val = a.is_a?(Arel::Nodes::Node) ? a : Arel.quoted(a)
+        res = res.when(val.present).then(a)
+      end
+      res = res.else(args[-1])
+      res
+    end
   end
 end

data/lib/arel_extensions/predications.rb

@@ -1,14 +1,14 @@
 module ArelExtensions
   module Predications
     def when right, expression = nil
-      ArelExtensions::Nodes::Case.new(self).when(right,expression)
+      ArelExtensions::Nodes::Case.new(self).when(right, expression)
     end
 
-    def matches(other, escape = nil,case_sensitive = nil)
+    def matches(other, escape = nil, case_sensitive = nil)
       if Arel::VERSION.to_i < 7
-        Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
+        Arel::Nodes::Matches.new(self, Arel.quoted(other), escape)
       else
-        Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape, case_sensitive)
+        Arel::Nodes::Matches.new(self, Arel.quoted(other), escape, case_sensitive)
       end
     end
 
@@ -17,7 +17,7 @@ module ArelExtensions
     end
 
     def cast right
-      ArelExtensions::Nodes::Cast.new([self,right])
+      ArelExtensions::Nodes::Cast.new([self, right])
     end
 
     def in(*other) # In should handle nil element in the Array
@@ -72,7 +72,7 @@ module ArelExtensions
       when Arel::SelectManager
         Arel::Nodes::NotIn.new(self, other.ast)
       else
-        Arel::Nodes::NotIn.new(self,quoted_node(other))
+        Arel::Nodes::NotIn.new(self, quoted_node(other))
       end
     end
 
@@ -81,13 +81,13 @@ module ArelExtensions
       when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
         object
       when DateTime
-        Arel::Nodes.build_quoted(object, self)
+        Arel.quoted(object, self)
       when Time
-        Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+        Arel.quoted(object.strftime('%H:%M:%S'), self)
       when String
-        Arel::Nodes.build_quoted(object)
+        Arel.quoted(object)
       when Date
-        Arel::Nodes.build_quoted(object.to_s, self)
+        Arel.quoted(object.to_s, self)
       when NilClass
         Arel.sql('NULL')
       when ActiveSupport::Duration

data/lib/arel_extensions/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 module ArelExtensions
   class Railtie < Rails::Railtie
     rake_tasks do
-        load 'arel_extensions/tasks.rb'
+      load 'arel_extensions/tasks.rb'
     end
   end
 end

data/lib/arel_extensions/set_functions.rb

@@ -4,15 +4,15 @@ require 'arel_extensions/nodes/union_all'
 module ArelExtensions
   module SetFunctions
     def +(other)
-      ArelExtensions::Nodes::Union.new(self,other)
+      ArelExtensions::Nodes::Union.new(self, other)
     end
 
     def union(other)
-      ArelExtensions::Nodes::Union.new(self,other)
+      ArelExtensions::Nodes::Union.new(self, other)
     end
 
     def union_all(other)
-      ArelExtensions::Nodes::UnionAll.new(self,other)
+      ArelExtensions::Nodes::UnionAll.new(self, other)
     end
 
     def uniq

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.
@@ -93,27 +101,27 @@ module ArelExtensions
     end
 
     def ai_matches other # accent insensitive & case sensitive
-      ArelExtensions::Nodes::AiMatches.new(self,other)
+      ArelExtensions::Nodes::AiMatches.new(self, other)
     end
 
     def ai_imatches other # accent insensitive & case insensitive
-      ArelExtensions::Nodes::AiIMatches.new(self,other)
+      ArelExtensions::Nodes::AiIMatches.new(self, other)
     end
 
     def smatches other # accent sensitive & case sensitive
-      ArelExtensions::Nodes::SMatches.new(self,other)
+      ArelExtensions::Nodes::SMatches.new(self, other)
     end
 
     def ai_collate
-      ArelExtensions::Nodes::Collate.new(self,nil,true,false)
+      ArelExtensions::Nodes::Collate.new(self, nil, true, false)
     end
 
     def ci_collate
-      ArelExtensions::Nodes::Collate.new(self,nil,false,true)
+      ArelExtensions::Nodes::Collate.new(self, nil, false, true)
     end
 
-    def collate ai = false,ci = false, option = nil
-      ArelExtensions::Nodes::Collate.new(self,option,ai,ci)
+    def collate ai = false, ci = false, option = nil
+      ArelExtensions::Nodes::Collate.new(self, option, ai, ci)
     end
 
     # REPLACE function replaces a sequence of characters in a string with another set of characters, not case-sensitive.
@@ -136,7 +144,7 @@ module ArelExtensions
     # concat elements of a group, separated by sep and ordered by a list of Ascending or Descending
     def group_concat(sep = nil, *orders, group: nil, order: nil)
       if orders.present?
-        warn("Warning : ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
+        warn("Warning: ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
       end
       order_tabs = [orders].flatten.map{ |o|
         if o.is_a?(Arel::Nodes::Ascending) || o.is_a?(Arel::Nodes::Descending)
@@ -176,6 +184,7 @@ module ArelExtensions
     def not_blank
       ArelExtensions::Nodes::NotBlank.new [self]
     end
+    alias present not_blank
 
     def repeat other = 1
       ArelExtensions::Nodes::Repeat.new [self, other]

data/lib/arel_extensions/tasks.rb

@@ -1,8 +1,8 @@
 namespace :arel_extensions do
   desc 'Install DB functions into current DB'
   task install_functions: :environment do
-    @env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
-                (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+    @env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx') || (RUBY_PLATFORM == 'java')) # not supported
+                (RUBY_PLATFORM == 'java' ? 'jdbc-sqlite' : 'sqlite')
               else
                 ENV['DB'] || ActiveRecord::Base.connection.adapter_name
               end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "2.0.21".freeze
+  VERSION = '2.2.2'.freeze
 end