arel_extensions 1.6.0 → 2.0.0.rc3

data/lib/arel_extensions/math_functions.rb

@@ -7,15 +7,15 @@ require 'arel_extensions/nodes/formatted_number'
 require 'arel_extensions/nodes/log10'
 require 'arel_extensions/nodes/power'
 require 'arel_extensions/nodes/std'
-require 'arel_extensions/nodes/sum'
 
 module ArelExtensions
   module MathFunctions
+
     # Arel does not handle Decimal literal properly
     def * other
       case other
       when Float, BigDecimal
-        super(Arel.quoted(other))
+        super(Arel::Nodes.build_quoted(other))
       else
         super(other)
       end
@@ -25,7 +25,7 @@ module ArelExtensions
     def / other
       case other
       when Float, BigDecimal
-        super(Arel.quoted(other))
+        super(Arel::Nodes.build_quoted(other))
       else
         super(other)
       end
@@ -33,86 +33,79 @@ module ArelExtensions
 
     # Abs function returns the absolute value of a number passed as argument #
     def abs
-      ArelExtensions::Nodes::Abs.new [self]
+        ArelExtensions::Nodes::Abs.new [self]
     end
 
     # will rounded up any positive or negative decimal value within the function upwards #
     def ceil
-      ArelExtensions::Nodes::Ceil.new [self]
+        ArelExtensions::Nodes::Ceil.new [self]
     end
 
     # function rounded up any positive or negative decimal value down to the next least integer
     def floor
-      ArelExtensions::Nodes::Floor.new [self]
+        ArelExtensions::Nodes::Floor.new [self]
     end
 
-    # function gives the base 10 log
+     # function gives the base 10 log
     def log10
-      ArelExtensions::Nodes::Log10.new [self]
+        ArelExtensions::Nodes::Log10.new [self]
     end
 
     # function gives the power of a number
     def pow exposant = 0
-      ArelExtensions::Nodes::Power.new [self, exposant]
+        ArelExtensions::Nodes::Power.new [self,exposant]
     end
 
     # function gives the power of a number
     def power exposant = 0
-      ArelExtensions::Nodes::Power.new [self, exposant]
+        ArelExtensions::Nodes::Power.new [self,exposant]
     end
 
     # Aggregate Functions
-    def std opts = {unbiased: true}
-      ArelExtensions::Nodes::Std.new self, **opts
-    end
-
-    def variance opts = {unbiased: true}
-      ArelExtensions::Nodes::Variance.new self, **opts
+    def std unbiased = true
+      ArelExtensions::Nodes::Std.new [self,unbiased]
     end
 
-    def sum opts = {unbiased: true}
-      if AREL_VERSION >= V9_0
-        Arel::Nodes::Sum.new [self]
-      else
-        ArelExtensions::Nodes::Sum.new self, **opts
-      end
+    def variance unbiased = true
+      ArelExtensions::Nodes::Variance.new [self,unbiased]
     end
 
-    # function that can be invoked to produce random numbers between 0 and 1
-    #    def rand seed = nil
-    #        ArelExtensions::Nodes::Rand.new [seed]
-    #    end
-    alias_method(:random, :rand) rescue nil
+    #function that can be invoked to produce random numbers between 0 and 1
+#    def rand seed = nil
+#        ArelExtensions::Nodes::Rand.new [seed]
+#    end
+    alias_method :random, :rand
 
-    # function is used to round a numeric field to the number of decimals specified
+    #function is used to round a numeric field to the number of decimals specified
     def round precision = nil
-      if precision
-        ArelExtensions::Nodes::Round.new [self, precision]
-      else
-        ArelExtensions::Nodes::Round.new [self]
-      end
+        if precision
+            ArelExtensions::Nodes::Round.new [self, precision]
+        else
+            ArelExtensions::Nodes::Round.new [self]
+        end
     end
 
     # function returning a number at a specific format
-    def format_number format_string, locale = nil
+    def format_number format_string, locale=nil
       begin
-        sprintf(format_string, 0) # this line is to get the right error message if the format_string is not correct
+        sprintf(format_string,0) # this line is to get the right error message if the format_string is not correct
         m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)
         opts = {
-          prefix: m[1],
-          flags: m[2].split(//).uniq.join,
-          width: m[3].to_i,
-          precision: m[4] != '' ? m[4].to_i : 6,
-          type: m[5],
-          suffix: m[6],
-          locale: locale,
-          original_string: format_string
+          :prefix     => m[1],
+          :flags      => m[2].split(//).uniq.join,
+          :width      => m[3].to_i,
+          :precision  => m[4] != '' ? m[4].to_i : 6,
+          :type       => m[5],
+          :suffix     => m[6],
+          :locale    => locale,
+          :original_string => format_string
         }
-        # opts = {locale: 'fr_FR', type: "e"/"f"/"d", prefix: "$ ", suffix: " %", flags: " +-#0", width: 5, precision: 6}
-        ArelExtensions::Nodes::FormattedNumber.new [self, opts]
+        # opts = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
+        ArelExtensions::Nodes::FormattedNumber.new [self,opts]
       rescue Exception
-        Arel.quoted('Wrong Format')
+        Arel::Nodes.build_quoted('Wrong Format')
       end
     end
+
   end
 end

data/lib/arel_extensions/nodes/abs.rb

@@ -2,6 +2,7 @@ module ArelExtensions
   module Nodes
     class Abs < Function
       RETURN_TYPE = :number
+
     end
   end
 end

data/lib/arel_extensions/nodes/blank.rb

@@ -16,8 +16,9 @@ module ArelExtensions
       RETURN_TYPE = :boolean
 
       def initialize expr
-        super expr.first
+          super expr.first
       end
     end
+
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -1,11 +1,7 @@
 module ArelExtensions
   module Nodes
-    if AREL_VERSION < V7_1
+    if Arel::VERSION < "7.1.0"
       class Case < Arel::Nodes::Node
-        include Arel::Expressions
-        include Arel::Math
-        include Arel::Predications
-        include Arel::OrderPredications
         attr_accessor :case, :conditions, :default
 
         def initialize expression = nil, default = nil
@@ -19,6 +15,7 @@ module ArelExtensions
 
         class Else < Arel::Nodes::Unary # :nodoc:
         end
+
       end
     else
       class Case < Arel::Nodes::Case
@@ -29,25 +26,23 @@ module ArelExtensions
       end
     end
 
-    class ArelExtensions::Nodes::Case
+    ArelExtensions::Nodes::Case.class_eval do
       include Arel::Expressions
-      include Arel::Math
-      include Arel::Predications
       include Arel::OrderPredications
-      include ArelExtensions::Aliases
-      include ArelExtensions::Comparators
-      include ArelExtensions::DateDuration
       include ArelExtensions::Math
-      include ArelExtensions::MathFunctions
-      include ArelExtensions::NullFunctions
+      include ArelExtensions::Comparators
       include ArelExtensions::Predications
+      include ArelExtensions::MathFunctions
       include ArelExtensions::StringFunctions
+      include ArelExtensions::NullFunctions
 
       def return_type
         obj = if @conditions.length > 0
-                @conditions.last.right
+            @conditions.last.right
           elsif @default
             @default.expr
+          else
+            nil
           end
         if obj.respond_to?(:return_type)
           obj.return_type
@@ -55,10 +50,14 @@ module ArelExtensions
           case obj
           when Integer, Float
             :number
-          when Date, DateTime, Time
+          when Date, DateTime,Time
             :datetime
           when Arel::Attributes::Attribute
-            Arel.column_of(obj.relation.table_name, obj.name.to_s)&.type || :string
+            begin
+              Arel::Table.engine.connection.schema_cache.columns_hash(obj.relation.table_name)[obj.name.to_s].type
+            rescue Exception
+              :string
+            end
           else
             :string
           end
@@ -93,14 +92,14 @@ module ArelExtensions
 
       def eql? other
         self.class == other.class &&
-          self.case == other.case &&
-          self.conditions == other.conditions &&
-          self.default == other.default
+        self.case == other.case &&
+        self.conditions == other.conditions &&
+        self.default == other.default
       end
       alias :== :eql?
 
       def as other
-        Arel::Nodes::As.new self, Arel.sql(other)
+        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
       end
     end
   end

data/lib/arel_extensions/nodes/cast.rb

@@ -14,16 +14,13 @@ module ArelExtensions
           @return_type = :decimal
         when :number
           @return_type = :number
-        when 'char', 'varchar', 'nchar', 'nvarchar'
+        when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
           @return_type = :string
-        when 'text', :text, 'ntext', :ntext
-          @as_attr = expr[1].to_sym
-          @return_type = :string
-        when :datetime, 'datetime', 'smalldatetime'
+        when :datetime, 'datetime','smalldatetime'
           @return_type = :datetime
-        when :time, 'time'
+        when :time,'time'
           @return_type = :time
-        when :date, 'date'
+        when :date,'date'
           @return_type = :date
         when :binary, 'binary', 'varbinary', 'image'
           @return_type = :binary
@@ -32,23 +29,24 @@ module ArelExtensions
           @as_attr = :string
         end
         tab = [convert_to_node(expr.first)]
-        super(tab)
+        return super(tab)
       end
 
       def +(other)
         case @return_type
         when :string
-          ArelExtensions::Nodes::Concat.new [self, other]
+          return ArelExtensions::Nodes::Concat.new [self, other]
         when :ruby_time
           ArelExtensions::Nodes::DateAdd.new [self, other]
         else
-          Arel.grouping(Arel::Nodes::Addition.new self, other)
+          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
         end
       end
 
       def return_type
         @return_type
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/ceil.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Ceil < Function
-      RETURN_TYPE = :number
+    	RETURN_TYPE = :number
     end
   end
 end

data/lib/arel_extensions/nodes/coalesce.rb

@@ -2,7 +2,7 @@ module ArelExtensions
   module Nodes
     class Coalesce < Function
       RETURN_TYPE = :string
-
+      
       attr_accessor :left_node_type
 
       def return_type
@@ -20,15 +20,16 @@ module ArelExtensions
           @left_node_type = :number
         when ArelExtensions::Nodes::Coalesce, ArelExtensions::Nodes::Function
           @left_node_type = expr.first.respond_to?(:left_node_type) ? expr.first.left_node_type : nil
-        when Arel::Nodes::Node, Arel::Attributes::Attribute
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
           @left_node_type = type_of_attribute(expr.first)
         when Date
           @left_node_type = :ruby_date
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        super(tab)
+        return super(tab)
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/collate.rb

@@ -1,17 +1,18 @@
 module ArelExtensions
   module Nodes
     class Collate < Function
-      RETURN_TYPE = :string
+    RETURN_TYPE = :string
 
-      attr_accessor :ai, :ci, :option
+    attr_accessor :ai, :ci, :option
+
+    def initialize left, option=nil, ai=false, ci=false
+      @ai = ai
+      @ci = ci
+      @option = option
+      tab = [convert_to_node(left)]
+      return super(tab)
+    end
 
-      def initialize left, option = nil, ai = false, ci = false
-        @ai = ai
-        @ci = ci
-        @option = option
-        tab = [convert_to_node(left)]
-        super(tab)
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -11,12 +11,12 @@ module ArelExtensions::Nodes
         else
           node
         end
-      }.flatten.reduce([]) { |res, b|
+      }.flatten.reduce([]) { | res, b |
         # concatenate successive literal strings.
-        if b.is_a?(Arel::Nodes::Quoted) && b.expr == ''
+        if b.is_a?(Arel::Nodes::Quoted) && b.expr == ""
           res
         elsif res.last && res.last.is_a?(Arel::Nodes::Quoted) && b.is_a?(Arel::Nodes::Quoted)
-          res[-1] = Arel.quoted(res.last.expr.to_s + b.expr.to_s)
+          res[-1] = Arel::Nodes.build_quoted(res.last.expr + b.expr)
         else
           res << b
         end
@@ -37,16 +37,25 @@ module ArelExtensions::Nodes
     def concat(other)
       Concat.new(self.expressions + [other])
     end
+
   end
 
-  class GroupConcat < AggregateFunction
+  class GroupConcat < Function
     RETURN_TYPE = :string
 
-    attr_accessor :separator
-
-    def initialize node, separator = ', ', **opts
-      @separator = convert_to_node(separator)
-      super node, **opts
+    attr_accessor :orders
+    
+    def initialize expr
+      tab = expr.map { |arg|
+        if arg.is_a?(Array)
+          @orders = arg
+          nil
+        else
+          convert_to_node(arg)
+        end
+      }.compact
+      super(tab)
     end
+
   end
 end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -2,7 +2,7 @@ require 'date'
 
 module ArelExtensions
   module Nodes
-    class DateDiff < Function # difference entre colonne date et date string/date
+    class DateDiff < Function #difference entre colonne date et date string/date
       attr_accessor :left_node_type
       attr_accessor :right_node_type
 
@@ -12,23 +12,23 @@ module ArelExtensions
         res = []
         col = expr.first
         case col
-        when Arel::Nodes::Node, Arel::Attributes::Attribute
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
           @left_node_type = type_of_attribute(col)
         when Date
           @left_node_type = :ruby_date
         when DateTime, Time
           @left_node_type = :ruby_time
         end
-        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(col) : convert_to_datetime_node(col))
+        res << ([: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
+        when Arel::Nodes::Node, Arel::Attributes::Attribute 
           @right_node_type = type_of_attribute(expr[1])
         when Date
           @right_node_type = :ruby_date
         when DateTime, Time
           @right_node_type = :ruby_time
         end
-        res << (%i[date ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
+        res << ([: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
-        super(tab)
+        return super(tab)
       end
 
       def sqlite_value
         v = self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            return Arel::Nodes.build_quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           elsif @date_type == :datetime
-            Arel.quoted((v.value >= 0 ? '+' : '-') + v.inspect)
+            return Arel::Nodes.build_quoted((v.value >= 0 ? '+' : '-') + v.inspect)
           end
         else
-          v
+          return v
         end
       end
 
@@ -97,7 +97,7 @@ module ArelExtensions
         v ||= self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :ruby_date
-            Arel.sql("(INTERVAL '1' DAY) * %s" % v.inspect.to_i)
+            Arel.sql("(INTERVAL '1' DAY) * %s" % v.inspect.to_i )
           else
             Arel.sql("(INTERVAL '1' SECOND) * %s" % v.to_i)
           end
@@ -115,18 +115,9 @@ module ArelExtensions
         v ||= self.expressions.last
         if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
-            v.to_i / (24 * 3600)
+            v.to_i / (24*3600)
           elsif @date_type == :datetime
-            if v.parts.size == 1
-              #       first entry in the dict v.parts; one of [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
-              #       |     the value
-              #       |     |
-              #       |     |
-              #       v     v
-              v.parts.first.second
-            else
-              v.to_i
-            end
+            v.to_i
           end
         else
           v
@@ -139,37 +130,28 @@ module ArelExtensions
           if @date_type == :date
             Arel.sql('day')
           elsif @date_type == :datetime
-            res = if v.parts.size == 1
-                    #       first entry in the dict v.parts; one of [:years, :months, :weeks, :days, :hours, :minutes, :seconds]
-                    #       |     the key
-                    #       |     |     convert symbol to string
-                    #       |     |     |   remove the plural suffix `s`
-                    #       v     v     v   v
-                    v.parts.first.first.to_s[0..-2]
-                  else
-                    'second'
-                  end
-            Arel.sql(res)
+            Arel.sql('second')
           end
         else
           if ArelExtensions::Nodes::Duration === v
             v.with_interval = true
             case v.left
-            when 'd', 'm', 'y'
+            when  'd','m','y'
               Arel.sql('day')
-            when 'h', 'mn', 's'
+            when 'h','mn','s'
               Arel.sql('second')
             when /i\z/
-              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
+              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left[0..-2]])
             else
-              Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left])
+              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left])
             end
+          else
+            nil
           end
         end
       end
 
       private
-
       def convert(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, ActiveSupport::Duration
@@ -177,16 +159,16 @@ module ArelExtensions
         when Integer
           object.days
         when DateTime, Time, Date
-          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
+          raise(ArgumentError, "#{object.class} can not be converted to Integer")
         when String
-          Arel.quoted(object)
+          Arel::Nodes.build_quoted(object)
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to Integer")
+          raise(ArgumentError, "#{object.class} can not be converted to Integer")
         end
       end
     end
 
-    class DateSub < Function # difference entre colonne date et date string/date
+    class DateSub < Function #difference entre colonne date et date string/date
       RETURN_TYPE = :integer
 
       def initialize(expr)
@@ -203,10 +185,12 @@ module ArelExtensions
           if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === object
             object.to_i
           else
-            raise(ArgumentError, "#{object.class} cannot be converted to Number")
+            raise(ArgumentError, "#{object.class} can not be converted to Number")
           end
         end
       end
+
     end
+
   end
 end

data/lib/arel_extensions/nodes/duration.rb

@@ -13,13 +13,16 @@ module ArelExtensions
         super(tab, aliaz)
       end
 
+
       def left
         @expressions.first
       end
 
+
       def right
         @expressions[1]
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/find_in_set.rb

@@ -2,6 +2,7 @@ module ArelExtensions
   module Nodes
     class FindInSet < Function
       RETURN_TYPE = :integer
+
     end
   end
 end

data/lib/arel_extensions/nodes/floor.rb

@@ -1,7 +1,7 @@
 module ArelExtensions
   module Nodes
     class Floor < Function
-      RETURN_TYPE = :number
+    	RETURN_TYPE = :number
     end
   end
 end

data/lib/arel_extensions/nodes/format.rb

@@ -1,42 +1,15 @@
-require 'strscan'
-
 module ArelExtensions
   module Nodes
-    class Format < Function
+    class Format < Function      
       RETURN_TYPE = :string
 
-      attr_accessor :col_type, :iso_format, :time_zone
-
-      def initialize expr
-        col = expr[0]
-        @iso_format = convert_format(expr[1])
-        @time_zone  = expr[2]
-        @col_type = type_of_attribute(col)
-        super [col, convert_to_string_node(@iso_format)]
-      end
-
-      private
-
-      # Address portability issues with some of the formats.
-      def convert_format(fmt)
-        s = StringScanner.new fmt
-        res = StringIO.new
-        while !s.eos?
-          res <<
-            case
-            when s.scan(/%D/)    then '%m/%d/%y'
-            when s.scan(/%F/)    then '%Y-%m-%d'
-            when s.scan(/%R/)    then '%H:%M'
-            when s.scan(/%r/)    then '%I:%M:%S %p'
-            when s.scan(/%T/)    then '%H:%M:%S'
-            when s.scan(/%v/)    then '%e-%b-%Y'
-
-            when s.scan(/[^%]+/) then s.matched
-            when s.scan(/./)     then s.matched
-            end
-        end
-        res.string
-      end
+    	attr_accessor :col_type, :iso_format
+    	def initialize expr
+	        col = expr.first
+            @iso_format = expr[1]
+	        @col_type = type_of_attribute(col)
+        	super [col, convert_to_string_node(@iso_format)]
+    	end
     end
   end
 end