arel_extensions 0.8.3 → 0.8.4

data/lib/arel_extensions/nodes/function.rb

@@ -41,6 +41,36 @@ module ArelExtensions
         end
       end
 
+      def convert_to_date_node(object)
+        case object
+        when Arel::Attributes::Attribute, Arel::Nodes::Node
+          object
+        when DateTime, Time
+          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::Nodes.build_quoted(object, self)
+        else
+          raise(ArgumentError, "#{object.class} can not be converted to Date")
+        end
+      end
+
+      def convert_to_number(object)
+        case object
+        when Arel::Attributes::Attribute, Arel::Nodes::Node
+          object
+        when Fixnum, Integer
+          object.to_i.abs
+        when DateTime, Date, Time, String, ActiveSupport::Duration
+          object.to_i.abs
+        when NilClass
+          0
+        else
+          raise(ArgumentError, "#{object.class} can not be converted to NUMBER arg")
+        end
+      end
+
     end
   end
 end

data/lib/arel_extensions/nodes/is_null.rb

@@ -0,0 +1,6 @@
+module ArelExtensions
+  module Nodes
+    class IsNull < Function
+    end
+  end
+end

data/lib/arel_extensions/nodes/replace.rb

@@ -1,34 +1,16 @@
 module ArelExtensions
   module Nodes
-    class Replace < Arel::Nodes::Function
+    class Replace < Function
 
-
-      def initialize expr, left, right, aliaz = nil
-        tab = Array.new
-        tab << expr
-        tab << left
-        tab << right
-        super(tab, aliaz)
-      end
-
-
-      def expr
-        @expressions.first
+      def initialize expr
+        tab = expr.map { |arg|
+          convert_to_node(arg)
+        }
+        return super(tab)
       end
 
-
-      def left
-        @expressions[1]
-      end
-
-
-      def right
-        @expressions[2]
-      end
-
-
-      def as other
-        Arel::Nodes::As.new self, Arel::Nodes::SqlLiteral.new(other)
+      def +(other)
+        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
       end
 
     end

data/lib/arel_extensions/nodes/round.rb

@@ -2,14 +2,14 @@ module ArelExtensions
   module Nodes
     class Round < Function
 
-      def left
-        @expressions.first
+      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
       end
 
-
-      def right
-        @expressions[1]
-      end
     end
   end
 end

data/lib/arel_extensions/nodes.rb

@@ -24,5 +24,5 @@ require 'arel_extensions/nodes/date_diff'
 require 'arel_extensions/nodes/duration'
 
 require 'arel_extensions/nodes/coalesce'
-require 'arel_extensions/nodes/isnull'
+require 'arel_extensions/nodes/is_null'
 require 'arel_extensions/nodes/wday'

data/lib/arel_extensions/null_functions.rb

@@ -2,8 +2,8 @@ module ArelExtensions
   module NullFunctions
 
     #ISNULL function lets you return an alternative value when an expression is NULL.
-    def isnull(other)
-      ArelExtensions::Nodes::Isnull.new self, other
+    def is_null
+      ArelExtensions::Nodes::IsNull.new [self]
     end
     # returns the first non-null expr in the expression list. You must specify at least two expressions.
     #If all occurrences of expr evaluate to null, then the function returns null.

data/lib/arel_extensions/string_functions.rb

@@ -48,7 +48,11 @@ module ArelExtensions
 
     #REPLACE function replaces a sequence of characters in a string with another set of characters, not case-sensitive.
     def replace left, right
-      ArelExtensions::Nodes::Replace.new self, left, right
+      ArelExtensions::Nodes::Replace.new [self, left, right]
+    end
+
+    def group_concat sep = nil
+      ArelExtensions::Nodes::GroupConcat.new [self, sep]
     end
 
     #Function returns a string after removing left, right or the both prefixes or suffixes int argument

data/lib/arel_extensions/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module ArelExtensions
-  VERSION = "0.8.3".freeze
+  VERSION = "0.8.4".freeze
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -2,39 +2,31 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::MySQL.class_eval do
 
-
-      def visit_ArelExtensions_Nodes_DateDiff o, collector
-        collector << "DATEDIFF("
+      #String functions
+      def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
         collector = visit o.left, collector
-        collector << ","
+        collector << ' LIKE '
         collector = visit o.right, collector
-        collector << ")"
-        collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
+        else
+          collector
+        end
       end
 
-
-      def visit_ArelExtensions_Nodes_Duration o, collector
-        #visit left for period
-        if(o.left == "d")
-          collector << "DAY("
-        elsif(o.left == "m")
-          collector << "MONTH("
-        elsif (o.left == "w")
-          collector << "WEEK("
-        elsif (o.left == "y")
-          collector << "YEAR("
-        end
-        #visit right
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
+      def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
+        collector = visit o.left.lower, collector
+        collector << ' NOT LIKE '
+        collector = visit o.right.lower(o.right), collector
+        if o.escape
+          collector << ' ESCAPE '
+          visit o.escape, collector
         else
-          collector << "#{o.right}"
+          collector
         end
-        collector << ")"
-        collector
       end
 
-     #****************************************************************#
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
@@ -45,123 +37,107 @@ module ArelExtensions
         collector
       end
 
-
-      def visit_ArelExtensions_Nodes_Coalesce o, collector
-        collector << "COALESCE("
-        if(o.left.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.left, collector
-        else
-          collector << "#{o.left}"
+      def visit_ArelExtensions_Nodes_GroupConcat o, collector
+        collector << "GROUP_CONCAT("
+        collector = visit o.left, collector
+        if o.right
+          collector << ' SEPARATOR '
+          collector = visit o.right, collector
         end
-           o.other.each { |a|
-          collector << ","
-          if(a.is_a?(Arel::Attributes::Attribute))
-            collector = visit a, collector
-          else
-            collector << "#{a}"
-          end
-        }
-        collector << ")"
-        collector
-      end
-
-      def visit_ArelExtensions_Nodes_Isnull o, collector
-          collector << "IFNULL("
-         collector = visit o.left, collector
-         collector << ","
-         if(o.right.is_a?(Arel::Attributes::Attribute))
-         collector = visit o.right, collector
-         else
-         collector << "'#{o.right}'"
-         end
-         collector << ")"
-         collector
-      end
-
-
-       def visit_ArelExtensions_Nodes_Replace o, collector
-         collector << "REPLACE("
-         collector = visit o.expr,collector
-         collector << ","
-         if(o.left.is_a?(Arel::Attributes::Attribute))
-           collector = visit o.left, collector
-         else
-           collector << "'#{o.left}'"
-         end
-         collector << ","
-         if(o.right.is_a?(Arel::Attributes::Attribute))
-           collector = visit o.right, collector
-         else
-           collector << "'#{o.right}'"
-         end
-         collector << ")"
-         collector
-       end
-
-
-      def visit_ArelExtensions_Nodes_Soundex o, collector
-        collector << "SOUNDEX("
-       if((o.expr).is_a?(Arel::Attributes::Attribute))
-        collector = visit o.expr, collector
-      else
-          collector << "'#{o.expr}'"
-       end
         collector << ")"
         collector
       end
 
-
-
-      def visit_ArelExtensions_Nodes_Trim o , collector
-          collector << 'TRIM(BOTH '
-          if(o.right.is_a?(Arel::Attributes::Attribute))
-            collector = visit o.right, collector
-          else
-            collector << "'#{o.right}'"
-          end
+      def visit_ArelExtensions_Nodes_Trim o, collector
+          collector << 'TRIM(' # BOTH
+          collector = visit o.right, collector
           collector << " FROM "
           collector = visit o.left, collector
-
           collector << ")"
           collector
       end
 
       def visit_ArelExtensions_Nodes_Ltrim o , collector
           collector << 'TRIM(LEADING '
-          if(o.right.is_a?(Arel::Attributes::Attribute))
-            collector = visit o.right, collector
-          else
-            collector << "'#{o.right}'"
-          end
+          collector = visit o.right, collector
           collector << " FROM "
           collector = visit o.left, collector
-
           collector << ")"
           collector
       end
 
-
       def visit_ArelExtensions_Nodes_Rtrim o , collector
-          collector << 'TRIM(TRAILING '
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
+        collector << 'TRIM(TRAILING '
+        collector = visit o.right, collector
         collector << " FROM "
         collector = visit o.left, collector
+        collector << ")"
+        collector
+      end
+      def visit_ArelExtensions_Nodes_DateDiff o, collector
+        collector << "DATEDIFF("
+        collector = visit o.left, collector
+        collector << Arel::Visitors::MySQL::COMMA
+        collector = visit o.right, collector
+        collector << ")"
+        collector
+      end
 
+      def visit_ArelExtensions_Nodes_DateAdd o, collector
+        collector << "DATE_ADD("
+        collector = visit o.left, collector
+        collector << Arel::Visitors::MySQL::COMMA
+        collector = visit o.mysql_value(o.right), collector
         collector << ")"
         collector
       end
 
+
+      def visit_ArelExtensions_Nodes_Duration o, collector
+        #visit left for period
+        if o.left == "d" 
+          collector << "DAY("
+        elsif(o.left == "m")
+          collector << "MONTH("
+        elsif (o.left == "w")
+          collector << "WEEK("
+        elsif (o.left == "y")
+          collector << "YEAR("
+        end
+        #visit right
+        collector = visit o.right, collector
+        collector << ")"
+        collector
+      end
+
+     #****************************************************************#
+
+      def visit_ArelExtensions_Nodes_IsNull o, collector
+        collector << "ISNULL("
+        collector = visit o.left, collector
+        if o.right
+          collector << Arel::Visitors::MySQL::COMMA
+          collector = visit o.right, collector
+        end
+        collector << ")"
+        collector
+      end
+
+
+      def visit_ArelExtensions_Nodes_Replace o, collector
+        collector << "REPLACE("
+        o.expressions.each_with_index { |arg, i|
+          collector << Arel::Visitors::MySQL::COMMA unless i == 0
+          collector = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
+
       def visit_ArelExtensions_Nodes_Wday o, collector
         collector << "(WEEKDAY("
-        if((o.date).is_a?(Arel::Attributes::Attribute))
-          collector = visit o.date, collector
-        else
-          collector << "'#{o.date}'"
-        end
+        collector = visit o.date, collector
         collector << ") + 1) % 7"
         collector
       end

data/lib/arel_extensions/visitors/oracle.rb

@@ -26,47 +26,27 @@ module ArelExtensions
         end
       end
 
-      #deprecated
-  def visit_ArelExtensions_Nodes_ConcatDep o, collector
-    arg = o.left.relation.engine.columns.find{|c| c.name == o.left.name.to_s}.type
-    if(o.right.is_a?(Arel::Attributes::Attribute))
-      collector << "CONCAT("
-      collector = visit o.left, collector
-      collector << ","
-      collector = visit o.right, collector
-      collector << ")"
-    elsif ( arg === :date || arg === :datetime)
-      collector << "DATEADD("
-      collector = visit o.left, collector
-      collector << ", + interval '#{o.right}' DAY)"
-    else
-      collector << "CONCAT("
-      collector = visit o.left, collector
-      collector << ","
-      collector << "#{o.right})"
-    end
-    collector
-  end
-
+      def visit_ArelExtensions_Nodes_GroupConcat o, collector
+        collector << "LISTAGG("
+        collector = visit o.left, collector
+        if o.right
+          collector << Arel::Visitors::Oracle::COMMA
+          collector = visit o.right, collector
+        end
+        collector << ")"
+        collector
+      end
 
-  def visit_ArelExtensions_Nodes_Coalesce o, collector
-    collector << "COALESCE("
-    if(o.left.is_a?(Arel::Attributes::Attribute))
-      collector = visit o.left, collector
-    else
-      collector << "#{o.left}"
-    end
-       o.other.each { |a|
-      collector << ","
-      if(a.is_a?(Arel::Attributes::Attribute))
-        collector = visit a, collector
-      else
-        collector << "#{a}"
+      def visit_ArelExtensions_Nodes_Coalesce o, collector
+        collector << "COALESCE("
+        collector = visit o.left, collector
+        o.other.each { |a|
+          collector << Arel::Visitors::Oracle::COMMA
+          collector = visit a, collector
+        }
+        collector << ")"
+        collector
       end
-    }
-    collector << ")"
-    collector
-  end
 
   def visit_ArelExtensions_Nodes_DateDiff o, collector
     collector << '('
@@ -90,11 +70,7 @@ module ArelExtensions
       collector << "YEAR("
     end
     #visit right
-    if(o.right.is_a?(Arel::Attributes::Attribute))
-      collector = visit o.right, collector
-    else
-      collector << "'#{o.right}'"
-    end
+    collector = visit o.right, collector
     collector << ")"
     collector
   end
@@ -108,25 +84,20 @@ module ArelExtensions
   end
 
 
-  def visit_ArelExtensions_Nodes_Isnull o, collector
+  def visit_ArelExtensions_Nodes_IsNull o, collector
     collector << "NVL("
     collector = visit o.left, collector
-    collector << ","
-    if(o.right.is_a?(Arel::Attributes::Attribute))
-      collector = visit o.right, collector
-    else
-      collector << "'#{o.right}'"
-    end
+    collector << Arel::Visitors::Oracle::COMMA
+    collector = visit Arel::Nodes.build_quoted(true), collector
     collector << ")"
     collector
   end
 
-
   def visit_ArelExtensions_Nodes_Rand o, collector
     collector << "dbms_random.value("
     if(o.left != nil && o.right != nil)
       collector << "'#{o.left}'"
-      collector << ","
+      collector << Arel::Visitors::Oracle::COMMA
       collector << "'#{o.right}'"
     end
     collector << ")"
@@ -136,18 +107,10 @@ module ArelExtensions
   def visit_ArelExtensions_Nodes_Replace o, collector
     collector << "REPLACE("
     collector = visit o.expr,collector
-    collector << ","
-    if(o.left.is_a?(Arel::Attributes::Attribute))
-      collector = visit o.left, collector
-    else
-      collector << "'#{o.left}'"
-    end
-    collector << ","
-    if(o.right.is_a?(Arel::Attributes::Attribute))
-      collector = visit o.right, collector
-    else
-      collector << "'#{o.right}'"
-    end
+    collector << Arel::Visitors::Oracle::COMMA
+    collector = visit o.left, collector
+    collector << Arel::Visitors::Oracle::COMMA
+    collector = visit o.right, collector
     collector << ")"
     collector
   end