arel_extensions 2.0.1 → 2.0.4

data/lib/arel_extensions/common_sql_functions.rb

@@ -39,6 +39,7 @@ module ArelExtensions
 
     def add_sql_functions(env_db = nil)
       env_db ||= @cnx.adapter_name
+      env_db = 'mysql' if env_db =~ /mysql/i
       if env_db =~ /sqlite/i
         begin
           add_sqlite_functions
@@ -52,10 +53,10 @@ module ArelExtensions
           sql.split(/^GO\s*$/).each {|str|
             @cnx.execute(str.strip) unless str.blank?
           }
-        elsif env_db == 'mysql' 
-			sql.split("$$")[1..-2].each { |str|
-				@cnx.execute(str.strip) unless str.strip.blank?
-			}
+        elsif env_db =='mysql'
+          sql.split("$$")[1..-2].each { |str|
+            @cnx.execute(str.strip) unless str.strip.blank?
+          }
         else
           @cnx.execute(sql) unless sql.blank?
         end

data/lib/arel_extensions/comparators.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Comparators
 
+
     def >(other)
       Arel::Nodes::GreaterThan.new self, Arel::Nodes.build_quoted(other, self)
     end
@@ -37,13 +38,14 @@ module ArelExtensions
     end
 
     private
-    #Function use for not_regexp
+    # Function used for not_regexp.
     def convert_regexp(other)
       case other
       when String
-        #Do nothing
+        # Do nothing.
       when Regexp
         other = other.source.gsub('\A','^')
+        other.gsub!('\z','$')
         other.gsub!('\Z','$')
         other.gsub!('\d','[0-9]')
         other.gsub!('\D','[^0-9]')

data/lib/arel_extensions/insert_manager.rb

@@ -5,18 +5,18 @@ module ArelExtensions
 
     def bulk_insert(cols, data)
       case cols.first
-        when String, Symbol
-          cols.each { |c|
-            @ast.columns << @ast.relation[c]
-          }
-        when Array
-          if String === cols.first.first
-            @ast.columns = cols.map {|c| [@ast.relation[c.first]] }
-          elsif Arel::Attributes::Attribute == cols.first.first
-            @ast.columns = cols
-          end
-        when NilClass
-          @ast.columns = @ast.relation.columns
+      when String, Symbol
+        cols.each { |c|
+          @ast.columns << @ast.relation[c]
+        }
+      when Array
+        if String === cols.first.first
+          @ast.columns = cols.map {|c| [@ast.relation[c.first]] }
+        elsif Arel::Attributes::Attribute == cols.first.first
+          @ast.columns = cols
+        end
+      when NilClass
+        @ast.columns = @ast.relation.columns
       end
       self.values = BulkValues.new(@ast.columns, data)
     end

data/lib/arel_extensions/math.rb

@@ -24,7 +24,7 @@ module ArelExtensions
           else
             return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
           end
-        when  ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
+        when ArelExtensions::Nodes::Function,ArelExtensions::Nodes::Case
           return case self.return_type
         when :string, :text
           self.concat(other)
@@ -35,7 +35,7 @@ module ArelExtensions
         else
           self.concat(other)
         end
-      when  Arel::Nodes::Function
+      when Arel::Nodes::Function
         Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
       else
         begin
@@ -115,7 +115,7 @@ module ArelExtensions
               end
             when Arel::Nodes::Node, DateTime, Time, String, Date
               ArelExtensions::Nodes::DateDiff.new [self, other]
-            when  ArelExtensions::Nodes::Duration, Integer
+            when ArelExtensions::Nodes::Duration, Integer
               ArelExtensions::Nodes::DateSub.new [self, other]
             else # ActiveSupport::Duration
               ArelExtensions::Nodes::DateAdd.new [self, -other]

data/lib/arel_extensions/math_functions.rb

@@ -7,6 +7,7 @@ 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
@@ -62,12 +63,16 @@ module ArelExtensions
     end
 
     # Aggregate Functions
-    def std unbiased = true
-      ArelExtensions::Nodes::Std.new [self,unbiased]
+    def std opts = {unbiased: true}
+      ArelExtensions::Nodes::Std.new self, opts
     end
 
-    def variance unbiased = true
-      ArelExtensions::Nodes::Variance.new [self,unbiased]
+    def variance opts = {unbiased: true}
+      ArelExtensions::Nodes::Variance.new self, opts
+    end
+
+    def sum opts = {unbiased: true}
+      ArelExtensions::Nodes::Sum.new self, opts
     end
 
     #function that can be invoked to produce random numbers between 0 and 1
@@ -86,7 +91,7 @@ module ArelExtensions
     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
         m = /^(.*)%([ #+\-0]*)([1-9][0-9]+|[1-9]?)[.]?([0-9]*)([a-zA-Z])(.*)$/.match(format_string)

data/lib/arel_extensions/nodes/aggregate_function.rb

@@ -0,0 +1,14 @@
+module ArelExtensions
+  module Nodes
+    class AggregateFunction < Function
+      attr_accessor :order, :group
+
+      def initialize node, **opts
+        @order = Array(opts[:order]).map{|e| convert_to_node(e)}
+        @group = Array(opts[:group]).map{|e| convert_to_node(e)}
+        super [node]
+      end
+    end
+
+  end
+end

data/lib/arel_extensions/nodes/case.rb

@@ -41,8 +41,6 @@ module ArelExtensions
             @conditions.last.right
           elsif @default
             @default.expr
-          else
-            nil
           end
         if obj.respond_to?(:return_type)
           obj.return_type

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,7 +20,7 @@ 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

data/lib/arel_extensions/nodes/collate.rb

@@ -5,7 +5,7 @@ module ArelExtensions
 
     attr_accessor :ai, :ci, :option
 
-    def initialize left, option=nil, ai=false, ci=false
+    def initialize left, option = nil, ai = false, ci = false
       @ai = ai
       @ci = ci
       @option = option

data/lib/arel_extensions/nodes/concat.rb

@@ -40,21 +40,14 @@ module ArelExtensions::Nodes
 
   end
 
-  class GroupConcat < Function
+  class GroupConcat < AggregateFunction
     RETURN_TYPE = :string
 
-    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)
+    attr_accessor :separator
+
+    def initialize node, separator = ', ', **opts
+      @separator = convert_to_node(separator)
+      super node, opts
     end
 
   end

data/lib/arel_extensions/nodes/date_diff.rb

@@ -12,7 +12,7 @@ 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
@@ -21,7 +21,7 @@ module ArelExtensions
         end
         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
@@ -136,7 +136,7 @@ module ArelExtensions
           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'
               Arel.sql('second')
@@ -145,8 +145,6 @@ module ArelExtensions
             else
               Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left])
             end
-          else
-            nil
           end
         end
       end

data/lib/arel_extensions/nodes/duration.rb

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

data/lib/arel_extensions/nodes/format.rb

@@ -1,15 +1,15 @@
 module ArelExtensions
   module Nodes
-    class Format < Function      
+    class Format < Function
       RETURN_TYPE = :string
 
-    	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
+      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

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -1,25 +1,25 @@
 module ArelExtensions
-	module Nodes
-		class FormattedNumber < Function		
-			RETURN_TYPE = :string
-			
-			attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_string
-			
-			def initialize expr
-				# expr[1] = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
-				col = expr.first
-				@locale = expr[1][:locale]
-				@prefix = expr[1][:prefix]
-				@suffix = expr[1][:suffix] 
-				@width = expr[1][:width]
-				@precision = expr[1][:precision]
-				@type = expr[1][:type]
-				@flags = expr[1][:flags]
-				@scientific_notation = /[eE]/.match(expr[1][:type]) || false
-				@original_string = expr[1][:original_string]
-				super [col]
-			end
-			
-		end				
-	end
+  module Nodes
+    class FormattedNumber < Function
+      RETURN_TYPE = :string
+
+      attr_accessor :locale, :prefix, :suffix, :flags, :scientific_notation, :width,:precision, :type, :original_string
+
+      def initialize expr
+        # expr[1] = {:locale => 'fr_FR', :type => "e"/"f"/"d", :prefix => "$ ", :suffix => " %", :flags => " +-#0", :width => 5, :precision => 6}
+        col = expr.first
+        @locale = expr[1][:locale]
+        @prefix = expr[1][:prefix]
+        @suffix = expr[1][:suffix]
+        @width = expr[1][:width]
+        @precision = expr[1][:precision]
+        @type = expr[1][:type]
+        @flags = expr[1][:flags]
+        @scientific_notation = /[eE]/.match(expr[1][:type]) || false
+        @original_string = expr[1][:original_string]
+        super [col]
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -71,6 +71,8 @@ module ArelExtensions
           Arel.sql('NULL')
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
+        when Array
+          Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
         end

data/lib/arel_extensions/nodes/json.rb

@@ -18,7 +18,7 @@ module ArelExtensions
         JsonSet.new(self,key,value)
       end
 
-      def group as_array = true, orders= nil
+      def group as_array = true, orders = nil
         JsonGroup.new(self,as_array, orders)
       end
 
@@ -31,33 +31,35 @@ module ArelExtensions
     class Json < JsonNode
 
       def initialize *expr
-        if expr.length == 1
-          case expr.first
-          when JsonNode
-            @dict = expr.first.dict
-          when Array
-            @dict = expr.first.map{|e|
-              (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
-            }
-          when Hash
-            @dict = expr.first.inject({}){|acc,v|
-              acc[convert_to_node(v[0])] =  (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) :  convert_to_node(v[1])
-              acc
-            }
-          when String, Numeric, TrueClass, FalseClass
-            @dict = convert_to_node(expr.first)
-          when NilClass
-            @dict = Arel.sql('null')
-          else
-            if expr.first.is_a?(String) || (expr.first.is_a?(Arel::Attributes::Attribute) && type_of_attribute(expr.first) == :string) || (expr.first.return_type == :string)
-              @dict = convert_to_node(expr.first)
+        @dict =
+          if expr.length == 1
+            case exp = expr.first
+            when JsonNode
+              exp.dict
+            when Array
+              exp.map{|e|
+                (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e)
+              }
+            when Hash
+              exp.reduce({}){|acc,v|
+                acc[convert_to_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_node(v[1])
+                acc
+              }
+            when String, Numeric, TrueClass, FalseClass
+              convert_to_node(exp)
+            when NilClass
+              Arel.sql('null')
             else
-              @dict = [convert_to_node(expr.first)]
+              if (exp.is_a?(Arel::Attributes::Attribute) && type_of_attribute(exp) == :string) \
+                 || (exp.return_type == :string)
+                convert_to_node(exp)
+              else
+                [convert_to_node(exp)]
+              end
             end
+          else
+            expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
           end
-        else
-          @dict = expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
-        end
         super
       end
 
@@ -73,11 +75,7 @@ module ArelExtensions
         @dict = as_array ? json : json.dict
         @as_array = as_array
         if orders
-          if orders.is_a?(Array)
-            @orders = orders
-          else
-            @orders = [orders]
-          end
+          @orders = Array(orders)
         end
       end
     end

data/lib/arel_extensions/nodes/matches.rb

@@ -3,7 +3,7 @@ module ArelExtensions
     class IMatches < Arel::Nodes::Matches
 
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
-      
+
       def initialize(left, right, escape = nil)
         r = Arel::Nodes.build_quoted(right)
         if Arel::VERSION.to_i < 7 # managed by default in version 7+ (rails 5), so useful for rails 3 & 4
@@ -17,13 +17,13 @@ module ArelExtensions
 
     class IDoesNotMatch < IMatches
     end
-    
+
     class AiMatches < IMatches
     end
-    
+
     class AiIMatches < IMatches
     end
-    
+
     class SMatches < IMatches
     end
 

data/lib/arel_extensions/nodes/power.rb

@@ -1,11 +1,12 @@
 module ArelExtensions
   module Nodes
     class Power < Function
-    	RETURN_TYPE = :number
-		
-		def initialize expr
-		  super [convert_to_node(expr.first), convert_to_number(expr[1])]		  
-		end
+      RETURN_TYPE = :number
+
+      def initialize expr
+        super [convert_to_node(expr.first), convert_to_number(expr[1])]
+      end
+
     end
   end
 end

data/lib/arel_extensions/nodes/repeat.rb

@@ -2,7 +2,7 @@ module ArelExtensions
   module Nodes
     class Repeat < Function
       RETURN_TYPE = :string
-      
+
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -11,7 +11,7 @@ module ArelExtensions
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
 
     end

data/lib/arel_extensions/nodes/replace.rb

@@ -2,18 +2,36 @@ module ArelExtensions
   module Nodes
     class Replace < Function
       RETURN_TYPE = :string
+      attr_accessor :left, :pattern, :substitute
 
-      def initialize expr
-        tab = expr.map { |arg|
-          convert_to_node(arg)
-        }
-        return super(tab)
+      def initialize left, pattern, substitute
+        @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]) 
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
 
     end
+
+    class RegexpReplace < Function
+      RETURN_TYPE = :string
+      attr_accessor :left, :pattern, :substitute
+
+      def initialize left, pattern, substitute
+        @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])
+      end
+    end
+
   end
 end

data/lib/arel_extensions/nodes/round.rb

@@ -4,11 +4,11 @@ module ArelExtensions
       RETURN_TYPE = :number
 
       def initialize expr
-      	if expr && expr.length == 1
-      		super [convert_to_node(expr.first)]
-      	else
-      		super [convert_to_node(expr.first), convert_to_number(expr[1])]
-      	end
+        if expr && expr.length == 1
+          super [convert_to_node(expr.first)]
+        else
+          super [convert_to_node(expr.first), convert_to_number(expr[1])]
+        end
       end
 
     end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,18 +1,19 @@
 module ArelExtensions
-	module Nodes
-		class Soundex < Function	
-			include Arel::Expressions
-			include ArelExtensions::Comparators			
-							
-			RETURN_TYPE = :string
-				
-			def ==(other)
-				Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
-			end
+  module Nodes
+    class Soundex < Function
+      include Arel::Expressions
+      include ArelExtensions::Comparators
 
-			def !=(other)
-				Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
-			end
-		end
-	end
+      RETURN_TYPE = :string
+
+      def ==(other)
+        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+      def !=(other)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
+      end
+
+    end
+  end
 end

data/lib/arel_extensions/nodes/std.rb

@@ -1,26 +1,24 @@
 module ArelExtensions
   module Nodes
-    class Std < Function
-    	RETURN_TYPE = :number
-    	
-		attr_accessor :unbiased_estimator
-    	def initialize expr
-	        col = expr.first
-            @unbiased_estimator = expr[1]
-        	super [col]
-    	end    	
+    class Std < AggregateFunction
+      RETURN_TYPE = :number
+      attr_accessor :unbiased_estimator
+
+      def initialize node, opts = {}
+        @unbiased_estimator = opts[:unbiased] ? true : false
+        super node, opts
+      end
     end
-    
-    class Variance < Function
-    	RETURN_TYPE = :number
-    	
-		attr_accessor :unbiased_estimator
-    	def initialize expr
-	        col = expr.first
-            @unbiased_estimator = expr[1]
-        	super [col]
-    	end    	
-    end    
-    
+
+    class Variance < AggregateFunction
+      RETURN_TYPE = :number
+      attr_accessor :unbiased_estimator
+
+      def initialize node, opts = {}
+        @unbiased_estimator = opts[:unbiased] ? true : false
+        super node, opts
+      end
+    end
+
   end
 end