arel_extensions 1.2.14 → 1.2.19

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

data/lib/arel_extensions/nodes/union.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class Union < Arel::Nodes::Union
-
       def initialize left,right
         return super(left,right)
       end
@@ -18,6 +17,5 @@ module ArelExtensions
         Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/union_all.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Nodes
     class UnionAll < Arel::Nodes::UnionAll
-
       def initialize left,right
         return super(left,right)
       end
@@ -14,6 +13,5 @@ module ArelExtensions
         Arel::Nodes::TableAlias.new Arel::Nodes::Grouping.new(self), Arel::Nodes::SqlLiteral.new(other.to_s)
       end
     end
-
   end
 end

data/lib/arel_extensions/nodes/wday.rb

@@ -1,19 +1,15 @@
 module ArelExtensions
   module Nodes
     class Wday < Function
-
-
       def initialize other, aliaz = nil
         tab = Array.new
         tab << other
         super(tab, aliaz)
       end
 
-
       def date
         @expressions.first
       end
-
     end
   end
 end

data/lib/arel_extensions/null_functions.rb

@@ -3,23 +3,21 @@ require 'arel_extensions/nodes/is_null'
 
 module ArelExtensions
   module NullFunctions
-
-    #ISNULL function lets you return an alternative value when an expression is NULL.
+    # ISNULL function lets you return an alternative value when an expression is NULL.
     def is_null
       ArelExtensions::Nodes::IsNull.new [self]
     end
 
-    #ISNOTNULL function lets you return an alternative value when an expression is NOT NULL.
+    # 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.
+    # If all occurrences of expr evaluate to null, then the function returns null.
     def coalesce *args
       args.unshift(self)
       ArelExtensions::Nodes::Coalesce.new args
     end
-
   end
 end

data/lib/arel_extensions/predications.rb

@@ -1,6 +1,5 @@
 module ArelExtensions
   module Predications
-
     def when right, expression = nil
       ArelExtensions::Nodes::Case.new(self).when(right,expression)
     end
@@ -21,12 +20,12 @@ 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
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::In.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -49,12 +48,12 @@ module ArelExtensions
       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
+      when Arel::Nodes::Grouping, ArelExtensions::Nodes::Union, ArelExtensions::Nodes::UnionAll
         Arel::Nodes::NotIn.new(self, quoted_node(other))
       when Enumerable
         nils, values   = other.partition{ |v| v.nil? }
@@ -94,7 +93,7 @@ module ArelExtensions
       when ActiveSupport::Duration
         object.to_i
       else
-        raise(ArgumentError, "#{object.class} can not be converted to CONCAT arg")
+        raise(ArgumentError, "#{object.class} cannot be converted to CONCAT arg")
       end
     end
   end

data/lib/arel_extensions/railtie.rb

@@ -1,9 +1,9 @@
 require 'rails'
 
 module ArelExtensions
-	class Railtie < Rails::Railtie
-		rake_tasks do
-    		load 'arel_extensions/tasks.rb'
-    	end
-	end
+  class Railtie < Rails::Railtie
+    rake_tasks do
+        load 'arel_extensions/tasks.rb'
+    end
+  end
 end

data/lib/arel_extensions/set_functions.rb

@@ -3,7 +3,6 @@ require 'arel_extensions/nodes/union_all'
 
 module ArelExtensions
   module SetFunctions
-
     def +(other)
       ArelExtensions::Nodes::Union.new(self,other)
     end
@@ -19,7 +18,6 @@ module ArelExtensions
     def uniq
       self
     end
-
   end
 end
 

data/lib/arel_extensions/string_functions.rb

@@ -1,4 +1,4 @@
-require 'arel_extensions/nodes/concat' #if Arel::VERSION.to_i < 7
+require 'arel_extensions/nodes/concat' # if Arel::VERSION.to_i < 7
 require 'arel_extensions/nodes/length'
 require 'arel_extensions/nodes/locate'
 require 'arel_extensions/nodes/substring'
@@ -19,19 +19,18 @@ require 'arel_extensions/nodes/md5'
 
 module ArelExtensions
   module StringFunctions
-
-    #*FindInSet function .......
+    # *FindInSet function .......
     def &(other)
       ArelExtensions::Nodes::FindInSet.new [other, self]
     end
 
-    #LENGTH function returns the length of the value in a text field.
+    # LENGTH function returns the length of the value in a text field.
     def length
       ArelExtensions::Nodes::Length.new [self]
     end
 
-    #LOCATE function returns the first starting position of a string in another string.
-    #If string1 or string2 is NULL then it returns NULL. If string1 not found in string2 then it returns 0.
+    # LOCATE function returns the first starting position of a string in another string.
+    # If string1 or string2 is NULL then it returns NULL. If string1 not found in string2 then it returns 0.
     def locate val
       ArelExtensions::Nodes::Locate.new [self, val]
     end
@@ -51,7 +50,7 @@ module ArelExtensions
       end
     end
 
-    #SOUNDEX function returns a character string containing the phonetic representation of char.
+    # SOUNDEX function returns a character string containing the phonetic representation of char.
     def soundex
       ArelExtensions::Nodes::Soundex.new [self]
     end
@@ -64,18 +63,18 @@ 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 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
@@ -117,7 +116,7 @@ module ArelExtensions
       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.
+    # REPLACE function replaces a sequence of characters in a string with another set of characters, not case-sensitive.
     def replace pattern, substitute
       if pattern.is_a? Regexp
         ArelExtensions::Nodes::RegexpReplace.new self, pattern, substitute
@@ -134,7 +133,7 @@ module ArelExtensions
       ArelExtensions::Nodes::Concat.new [self, other]
     end
 
-    #concat elements of a group, separated by sep and ordered by a list of Ascending or Descending
+    # concat elements of a group, separated by sep and ordered by a list of Ascending or Descending
     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.")
@@ -149,7 +148,7 @@ module ArelExtensions
       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
+    # Function returns a string after removing left, right or the both prefixes or suffixes int argument
     def trim other = ' '
       ArelExtensions::Nodes::Trim.new [self, other]
     end

data/lib/arel_extensions/tasks.rb

@@ -1,6 +1,6 @@
 namespace :arel_extensions do
   desc 'Install DB functions into current DB'
-  task :install_functions => :environment do
+  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

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.2.14".freeze
+  VERSION = "1.2.19".freeze
 end

data/lib/arel_extensions/visitors.rb

@@ -1,81 +1,89 @@
+require 'arel_extensions/visitors/convert_format'
 require 'arel_extensions/visitors/to_sql'
 require 'arel_extensions/visitors/mysql'
-require 'arel_extensions/visitors/oracle'
-require 'arel_extensions/visitors/oracle12'
 require 'arel_extensions/visitors/postgresql'
 require 'arel_extensions/visitors/sqlite'
-require 'arel_extensions/visitors/mssql'
 
-class Arel::Visitors::MSSQL
-  include ArelExtensions::Visitors::MSSQL
+if defined?(Arel::Visitors::Oracle)
+  require 'arel_extensions/visitors/oracle'
+  require 'arel_extensions/visitors/oracle12'
+end
+
+if defined?(Arel::Visitors::MSSQL)
+  require 'arel_extensions/visitors/mssql'
 
-  alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
-  def visit_Arel_Nodes_As o, collector
-    if o.left.is_a?(Arel::Nodes::Binary)
-      collector << '('
-      collector = visit o.left, collector
-      collector << ')'
-    else
-      collector = visit o.left, collector
+  class Arel::Visitors::MSSQL
+    include ArelExtensions::Visitors::MSSQL
+
+    alias_method(:old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As) rescue nil
+    def visit_Arel_Nodes_As o, collector
+      if o.left.is_a?(Arel::Nodes::Binary)
+        collector << '('
+        collector = visit o.left, collector
+        collector << ')'
+      else
+        collector = visit o.left, collector
+      end
+      collector << " AS ["
+      collector = visit o.right, collector
+      collector << "]"
+      collector
     end
-    collector << " AS ["
-    collector = visit o.right, collector
-    collector << "]"
-    collector
-  end
 
-  alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-  def visit_Arel_Nodes_SelectStatement o, collector
-    if !collector.value.blank? && o.limit.blank? && o.offset.blank?
-      o = o.dup
-      o.orders = []
+    alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
+    def visit_Arel_Nodes_SelectStatement o, collector
+      if !collector.value.blank? && o.limit.blank? && o.offset.blank?
+        o = o.dup
+        o.orders = []
+      end
+      old_visit_Arel_Nodes_SelectStatement(o,collector)
     end
-    old_visit_Arel_Nodes_SelectStatement(o,collector)
   end
-end
 
-begin
-  require 'arel_sqlserver'
-  if Arel::VERSION.to_i == 6
-    if Arel::Visitors::VISITORS['sqlserver'] && Arel::Visitors::VISITORS['sqlserver'] != Arel::Visitors::MSSQL
-      Arel::Visitors::VISITORS['sqlserver'].class_eval do
-        include ArelExtensions::Visitors::MSSQL
+  begin
+    require 'arel_sqlserver'
+    if Arel::VERSION.to_i == 6
+      if Arel::Visitors::VISITORS['sqlserver'] && Arel::Visitors::VISITORS['sqlserver'] != Arel::Visitors::MSSQL
+        Arel::Visitors::VISITORS['sqlserver'].class_eval do
+          include ArelExtensions::Visitors::MSSQL
 
-        alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-        def visit_Arel_Nodes_SelectStatement o, collector
-          if !collector.value.blank? && o.limit.blank? && o.offset.blank?
-            o = o.dup
-            o.orders = []
+          alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
+          def visit_Arel_Nodes_SelectStatement o, collector
+            if !collector.value.blank? && o.limit.blank? && o.offset.blank?
+              o = o.dup
+              o.orders = []
+            end
+            old_visit_Arel_Nodes_SelectStatement(o,collector)
           end
-          old_visit_Arel_Nodes_SelectStatement(o,collector)
-        end
 
-        alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
-        def visit_Arel_Nodes_As o, collector
-          if o.left.is_a?(Arel::Nodes::Binary)
-            collector << '('
-            collector = visit o.left, collector
-            collector << ')'
-          else
-            collector = visit o.left, collector
+          alias_method(:old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As) rescue nil
+          def visit_Arel_Nodes_As o, collector
+            if o.left.is_a?(Arel::Nodes::Binary)
+              collector << '('
+              collector = visit o.left, collector
+              collector << ')'
+            else
+              collector = visit o.left, collector
+            end
+            collector << " AS ["
+            collector = visit o.right, collector
+            collector << "]"
+            collector
           end
-          collector << " AS ["
-          collector = visit o.right, collector
-          collector << "]"
-          collector
-        end
 
-        alias_method :old_primary_Key_From_Table, :primary_Key_From_Table
-        def primary_Key_From_Table t
-          return unless t
-          column_name = @connection.schema_cache.primary_keys(t.name) ||
-            @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
-          column_name ? t[column_name] : nil
+          alias_method(:old_primary_Key_From_Table, :primary_Key_From_Table) rescue nil
+          def primary_Key_From_Table t
+            return unless t
+
+            column_name = @connection.schema_cache.primary_keys(t.name) ||
+                          @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
+            column_name ? t[column_name] : nil
+          end
         end
       end
     end
-  end
   rescue LoadError
-rescue => e
-    e
+  rescue => e
+      e
+  end
 end