arel_extensions 1.3.5 → 2.0.0.rc3

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,15 +17,11 @@ 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
-        @expressions.first
+         @expressions.first
       end
 
       def left
@@ -41,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
 
@@ -64,21 +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)
+          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
 
@@ -87,7 +81,7 @@ 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 self.type_of_attribute(object)
           when :date
@@ -98,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
 
@@ -119,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
 
@@ -134,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
 
@@ -158,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/json.rb

@@ -11,72 +11,56 @@ module ArelExtensions
       end
 
       def get key
-        JsonGet.new(self, key)
+        JsonGet.new(self,key)
       end
 
       def set key, value
-        JsonSet.new(self, key, value)
+        JsonSet.new(self,key,value)
       end
 
-      def group as_array = true, orders = nil
-        JsonGroup.new(self, as_array, orders)
+      def group as_array = true, orders= nil
+        JsonGroup.new(self,as_array, orders)
       end
 
       def hash
         [@dict].hash
       end
 
-      def convert_to_json_node(n)
-        case n
-        when JsonNode
-          n.dict
-        when Array
-          n.map{|e|
-            (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_json_node(e)
-          }
-        when Hash
-          n.reduce({}){|acc, v|
-            acc[convert_to_json_node(v[0])] = (v[1].is_a?(Array) || v[1].is_a?(Hash)) ? Json.new(v[1]) : convert_to_json_node(v[1])
-            acc
-          }
-        when String, Numeric, TrueClass, FalseClass
-          convert_to_node(n)
-        when Date
-          convert_to_node(n.strftime('%Y-%m-%d'))
-        when DateTime, Time
-          convert_to_node(n.strftime('%Y-%m-%dT%H:%M:%S.%L%:z'))
-        when NilClass
-          Arel.null
-        when Arel::SelectManager
-          Arel.grouping(n)
-        else
-          convert_to_node(n)
-        end
-      end
-
-      def type_of_node(v)
-        if v.is_a?(Arel::Attributes::Attribute)
-          self.type_of_attribute(v)
-        elsif v.respond_to?(:return_type)
-          v.return_type
-        elsif v.nil?
-          :nil
-        else
-          :string
-        end
-      end
     end
 
     class Json < JsonNode
+
       def initialize *expr
-        @dict =
-          if expr.length == 1
-            convert_to_json_node(expr.first)
+        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
-            expr.map{|e| convert_to_json_node(e) }
+            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)
+            else
+              @dict = [convert_to_node(expr.first)]
+            end
           end
+        else
+          @dict = expr.map{|e| (e.is_a?(Array) || e.is_a?(Hash)) ? Json.new(e) : convert_to_node(e) }
+        end
         super
       end
+
     end
 
     class JsonMerge < JsonNode
@@ -89,7 +73,11 @@ module ArelExtensions
         @dict = as_array ? json : json.dict
         @as_array = as_array
         if orders
-          @orders = Array(orders)
+          if orders.is_a?(Array)
+            @orders = orders
+          else
+            @orders = [orders]
+          end
         end
       end
     end
@@ -101,6 +89,7 @@ module ArelExtensions
         @dict = json
         @key = convert_to_node(key)
       end
+
     end
 
     class JsonSet < JsonNode
@@ -111,6 +100,8 @@ module ArelExtensions
         @key = convert_to_node(key)
         @value = Json.new(value)
       end
+
     end
+
   end
 end

data/lib/arel_extensions/nodes/length.rb

@@ -2,12 +2,7 @@ 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/levenshtein_distance.rb

@@ -4,7 +4,7 @@ module ArelExtensions
       RETURN_TYPE = :number
 
       def initialize expr
-        super [convert_to_node(expr.first), Arel.quoted(expr[1])]
+        super [convert_to_node(expr.first), Arel::Nodes.build_quoted(expr[1])]
       end
     end
   end

data/lib/arel_extensions/nodes/locate.rb

@@ -7,8 +7,9 @@ module ArelExtensions
         tab = expr.map do |arg|
           convert_to_node(arg)
         end
-        super(tab)
+        return super(tab)
       end
+
     end
   end
 end

data/lib/arel_extensions/nodes/log10.rb

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

data/lib/arel_extensions/nodes/matches.rb

@@ -1,10 +1,11 @@
 module ArelExtensions
   module Nodes
     class IMatches < Arel::Nodes::Matches
-      attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
 
+      attr_accessor :case_sensitive if Arel::VERSION.to_i < 7
+      
       def initialize(left, right, escape = nil)
-        r = Arel.quoted(right)
+        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
           super(left, r, escape)
           @case_sensitive = false
@@ -16,14 +17,15 @@ module ArelExtensions
 
     class IDoesNotMatch < IMatches
     end
-
+    
     class AiMatches < IMatches
     end
-
+    
     class AiIMatches < IMatches
     end
-
+    
     class SMatches < IMatches
     end
+
   end
 end

data/lib/arel_extensions/nodes/md5.rb

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

data/lib/arel_extensions/nodes/power.rb

@@ -1,11 +1,11 @@
 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/rand.rb

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

data/lib/arel_extensions/nodes/repeat.rb

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

data/lib/arel_extensions/nodes/replace.rb

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

data/lib/arel_extensions/nodes/round.rb

@@ -4,12 +4,13 @@ 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
   end
 end

data/lib/arel_extensions/nodes/soundex.rb

@@ -1,18 +1,18 @@
 module ArelExtensions
-  module Nodes
-    class Soundex < Function
-      include Arel::Expressions
-      include ArelExtensions::Comparators
+	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
 
-      RETURN_TYPE = :string
-
-      def ==(other)
-        Arel::Nodes::Equality.new self, Arel.quoted(other, self)
-      end
-
-      def !=(other)
-        Arel::Nodes::NotEqual.new self, Arel.quoted(other, self)
-      end
-    end
-  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,23 +1,26 @@
 module ArelExtensions
   module Nodes
-    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 < AggregateFunction
-      RETURN_TYPE = :number
-      attr_accessor :unbiased_estimator
-
-      def initialize node, **opts
-        @unbiased_estimator = opts[:unbiased] ? true : false
-        super node, **opts
-      end
+    class Std < Function
+    	RETURN_TYPE = :number
+    	
+		attr_accessor :unbiased_estimator
+    	def initialize expr
+	        col = expr.first
+            @unbiased_estimator = expr[1]
+        	super [col]
+    	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    
+    
   end
 end

data/lib/arel_extensions/nodes/substring.rb

@@ -1,15 +1,23 @@
 module ArelExtensions
   module Nodes
     class Substring < Function
-      RETURN_TYPE = :string
+    	RETURN_TYPE = :string
+
+		def initialize expr
+			tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
+			if expr[2]
+				tab << convert_to_node(expr[2])
+#			else
+#				tab << expr[0].length
+			end
+			return super(tab)
+		end
+
+#		def +(other)
+#			puts "[Substring] : #{other.inspect} (#{self.expressions.inspect})"
+#	        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
+#		end
 
-      def initialize expr
-        tab = [convert_to_node(expr[0]), convert_to_node(expr[1])]
-        if expr[2]
-          tab << convert_to_node(expr[2])
-        end
-        super(tab)
-      end
     end
   end
 end

data/lib/arel_extensions/nodes/then.rb

@@ -5,7 +5,7 @@ module ArelExtensions
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        super(tab)
+        return super(tab)
       end
     end
   end

data/lib/arel_extensions/nodes/trim.rb

@@ -2,25 +2,27 @@ module ArelExtensions
   module Nodes
     class Trim < Function
       RETURN_TYPE = :string
-
+      
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
         }
-        super(tab)
+        return super(tab)
       end
 
       def +(other)
-        ArelExtensions::Nodes::Concat.new(self.expressions + [other])
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
+
     end
 
     class Ltrim < Trim
-      RETURN_TYPE = :string
+	  RETURN_TYPE = :string
     end
 
     class Rtrim < Trim
       RETURN_TYPE = :string
     end
+
   end
 end