arel_extensions 2.1.4 → 2.1.6

data/lib/arel_extensions/helpers.rb

@@ -17,11 +17,11 @@ module ArelExtensions
 
   def self.column_of_via_arel_table(table_name, column_name)
     Arel::Table.engine.connection.schema_cache.columns_hash(table_name)[column_name]
-    rescue NoMethodError
-      nil
-    rescue => e
-      warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of_via_arel_table`\n#{e.class}: #{e}")
-      nil
+  rescue NoMethodError
+    nil
+  rescue => e
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of_via_arel_table`\n#{e.class}: #{e}")
+    nil
   end
 
   def self.column_of(table_name, column_name)
@@ -40,12 +40,12 @@ module ArelExtensions
         column_of_via_arel_table(table_name, column_name)
       end
     end
-    rescue ActiveRecord::ConnectionNotEstablished
-      column_of_via_arel_table(table_name, column_name)
-    rescue ActiveRecord::StatementInvalid
-      nil
-    rescue => e
-      warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`\n#{e.class}: #{e}")
-      nil
+  rescue ActiveRecord::ConnectionNotEstablished
+    column_of_via_arel_table(table_name, column_name)
+  rescue ActiveRecord::StatementInvalid
+    nil
+  rescue => e
+    warn("Warning: Unexpected exception caught while fetching column name for #{table_name}.#{column_name} in `column_of`\n#{e.class}: #{e}")
+    nil
   end
 end

data/lib/arel_extensions/math.rb

@@ -16,16 +16,16 @@ module ArelExtensions
     # Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
       case self
-        when Arel::Nodes::Quoted
-          return self.concat(other)
-        when Arel::Nodes::Grouping
-          if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
-            return self.concat(other)
-          else
-            return Arel.grouping(Arel::Nodes::Addition.new self, other)
-          end
-        when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
-          return case self.return_type
+      when Arel::Nodes::Quoted
+        self.concat(other)
+      when Arel::Nodes::Grouping
+        if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
+          self.concat(other)
+        else
+          Arel.grouping(Arel::Nodes::Addition.new self, other)
+        end
+      when ArelExtensions::Nodes::Function, ArelExtensions::Nodes::Case
+        case self.return_type
         when :string, :text
           self.concat(other)
         when :integer, :decimal, :float, :number, :int
@@ -38,12 +38,17 @@ module ArelExtensions
       when Arel::Nodes::Function
         Arel.grouping(Arel::Nodes::Addition.new self, other)
       else
-        col = Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
-        if (!col) # if the column doesn't exist in the database
+        col =
+          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
+            self.type_caster
+          else
+            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          end
+        if !col # if the column doesn't exist in the database
           Arel.grouping(Arel::Nodes::Addition.new(self, Arel.quoted(other)))
         else
           arg = col.type
-          if arg == :integer || (!arg)
+          if arg == :integer || !arg
             other = other.to_i if other.is_a?(String)
             Arel.grouping(Arel::Nodes::Addition.new self, Arel.quoted(other))
           elsif arg == :decimal || arg == :float
@@ -82,16 +87,26 @@ module ArelExtensions
       when Arel::Nodes::Function
         Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
       else
-        col = Arel.column_of(self.relation.table_name, self.name.to_s)
-        if (!col) # if the column doesn't exist in the database
+        col =
+          if self.is_a?(Arel::Attribute) && self.respond_to?(:type_caster) && self.able_to_type_cast?
+            self.type_caster
+          else
+            Arel.column_of(self.relation.table_name, self.name.to_s) if self.respond_to?(:relation)
+          end
+        if !col # if the column doesn't exist in the database
           Arel.grouping(Arel::Nodes::Subtraction.new(self, Arel.quoted(other)))
         else
           arg = col.type
           if (arg == :date || arg == :datetime)
             case other
             when Arel::Attributes::Attribute
-              col2 = Arel.column_of(other.relation.table_name, other.name.to_s)
-              if (!col2) # if the column doesn't exist in the database
+              col2 =
+                if other.is_a?(Arel::Attribute) && other.respond_to?(:type_caster) && other.able_to_type_cast?
+                  other.type_caster
+                else
+                  Arel.column_of(other.relation.table_name, other.name.to_s) if other.respond_to?(:relation)
+                end
+              if !col2 # if the column doesn't exist in the database
                 ArelExtensions::Nodes::DateSub.new [self, other]
               else
                 arg2 = col2.type

data/lib/arel_extensions/nodes/case.rb

@@ -35,12 +35,13 @@ module ArelExtensions
       include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Aliases
-      include ArelExtensions::Math
       include ArelExtensions::Comparators
-      include ArelExtensions::Predications
+      include ArelExtensions::DateDuration
+      include ArelExtensions::Math
       include ArelExtensions::MathFunctions
-      include ArelExtensions::StringFunctions
       include ArelExtensions::NullFunctions
+      include ArelExtensions::Predications
+      include ArelExtensions::StringFunctions
 
       def return_type
         obj = if @conditions.length > 0

data/lib/arel_extensions/nodes/cast.rb

@@ -32,13 +32,13 @@ module ArelExtensions
           @as_attr = :string
         end
         tab = [convert_to_node(expr.first)]
-        return super(tab)
+        super(tab)
       end
 
       def +(other)
         case @return_type
         when :string
-          return ArelExtensions::Nodes::Concat.new [self, other]
+          ArelExtensions::Nodes::Concat.new [self, other]
         when :ruby_time
           ArelExtensions::Nodes::DateAdd.new [self, other]
         else

data/lib/arel_extensions/nodes/coalesce.rb

@@ -27,7 +27,7 @@ module ArelExtensions
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/collate.rb

@@ -10,7 +10,7 @@ module ArelExtensions
         @ci = ci
         @option = option
         tab = [convert_to_node(left)]
-        return super(tab)
+        super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -19,7 +19,7 @@ module ArelExtensions
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
+        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
         case expr[1]
         when Arel::Nodes::Node, Arel::Attributes::Attribute
           @right_node_type = type_of_attribute(expr[1])
@@ -28,7 +28,7 @@ module ArelExtensions
         when DateTime, Time
           @right_node_type = :ruby_time
         end
-        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
+        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
         super res
       end
     end
@@ -43,19 +43,19 @@ module ArelExtensions
         tab = expr.map do |arg|
           convert(arg)
         end
-        return super(tab)
+        super(tab)
       end
 
       def sqlite_value
         v = self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           elsif @date_type == :datetime
-            return Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           end
         else
-          return v
+          v
         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/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/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/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

@@ -2,15 +2,15 @@ module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
       def initialize left, right
-        return super(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

data/lib/arel_extensions/nodes/union_all.rb

@@ -2,11 +2,11 @@ module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
       def initialize left, right
-        return super(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

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

@@ -184,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/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = '2.1.4'.freeze
+  VERSION = '2.1.6'.freeze
 end

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -56,7 +56,7 @@ module ArelExtensions
         collector << 'COALESCE('
         collector = visit o.left, collector
         collector << ','
-        if (o.right.is_a?(Arel::Attributes::Attribute))
+        if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"

data/lib/arel_extensions/visitors/mssql.rb

@@ -49,6 +49,82 @@ module ArelExtensions
         'YYYY-MM-DDTHH:MM:SS:MMM' => 126
       }.freeze
 
+      # Quoting in JRuby + AR < 5 requires special handling for MSSQL.
+      #
+      # It relied on @connection.quote, which in turn relied on column type for
+      # quoting. We need only to rely on the value type.
+      #
+      # It didn't handle numbers correctly: `quote(1, nil)` translated into
+      # `N'1'` which we don't want.
+      #
+      # The following is adapted from activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
+      #
+      if RUBY_PLATFORM == 'java' && ActiveRecord::VERSION::MAJOR < 5
+        def quote_string(s)
+          s.gsub('\\', '\&\&').gsub("'", "''") # ' (for ruby-mode)
+        end
+
+        def quoted_binary(value) # :nodoc:
+          "'#{quote_string(value.to_s)}'"
+        end
+
+        def quoted_date(value)
+          if value.acts_like?(:time)
+            if ActiveRecord::Base.default_timezone == :utc
+              value = value.getutc if value.respond_to?(:getutc) && !value.utc?
+            else
+              value = value.getlocal if value.respond_to?(:getlocal)
+            end
+          end
+
+          result = value.to_s(:db)
+          if value.respond_to?(:usec) && value.usec > 0
+            result << '.' << sprintf('%06d', value.usec)
+          else
+            result
+          end
+        end
+
+        def quoted_true
+          'TRUE'
+        end
+
+        def quoted_false
+          'FALSE'
+        end
+
+        def quoted_time(value) # :nodoc:
+          value = value.change(year: 2000, month: 1, day: 1)
+          quoted_date(value).sub(/\A\d{4}-\d{2}-\d{2} /, "")
+        end
+
+        def quote value, column = nil
+          case value
+          when Arel::Nodes::SqlLiteral
+            value
+          when String, Symbol, ActiveSupport::Multibyte::Chars
+            "'#{quote_string(value.to_s)}'"
+          when true      
+            quoted_true
+          when false     
+            quoted_false
+          when nil       
+            'NULL'
+          # BigDecimals need to be put in a non-normalized form and quoted.
+          when BigDecimal
+            value.to_s('F')
+          when Numeric, ActiveSupport::Duration
+            value.to_s
+          when Date, Time
+            "'#{quoted_date(value)}'"
+          when Class
+            "'#{value}'"
+          else
+            raise TypeError, "can't quote #{value.class.name}"
+          end
+        end
+      end
+
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
         collector << 'CEILING('
@@ -157,7 +233,7 @@ module ArelExtensions
           collector = visit o.right, collector
         else
           left = o.left.end_with?('i') ? o.left[0..-2] : o.left
-          conv = ['h', 'mn', 's'].include?(o.left)
+          conv = %w[h mn s].include?(o.left)
           collector << 'DATEPART('
           collector << LOADED_VISITOR::DATE_MAPPING[left]
           collector << LOADED_VISITOR::COMMA
@@ -220,11 +296,19 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Trim o, collector
-        collector << 'TRIM( '
-        collector = visit o.right, collector
-        collector << ' FROM '
-        collector = visit o.left, collector
-        collector << ')'
+        # NOTE: in MSSQL's `blank`, o.right is the space char so we need to
+        # account for it.
+        if o.right && !/\A\s\Z/.match(o.right.expr)
+          collector << 'dbo.TrimChar('
+          collector = visit o.left, collector
+          collector << Arel::Visitors::MSSQL::COMMA
+          collector = visit o.right, collector
+          collector << ')'
+        else
+          collector << "LTRIM(RTRIM("
+          collector = visit o.left, collector
+          collector << "))"
+        end
         collector
       end
 
@@ -308,7 +392,7 @@ module ArelExtensions
               dir = LOADED_VISITOR::DATE_FORMAT_DIRECTIVES[s.matched]
               fmt = LOADED_VISITOR::DATE_FORMAT_FORMAT[dir]
               date_name = LOADED_VISITOR::DATE_NAME.include?(s.matched)
-              collector << 'TRIM('
+              collector << 'LTRIM(RTRIM('
               collector << 'FORMAT(' if fmt
               collector << 'STR('    if !fmt && !date_name
               collector << (date_name ? 'DATENAME(' : 'DATEPART(')
@@ -334,7 +418,7 @@ module ArelExtensions
               collector << ')'
               collector << ')'                                  if !fmt && !date_name
               collector << LOADED_VISITOR::COMMA << "'#{fmt}')" if fmt
-              collector << ')'
+              collector << '))'
             when s.scan(/^%%/)
               collector = visit Arel.quoted('%'), collector
             when s.scan(/[^%]+|./)
@@ -479,6 +563,11 @@ module ArelExtensions
         collector
       end
 
+      def visit_Arel_Nodes_RollUp(o, collector)
+        collector << "ROLLUP"
+        grouping_array_or_grouping_element o, collector
+      end
+
       # TODO;
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << '(STRING_AGG('
@@ -575,15 +664,20 @@ module ArelExtensions
               ])
           end
 
-        repeated_char = (o.width == 0) ? Arel.quoted('') : ArelExtensions::Nodes::Case.new.
-          when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0).
-          then(Arel.quoted(
-              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-            ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-          ).
-          else('')
-        before = (!o.flags.include?('0')) && (!o.flags.include?('-')) ? repeated_char : ''
-        middle = (o.flags.include?('0')) && (!o.flags.include?('-'))  ? repeated_char : ''
+        repeated_char =
+          if o.width == 0
+            Arel.quoted('')
+          else
+            Arel
+              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
+              .then(Arel.quoted(
+                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
+                   )
+              .else('')
+          end
+        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
+        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number =
           ArelExtensions::Nodes::Concat.new([
@@ -634,6 +728,18 @@ module ArelExtensions
         collector << ')'
         collector
       end
+
+      # 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
     end
   end
 end