arel_extensions 1.2.23 → 2.0.0.rc3

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/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

@@ -19,5 +19,6 @@ module ArelExtensions
           super expr.first
       end
     end
+
   end
 end

data/lib/arel_extensions/nodes/case.rb

@@ -1,11 +1,7 @@
 module ArelExtensions
   module Nodes
-    if Gem::Version.new(Arel::VERSION) < Gem::Version.new("7.1.0")
+    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,10 +26,8 @@ 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::Math
       include ArelExtensions::Comparators
@@ -46,6 +41,8 @@ module ArelExtensions
             @conditions.last.right
           elsif @default
             @default.expr
+          else
+            nil
           end
         if obj.respond_to?(:return_type)
           obj.return_type
@@ -95,9 +92,9 @@ 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?
 

data/lib/arel_extensions/nodes/cast.rb

@@ -14,10 +14,7 @@ module ArelExtensions
           @return_type = :decimal
         when :number
           @return_type = :number
-        when 'char', 'varchar', 'nchar', 'nvarchar'
-          @return_type = :string
-        when 'text', :text, 'ntext', :ntext
-          @as_attr = expr[1].to_sym
+        when 'char', 'varchar', 'text', 'nchar', 'nvarchar', 'ntext'
           @return_type = :string
         when :datetime, 'datetime','smalldatetime'
           @return_type = :datetime
@@ -49,6 +46,7 @@ module ArelExtensions
       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,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
@@ -29,6 +29,7 @@ module ArelExtensions
         end
         return super(tab)
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/collate.rb

@@ -5,13 +5,14 @@ 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
       tab = [convert_to_node(left)]
       return super(tab)
     end
+
     end
   end
 end

data/lib/arel_extensions/nodes/concat.rb

@@ -11,7 +11,7 @@ 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 == ""
           res
@@ -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,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
@@ -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
@@ -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,12 +145,13 @@ module ArelExtensions
             else
               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
@@ -158,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::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)
@@ -184,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,41 +1,15 @@
-require 'strscan'
-
 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 = convert_format(expr[1])
-        @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

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -1,24 +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

@@ -10,10 +10,6 @@ module ArelExtensions
 
       RETURN_TYPE = :string # by default...
 
-      # Support multibyte string if they are available.
-      MBSTRING =
-        defined?(ActiveSupport::Multibyte::Chars) ? ActiveSupport::Multibyte::Chars : String
-
       # overrides as to make new Node like AliasPredication
 
       def return_type
@@ -21,11 +17,7 @@ module ArelExtensions
       end
 
       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")
-          self.alias = Arel.sql(other)
-        end
-        res
+        Arel::Nodes::As.new(self, Arel.sql(other))
       end
 
       def expr
@@ -58,8 +50,8 @@ module ArelExtensions
           end
         when ArelExtensions::Nodes::Function
           att.return_type
-          #        else
-          #          nil
+#        else
+#          nil
         end
       end
 
@@ -71,7 +63,7 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when MBSTRING, String, Symbol
+        when String, Symbol
           Arel::Nodes.build_quoted(object.to_s)
         when Date
           Arel::Nodes.build_quoted(object.to_s, self)
@@ -79,10 +71,8 @@ module ArelExtensions
           Arel.sql('NULL')
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
-        when Array
-          Arel::Nodes::Grouping.new(object.map{|e| convert_to_node(e)})
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
         end
       end
 
@@ -105,8 +95,8 @@ module ArelExtensions
           Arel::Nodes.build_quoted(object, self)
         when Time
           Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
-        when MBSTRING, String
-          Arel::Nodes.build_quoted(object.to_s)
+        when String
+          Arel::Nodes.build_quoted(object)
         when Date
           Arel::Nodes.build_quoted(object, self)
         when NilClass
@@ -114,7 +104,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel::Nodes.build_quoted(object.to_i.to_s)
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
+          raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
         end
       end
 
@@ -124,12 +114,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
-        when MBSTRING, String
-          Arel::Nodes.build_quoted(Date.parse(object.to_s), self)
+        when String
+          Arel::Nodes.build_quoted(Date.parse(object), self)
         when Date
           Arel::Nodes.build_quoted(object, self)
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to Date")
+          raise(ArgumentError, "#{object.class} can not be converted to Date")
         end
       end
 
@@ -139,12 +129,12 @@ module ArelExtensions
           object
         when DateTime, Time
           Arel::Nodes.build_quoted(object, self)
-        when MBSTRING, String
-          Arel::Nodes.build_quoted(Time.parse(object.to_s), self)
+        when String
+          Arel::Nodes.build_quoted(Time.parse(object), self)
         when Date
           Arel::Nodes.build_quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to Datetime")
+          raise(ArgumentError, "#{object.class} can not be converted to Datetime")
         end
       end
 
@@ -162,9 +152,10 @@ module ArelExtensions
         when NilClass
           0
         else
-          raise(ArgumentError, "#{object.class} cannot be converted to NUMBER arg")
+          raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
         end
       end
+
     end
   end
 end