arel_extensions 1.7.0 → 2.0.0.rc3

data/lib/arel_extensions/nodes/date_diff.rb

@@ -2,8 +2,9 @@ require 'date'
 
 module ArelExtensions
   module Nodes
-    class DateDiff < Function # difference entre colonne date et date string/date
-      attr_accessor :left_node_type, :right_node_type
+    class DateDiff < Function #difference entre colonne date et date string/date
+      attr_accessor :left_node_type
+      attr_accessor :right_node_type
 
       RETURN_TYPE = :integer # by default...
 
@@ -11,24 +12,24 @@ 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]))
-        super(res)
+        res << ([:date, :ruby_date].include?(@left_node_type) ? convert_to_date_node(expr[1]) : convert_to_datetime_node(expr[1]))
+        super res
       end
     end
 
@@ -36,90 +37,87 @@ module ArelExtensions
       RETURN_TYPE = :date
       attr_accessor :date_type
 
-      def initialize(expr)
+      def initialize expr
         col = expr.first
         @date_type = type_of_attribute(col)
         tab = expr.map do |arg|
           convert(arg)
         end
-        super(tab)
+        return super(tab)
       end
 
       def sqlite_value
-        v = expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        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
 
       def mysql_value(v = nil)
-        v ||= expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date || @date_type == :datetime
             Arel.sql('INTERVAL %s' % v.inspect.sub(/s\Z/, ''))
           end
-        elsif v.is_a?(ArelExtensions::Nodes::Duration)
-          v.with_interval = true
-          v
         else
-          v
+          if ArelExtensions::Nodes::Duration === v
+            v.with_interval = true
+            v
+          else
+            v
+          end
         end
       end
 
       def postgresql_value(v = nil)
-        v ||= expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           if @date_type == :date
             Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
           elsif @date_type == :datetime
             Arel.sql("INTERVAL '%s'" % v.inspect.sub(/s\Z/, '').upcase)
           end
-        elsif v.is_a?(ArelExtensions::Nodes::Duration)
-          v.with_interval = true
-          v
         else
-          v
+          if ArelExtensions::Nodes::Duration === v
+            v.with_interval = true
+            v
+          else
+            v
+          end
         end
       end
 
       def oracle_value(v = nil)
-        v ||= expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        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
-        elsif v.is_a?(ArelExtensions::Nodes::Duration)
-          v.with_interval = true
-          v
         else
-          v
+          if ArelExtensions::Nodes::Duration === v
+            v.with_interval = true
+            v
+          else
+            v
+          end
         end
       end
 
       def mssql_value(v = nil)
-        v ||= expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        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
@@ -127,40 +125,33 @@ module ArelExtensions
       end
 
       def mssql_datepart(v = nil)
-        v ||= expressions.last
-        if defined?(ActiveSupport::Duration) && v.is_a?(ActiveSupport::Duration)
+        v ||= self.expressions.last
+        if defined?(ActiveSupport::Duration) && ActiveSupport::Duration === v
           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)
-          end
-        elsif v.is_a?(ArelExtensions::Nodes::Duration)
-          v.with_interval = true
-          case v.left
-          when 'd', 'm', 'y'
-            Arel.sql('day')
-          when 'h', 'mn', 's'
             Arel.sql('second')
-          when /i\z/
-            Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left[0..-2]])
+          end
+        else
+          if ArelExtensions::Nodes::Duration === v
+            v.with_interval = true
+            case v.left
+            when  'd','m','y'
+              Arel.sql('day')
+            when 'h','mn','s'
+              Arel.sql('second')
+            when /i\z/
+              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left[0..-2]])
+            else
+              Arel.sql(Arel::Visitors::MSSQL::DATE_MAPPING[v.left])
+            end
           else
-            Arel.sql(ArelExtensions::Visitors::MSSQL::LOADED_VISITOR::DATE_MAPPING[v.left])
+            nil
           end
         end
       end
 
       private
-
       def convert(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, ActiveSupport::Duration
@@ -168,20 +159,20 @@ 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)
-        super([expr.first, convert_number(expr[1])])
+        super [expr.first, convert_number(expr[1])]
       end
 
       def convert_number(object)
@@ -191,13 +182,15 @@ module ArelExtensions
         when String
           object.to_i
         else
-          if defined?(ActiveSupport::Duration) && object.is_a?(ActiveSupport::Duration)
+          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

@@ -5,21 +5,24 @@ module ArelExtensions
 
       attr_accessor :with_interval
 
-      def initialize(left, right, aliaz = nil)
-        tab = []
+      def initialize left, right, aliaz = nil
+        tab = Array.new
         tab << left
         tab << right
         @with_interval = left.end_with?('i')
         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

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

@@ -1,11 +1,5 @@
 require 'arel_extensions/predications'
 
-# This is required for rails 6.1
-# See https://github.com/thoughtbot/shoulda-matchers/issues/335
-if !Array.respond_to?(:wrap)
-  require 'active_support/core_ext/array/wrap'
-end
-
 module ArelExtensions
   module Nodes
     class Function < Arel::Nodes::Function
@@ -16,24 +10,18 @@ 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
         self.class.const_get(:RETURN_TYPE)
       end
 
-      def as(other)
-        res = Arel::Nodes::As.new(clone, Arel.sql(other))
-        self.alias = Arel.sql(other)
-        res
+      def as other
+        Arel::Nodes::As.new(self, Arel.sql(other))
       end
 
       def expr
-        @expressions.first
+         @expressions.first
       end
 
       def left
@@ -45,21 +33,25 @@ module ArelExtensions
       end
 
       def ==(other)
-        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
+        Arel::Nodes::Equality.new self, Arel::Nodes.build_quoted(other, self)
       end
 
       def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
+        Arel::Nodes::NotEqual.new self, Arel::Nodes.build_quoted(other, self)
       end
 
       def type_of_attribute(att)
         case att
         when Arel::Attributes::Attribute
-          Arel.column_of(att.relation.table_name, att.name.to_s)&.type || att
+          begin
+            Arel::Table.engine.connection.schema_cache.columns_hash(att.relation.table_name)[att.name.to_s].type
+          rescue
+            att
+          end
         when ArelExtensions::Nodes::Function
           att.return_type
-          #        else
-          #          nil
+#        else
+#          nil
         end
       end
 
@@ -68,23 +60,19 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node, Integer
           object
         when DateTime
-          Arel.quoted(object, self)
+          Arel::Nodes.build_quoted(object, self)
         when Time
-          Arel.quoted(object.strftime('%H:%M:%S'), self)
-        when MBSTRING, String, Symbol
-          Arel.quoted(object.to_s)
-        when TrueClass, FalseClass
-          Arel.quoted(object)
+          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+        when String, Symbol
+          Arel::Nodes.build_quoted(object.to_s)
         when Date
-          Arel.quoted(object.to_s, self)
+          Arel::Nodes.build_quoted(object.to_s, self)
         when NilClass
           Arel.sql('NULL')
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
-        when Array
-          Arel.grouping(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
 
@@ -93,9 +81,9 @@ module ArelExtensions
         when Arel::Nodes::Node
           object
         when Integer
-          Arel.quoted(object.to_s)
+          Arel::Nodes.build_quoted(object.to_s)
         when Arel::Attributes::Attribute
-          case type_of_attribute(object)
+          case self.type_of_attribute(object)
           when :date
             ArelExtensions::Nodes::Format.new [object, 'yyyy-mm-dd']
           when :time
@@ -104,19 +92,19 @@ module ArelExtensions
             object
           end
         when DateTime
-          Arel.quoted(object, self)
+          Arel::Nodes.build_quoted(object, self)
         when Time
-          Arel.quoted(object.strftime('%H:%M:%S'), self)
-        when MBSTRING, String
-          Arel.quoted(object.to_s)
+          Arel::Nodes.build_quoted(object.strftime('%H:%M:%S'), self)
+        when String
+          Arel::Nodes.build_quoted(object)
         when Date
-          Arel.quoted(object, self)
+          Arel::Nodes.build_quoted(object, self)
         when NilClass
           Arel.sql(nil)
         when ActiveSupport::Duration
-          Arel.quoted(object.to_i.to_s)
+          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
 
@@ -125,13 +113,13 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel.quoted(Date.new(object.year, object.month, object.day), self)
-        when MBSTRING, String
-          Arel.quoted(Date.parse(object.to_s), self)
+          Arel::Nodes.build_quoted(Date.new(object.year, object.month, object.day), self)
+        when String
+          Arel::Nodes.build_quoted(Date.parse(object), self)
         when Date
-          Arel.quoted(object, self)
+          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
 
@@ -140,13 +128,13 @@ module ArelExtensions
         when Arel::Attributes::Attribute, Arel::Nodes::Node
           object
         when DateTime, Time
-          Arel.quoted(object, self)
-        when MBSTRING, String
-          Arel.quoted(Time.parse(object.to_s), self)
+          Arel::Nodes.build_quoted(object, self)
+        when String
+          Arel::Nodes.build_quoted(Time.parse(object), self)
         when Date
-          Arel.quoted(Time.utc(object.year, object.month, object.day, 0, 0, 0), self)
+          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
 
@@ -164,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

data/lib/arel_extensions/nodes/is_null.rb

@@ -4,13 +4,11 @@ module ArelExtensions
   module Nodes
     class IsNull < Arel::Nodes::Unary
       include ArelExtensions::BooleanFunctions
-
       RETURN_TYPE = :boolean
     end
 
     class IsNotNull < Arel::Nodes::Unary
       include ArelExtensions::BooleanFunctions
-
       RETURN_TYPE = :boolean
     end
   end