arel_extensions 1.2.2 → 1.2.13

data/lib/arel_extensions/nodes/substring.rb

@@ -1,22 +1,15 @@
 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
+        return super(tab)
+      end
 
     end
   end

data/lib/arel_extensions/nodes/sum.rb

@@ -0,0 +1,7 @@
+module ArelExtensions
+  module Nodes
+    class Sum < AggregateFunction
+      RETURN_TYPE = :number
+    end
+  end
+end

data/lib/arel_extensions/nodes/trim.rb

@@ -2,7 +2,7 @@ module ArelExtensions
   module Nodes
     class Trim < Function
       RETURN_TYPE = :string
-      
+
       def initialize expr
         tab = expr.map { |arg|
           convert_to_node(arg)
@@ -11,13 +11,13 @@ module ArelExtensions
       end
 
       def +(other)
-        return 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

data/lib/arel_extensions/nodes/union.rb

@@ -7,11 +7,11 @@ module ArelExtensions
       end
 
       def +(other)
-        return ArelExtensions::Nodes::Union.new(self,other) 
+        return ArelExtensions::Nodes::Union.new(self,other)
       end
 
       def union(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other) 
+        return ArelExtensions::Nodes::UnionAll.new(self,other)
       end
 
       def as other
@@ -21,4 +21,3 @@ module ArelExtensions
 
   end
 end
-

data/lib/arel_extensions/nodes/union_all.rb

@@ -7,7 +7,7 @@ module ArelExtensions
       end
 
       def union_all(other)
-        return ArelExtensions::Nodes::UnionAll.new(self,other) 
+        return ArelExtensions::Nodes::UnionAll.new(self,other)
       end
 
       def as other
@@ -17,4 +17,3 @@ module ArelExtensions
 
   end
 end
-

data/lib/arel_extensions/null_functions.rb

@@ -8,12 +8,12 @@ module ArelExtensions
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
     end
-    
+
     #ISNOTNULL function lets you return an alternative value when an expression is NOT NULL.
     def is_not_null
       ArelExtensions::Nodes::IsNotNull.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.
     def coalesce *args

data/lib/arel_extensions/predications.rb

@@ -1,10 +1,11 @@
 module ArelExtensions
   module Predications
-    def when right, expression=nil
+
+    def when right, expression = nil
       ArelExtensions::Nodes::Case.new(self).when(right,expression)
     end
 
-    def matches(other, escape=nil,case_sensitive= nil)
+    def matches(other, escape = nil,case_sensitive = nil)
       if Arel::VERSION.to_i < 7
         Arel::Nodes::Matches.new(self, Arel::Nodes.build_quoted(other), escape)
       else
@@ -12,7 +13,7 @@ module ArelExtensions
       end
     end
 
-    def imatches(other, escape=nil)
+    def imatches(other, escape = nil)
       ArelExtensions::Nodes::IMatches.new(self, other, escape)
     end
 
@@ -20,51 +21,53 @@ module ArelExtensions
       ArelExtensions::Nodes::Cast.new([self,right])
     end
 
-    def in(other) #In should handle nil element in the Array
+    def in(*other) #In should handle nil element in the Array
+      other = other.first if other.length <= 1
       case other
       when Range
         self.between(other)
+      when Arel::Nodes::Grouping
+        Arel::Nodes::In.new(self, quoted_node(other))
       when Enumerable
-        if other.include?(nil)
-          other.delete(nil)
-          case other.length
-          when 0
-            self.is_null
-          when 1
-            self.is_null.or(self==other[0])
-          else
-            self.is_null.or(Arel::Nodes::In.new(self,quoted_array(other)))
-          end
-        else
-          Arel::Nodes::In.new(self,quoted_array(other))
-        end
+        nils, values   = other.partition{ |v| v.nil? }
+        ranges, values = values.partition{ |v| v.is_a?(Range) || v.is_a?(Arel::SelectManager)}
+        # In order of (imagined) decreasing efficiency: nil, values, and then more complex.
+        clauses =
+          nils.uniq.map { |r| self.in(r) } \
+          + (case values.uniq.size
+              when 0 then []
+              when 1 then [values[0].is_a?(Arel::Nodes::Grouping) ? self.in(values[0]) : self.eq(values[0])]
+              else [Arel::Nodes::In.new(self, quoted_array(values))] end) \
+          + ranges.uniq.map { |r| self.in(r) }
+        clauses.empty? ? Arel.false : clauses.reduce(&:or)
       when nil
         self.is_null
       when Arel::SelectManager
         Arel::Nodes::In.new(self, other.ast)
       else
-        Arel::Nodes::In.new(self,quoted_node(other))
+        Arel::Nodes::In.new(self, quoted_node(other))
       end
     end
 
-    def not_in(other) #In should handle nil element in the Array
+    def not_in(*other) #In should handle nil element in the Array
+      other = other.first if other.length <= 1
       case other
       when Range
         Arel::Nodes::Not.new(self.between(other))
+      when Arel::Nodes::Grouping
+        Arel::Nodes::NotIn.new(self, quoted_node(other))
       when Enumerable
-        if other.include?(nil)
-          other.delete(nil)
-          case other.length
-          when 0
-            self.is_not_null
-          when 1
-            self.is_not_null.and(self!=other[0])
-          else
-            self.is_not_null.and(Arel::Nodes::NotIn.new(self,quoted_array(other)))
-          end
-        else
-          Arel::Nodes::NotIn.new(self,quoted_array(other))
-        end
+        nils, values   = other.partition{ |v| v.nil? }
+        ranges, values = values.partition{ |v| v.is_a?(Range) || v.is_a?(Arel::SelectManager)}
+        # In order of (imagined) decreasing efficiency: nil, values, and then more complex.
+        clauses =
+          nils.uniq.map { |r| self.not_in(r) } \
+          + (case values.uniq.size
+              when 0 then []
+              when 1 then [values[0].is_a?(Arel::Nodes::Grouping) ? self.not_in(values[0]) : self.not_eq(values[0])]
+              else [Arel::Nodes::NotIn.new(self, quoted_array(values))] end) \
+          + ranges.uniq.map { |r| self.not_in(r) }
+        Arel::Nodes::And.new clauses
       when nil
         self.is_not_null
       when Arel::SelectManager
@@ -94,6 +97,5 @@ module ArelExtensions
         raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
       end
     end
-
   end
 end

data/lib/arel_extensions/set_functions.rb

@@ -2,31 +2,31 @@ require 'arel_extensions/nodes/union'
 require 'arel_extensions/nodes/union_all'
 
 module ArelExtensions
-	module SetFunctions
+  module SetFunctions
 
-		def +(other)
-			ArelExtensions::Nodes::Union.new(self,other)
-		end		
+    def +(other)
+      ArelExtensions::Nodes::Union.new(self,other)
+    end
 
-		def union(other)
-			ArelExtensions::Nodes::Union.new(self,other)
-		end		
+    def union(other)
+      ArelExtensions::Nodes::Union.new(self,other)
+    end
 
-		def union_all(other)
-			ArelExtensions::Nodes::UnionAll.new(self,other)
-		end
+    def union_all(other)
+      ArelExtensions::Nodes::UnionAll.new(self,other)
+    end
 
-		def uniq
-			self
-		end
+    def uniq
+      self
+    end
 
-	end
+  end
 end
 
-Arel::Nodes::Union.class_eval do
+class Arel::Nodes::Union
   include ArelExtensions::SetFunctions
 end
 
-Arel::Nodes::UnionAll.class_eval do
+class Arel::Nodes::UnionAll
   include ArelExtensions::SetFunctions
 end

data/lib/arel_extensions/string_functions.rb

@@ -64,6 +64,19 @@ module ArelExtensions
       grouping_any :imatches, others, escape
     end
 
+#    def grouping_any method, others, *extra
+#      puts "*******************"
+#      puts method
+#      puts others.inspect
+#      puts extra.inspect
+#      puts "-------------------"
+#      res = super(method,others,*extra)
+#      puts res.to_sql
+#      puts res.inspect
+#      puts "*******************"
+#      res
+#    end
+
     def imatches_all others, escape = nil
       grouping_all :imatches, others, escape, escape
     end
@@ -92,7 +105,7 @@ module ArelExtensions
       ArelExtensions::Nodes::SMatches.new(self,other)
     end
 
-    def ai_collate 
+    def ai_collate
       ArelExtensions::Nodes::Collate.new(self,nil,true,false)
     end
 
@@ -100,31 +113,40 @@ module ArelExtensions
       ArelExtensions::Nodes::Collate.new(self,nil,false,true)
     end
 
-    def collate ai=false,ci=false, option=nil
+    def collate ai = false,ci = false, option = nil
       ArelExtensions::Nodes::Collate.new(self,option,ai,ci)
     end
 
     #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]
+    def replace pattern, substitute
+      if pattern.is_a? Regexp
+        ArelExtensions::Nodes::RegexpReplace.new self, pattern, substitute
+      else
+        ArelExtensions::Nodes::Replace.new self, pattern, substitute
+      end
+    end
+
+    def regexp_replace pattern, substitute
+      ArelExtensions::Nodes::RegexpReplace.new self, pattern, substitute
     end
-    
+
     def concat other
       ArelExtensions::Nodes::Concat.new [self, other]
     end
 
     #concat elements of a group, separated by sep and ordered by a list of Ascending or Descending
-    def group_concat sep = nil, *orders 
+    def group_concat(sep = nil, *orders, group: nil, order: nil)
+      if orders.present?
+        warn("Warning : ArelExtensions: group_concat: you should now use the kwarg 'order' to specify an order in the group_concat.")
+      end
       order_tabs = [orders].flatten.map{ |o|
         if o.is_a?(Arel::Nodes::Ascending) || o.is_a?(Arel::Nodes::Descending)
           o
         elsif o.respond_to?(:asc)
           o.asc
-        else
-          nil
         end
       }.compact
-      ArelExtensions::Nodes::GroupConcat.new [self, sep, order_tabs]
+      ArelExtensions::Nodes::GroupConcat.new(self, sep, group: group, order: (order || order_tabs))
     end
 
     #Function returns a string after removing left, right or the both prefixes or suffixes int argument
@@ -155,11 +177,11 @@ module ArelExtensions
     def not_blank
       ArelExtensions::Nodes::NotBlank.new [self]
     end
-    
-    def repeat other = 1 
+
+    def repeat other = 1
       ArelExtensions::Nodes::Repeat.new [self, other]
     end
-    
+
     def levenshtein_distance other
       ArelExtensions::Nodes::LevenshteinDistance.new [self, other]
     end

data/lib/arel_extensions/tasks.rb

@@ -1,12 +1,12 @@
 namespace :arel_extensions do
-	desc 'Install DB functions into current DB'
-	task :install_functions => :environment do
-		@env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+  desc 'Install DB functions into current DB'
+  task :install_functions => :environment do
+    @env_db = if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
                 (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
               else
                 ENV['DB'] || ActiveRecord::Base.connection.adapter_name
               end
-    ActiveRecord::Base.establish_connection(Rails.env)
+    ActiveRecord::Base.establish_connection(Rails.env.to_sym)
     CommonSqlFunctions.new(ActiveRecord::Base.connection).add_sql_functions(@env_db)
-	end
+  end
 end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.13".freeze
 end

data/lib/arel_extensions/visitors.rb

@@ -6,7 +6,7 @@ require 'arel_extensions/visitors/postgresql'
 require 'arel_extensions/visitors/sqlite'
 require 'arel_extensions/visitors/mssql'
 
-Arel::Visitors::MSSQL.class_eval do
+class Arel::Visitors::MSSQL
   include ArelExtensions::Visitors::MSSQL
 
   alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::IBM_DB.class_eval do
+    class Arel::Visitors::IBM_DB
 
       def visit_ArelExtensions_Nodes_Ceil o, collector
         collector << "CEILING("

data/lib/arel_extensions/visitors/mssql.rb

@@ -51,14 +51,14 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "("
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << " IS NULL)"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
           collector << "("
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << " IS NOT NULL)"
           collector
       end
@@ -234,11 +234,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-        visit o.left.coalesce('').trim.length.eq(0), collector
+        visit o.expr.coalesce('').trim.length.eq(0), collector
       end
 
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-        visit o.left.coalesce('').trim.length.gt(0), collector
+        visit o.expr.coalesce('').trim.length.gt(0), collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
@@ -400,14 +400,15 @@ module ArelExtensions
         collector << "(STRING_AGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        if o.right  && o.right != 'NULL'
-          collector = visit o.right, collector
-        else
-          collector = visit Arel::Nodes.build_quoted(','), collector
-        end
+        collector =
+          if o.separator && o.separator != 'NULL'
+            visit o.separator, collector
+          else
+            visit Arel::Nodes.build_quoted(','), collector
+          end
         collector << ") WITHIN GROUP (ORDER BY "
-        if !o.orders.blank?
-          o.orders.each_with_index do |order,i|
+        if o.order.present?
+          o.order.each_with_index do |order,i|
             collector << Arel::Visitors::Oracle::COMMA unless i == 0
             collector = visit order, collector
           end
@@ -466,8 +467,9 @@ module ArelExtensions
               Arel::Nodes.build_quoted(1) :
               ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
 
-        if o.scientific_notation
-          number = ArelExtensions::Nodes::Concat.new([
+        number =
+          if o.scientific_notation
+            ArelExtensions::Nodes::Concat.new([
                   Arel::Nodes::NamedFunction.new('FORMAT',[
                     col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
                     param,
@@ -480,13 +482,13 @@ module ArelExtensions
                     locale
                   ])
                 ])
-        else
-          number = Arel::Nodes::NamedFunction.new('FORMAT',[
+          else
+            Arel::Nodes::NamedFunction.new('FORMAT',[
                 Arel::Nodes.build_quoted(col.abs),
                 param,
                 locale
               ])
-        end
+          end
 
         repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
           when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
@@ -548,7 +550,6 @@ module ArelExtensions
         collector
       end
 
-
     end
   end
 end