arel_extensions 2.0.0.rc3 → 2.0.9

data/lib/arel_extensions/attributes.rb

@@ -23,6 +23,5 @@ module ArelExtensions
     def !=(other)
       Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
     end
-
   end
 end

data/lib/arel_extensions/boolean_functions.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'arel_extensions/nodes/then'
 
 module ArelExtensions
@@ -8,7 +9,7 @@ module ArelExtensions
     end
 
     def and *others
-      Arel::Nodes::And.new([self]+ others.flatten)
+      Arel::Nodes::And.new self, others
     end
 
     def ⋁(other)
@@ -16,30 +17,54 @@ module ArelExtensions
     end
 
     def or *others
-      args = others.flatten
-      if args.length == 1
-        Arel::Nodes::Or.new(self, args.first)
-      else
-        ArelExtensions::Nodes::Or.new([self]+ args)
-      end
+      Arel::Nodes::Or.new self, others
     end
 
     def then(t, f = nil)
       ArelExtensions::Nodes::Then.new [self, t, f]
     end
+
   end
 end
 
-Arel::Nodes::And.class_eval do
+class Arel::Nodes::And
   include ArelExtensions::BooleanFunctions
-end
 
-Arel::Nodes::Or.class_eval do
-  include ArelExtensions::BooleanFunctions
+  def self.new *children
+    children =
+      children.flatten.map { |c|
+      c.is_a?(self) ? c.children : c
+    }.flatten
+    super(children)
+  end
+
 end
 
-ArelExtensions::Nodes.const_set('Or',Class.new(Arel::Nodes::And)).class_eval do
+# For some reason, Arel's And is properly defined as variadic (it
+# stores @children, and hashes it all).  However Arel's Or is defined
+# as binary, with only @left and @right, and hashing only @left and @right.
+#
+# So reimplement its ctor and accessors.
+
+class Arel::Nodes::Or
   include ArelExtensions::BooleanFunctions
-end
 
+  attr_reader :children
 
+  def self.new *children
+    children =
+      children.flatten.map { |c|
+      c.is_a?(self) ? c.children : c
+    }.flatten
+    super(*children)
+  end
+
+  def initialize *children
+    @children = children
+  end
+
+  def hash
+    children.hash
+  end
+
+end

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

@@ -4,21 +4,23 @@ module ArelExtensions
   module InsertManager
 
     def bulk_insert(cols, data)
+    res_columns = []
       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|
+          res_columns << @ast.relation[c]
+        }
+      when Array
+        if String === cols.first.first
+          res_columns = cols.map {|c| [@ast.relation[c.first]] }
+        elsif Arel::Attributes::Attribute == cols.first.first
+          res_columns = cols
+        end
+      when NilClass
+        res_columns = @ast.relation.columns
       end
-      self.values = BulkValues.new(@ast.columns, data)
+      self.values = BulkValues.new(res_columns, data)
+      @ast.columns = res_columns
     end
 
     class BulkValues < Arel::Nodes::Node

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

@@ -1,2 +1,2 @@
 require 'arel_extensions/nodes/function'
-
+require 'arel_extensions/nodes/aggregate_function'

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

@@ -1,7 +1,11 @@
 module ArelExtensions
   module Nodes
-    if Arel::VERSION < "7.1.0"
+    if Gem::Version.new(Arel::VERSION) < Gem::Version.new("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
@@ -26,8 +30,10 @@ module ArelExtensions
       end
     end
 
-    ArelExtensions::Nodes::Case.class_eval do
+    class ArelExtensions::Nodes::Case
       include Arel::Expressions
+      include Arel::Math
+      include Arel::Predications
       include Arel::OrderPredications
       include ArelExtensions::Math
       include ArelExtensions::Comparators
@@ -41,8 +47,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