arel_extensions 1.2.17 → 1.2.25

data/lib/arel_extensions/nodes/aggregate_function.rb

@@ -9,6 +9,5 @@ module ArelExtensions
         super [node]
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/blank.rb

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

data/lib/arel_extensions/nodes/case.rb

@@ -19,7 +19,6 @@ module ArelExtensions
 
         class Else < Arel::Nodes::Unary # :nodoc:
         end
-
       end
     else
       class Case < Arel::Nodes::Case
@@ -96,9 +95,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

@@ -49,7 +49,6 @@ 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

@@ -29,7 +29,6 @@ module ArelExtensions
         end
         return super(tab)
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/collate.rb

@@ -12,7 +12,6 @@ module ArelExtensions
       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,7 +37,6 @@ module ArelExtensions::Nodes
     def concat(other)
       Concat.new(self.expressions + [other])
     end
-
   end
 
   class GroupConcat < AggregateFunction
@@ -47,8 +46,7 @@ module ArelExtensions::Nodes
 
     def initialize node, separator = ', ', **opts
       @separator = convert_to_node(separator)
-      super node, opts
+      super node, **opts
     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
 
@@ -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
@@ -150,6 +150,7 @@ module ArelExtensions
       end
 
       private
+
       def convert(object)
         case object
         when Arel::Attributes::Attribute, Arel::Nodes::Node, ActiveSupport::Duration
@@ -166,7 +167,7 @@ module ArelExtensions
       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)
@@ -187,8 +188,6 @@ module ArelExtensions
           end
         end
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/duration.rb

@@ -20,7 +20,6 @@ module ArelExtensions
       def right
         @expressions[1]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/find_in_set.rb

@@ -2,7 +2,6 @@ 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

@@ -6,6 +6,7 @@ module ArelExtensions
       RETURN_TYPE = :string
 
       attr_accessor :col_type, :iso_format
+
       def initialize expr
         col = expr.first
         @iso_format = convert_format(expr[1])

data/lib/arel_extensions/nodes/formatted_number.rb

@@ -19,7 +19,6 @@ module ArelExtensions
         @original_string = expr[1][:original_string]
         super [col]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/function.rb

@@ -21,7 +21,11 @@ module ArelExtensions
       end
 
       def as other
-        Arel::Nodes::As.new(self, Arel.sql(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
       end
 
       def expr
@@ -54,8 +58,8 @@ module ArelExtensions
           end
         when ArelExtensions::Nodes::Function
           att.return_type
-#        else
-#          nil
+          #        else
+          #          nil
         end
       end
 
@@ -76,7 +80,7 @@ module ArelExtensions
         when ActiveSupport::Duration
           Arel.sql(object.to_i)
         when Array
-          Arel::Nodes::Grouping.new(object.map{|r| convert_to_node(e)})
+          Arel::Nodes::Grouping.new(object.map{|e| convert_to_node(e)})
         else
           raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
         end
@@ -161,7 +165,6 @@ module ArelExtensions
           raise(ArgumentError, "#{object.class} cannot be converted to NUMBER arg")
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/json.rb

@@ -63,11 +63,9 @@ module ArelExtensions
           :string
         end
       end
-
     end
 
     class Json < JsonNode
-
       def initialize *expr
         @dict =
           if expr.length == 1
@@ -77,7 +75,6 @@ module ArelExtensions
           end
         super
       end
-
     end
 
     class JsonMerge < JsonNode
@@ -102,7 +99,6 @@ module ArelExtensions
         @dict = json
         @key = convert_to_node(key)
       end
-
     end
 
     class JsonSet < JsonNode
@@ -113,8 +109,6 @@ module ArelExtensions
         @key = convert_to_node(key)
         @value = Json.new(value)
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/length.rb

@@ -2,7 +2,12 @@ module ArelExtensions
   module Nodes
     class Length < Function
       RETURN_TYPE = :integer
+      attr_accessor :bytewise
 
+      def initialize(node, bytewise = true)
+        @bytewise = bytewise
+        super([node])
+      end
     end
   end
 end

data/lib/arel_extensions/nodes/locate.rb

@@ -9,7 +9,6 @@ module ArelExtensions
         end
         return super(tab)
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/log10.rb

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

data/lib/arel_extensions/nodes/matches.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class IMatches < Arel::Nodes::Matches
-
       attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
       def initialize(left, right, escape = nil)
@@ -26,6 +25,5 @@ module ArelExtensions
 
     class SMatches < IMatches
     end
-
   end
 end

data/lib/arel_extensions/nodes/md5.rb

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

data/lib/arel_extensions/nodes/power.rb

@@ -6,7 +6,6 @@ module ArelExtensions
       def initialize expr
         super [convert_to_node(expr.first), convert_to_number(expr[1])]
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/rand.rb

@@ -10,7 +10,6 @@ module ArelExtensions
           super []
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/repeat.rb

@@ -13,8 +13,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
-
   end
 end

data/lib/arel_extensions/nodes/replace.rb

@@ -14,7 +14,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
 
     class RegexpReplace < Function
@@ -32,6 +31,5 @@ module ArelExtensions
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/round.rb

@@ -10,7 +10,6 @@ module ArelExtensions
           super [convert_to_node(expr.first), convert_to_number(expr[1])]
         end
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/soundex.rb

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

data/lib/arel_extensions/nodes/std.rb

@@ -4,9 +4,9 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, opts = {}
+      def initialize node, **opts
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, opts
+        super node, **opts
       end
     end
 
@@ -14,11 +14,10 @@ module ArelExtensions
       RETURN_TYPE = :number
       attr_accessor :unbiased_estimator
 
-      def initialize node, opts = {}
+      def initialize node, **opts
         @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, opts
+        super node, **opts
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/substring.rb

@@ -10,7 +10,6 @@ module ArelExtensions
         end
         return super(tab)
       end
-
     end
   end
 end

data/lib/arel_extensions/nodes/trim.rb

@@ -13,7 +13,6 @@ module ArelExtensions
       def +(other)
         return ArelExtensions::Nodes::Concat.new(self.expressions + [other])
       end
-
     end
 
     class Ltrim < Trim
@@ -23,6 +22,5 @@ module ArelExtensions
     class Rtrim < Trim
       RETURN_TYPE = :string
     end
-
   end
 end