arel_extensions 2.0.9 → 2.0.14

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 = "2.0.9".freeze
+  VERSION = "2.0.14".freeze
 end

data/lib/arel_extensions/visitors.rb

@@ -1,3 +1,4 @@
+require 'arel_extensions/visitors/convert_format'
 require 'arel_extensions/visitors/to_sql'
 require 'arel_extensions/visitors/mysql'
 require 'arel_extensions/visitors/oracle'
@@ -9,7 +10,7 @@ require 'arel_extensions/visitors/mssql'
 class Arel::Visitors::MSSQL
   include ArelExtensions::Visitors::MSSQL
 
-  alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
+  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 << '('
@@ -24,7 +25,7 @@ class Arel::Visitors::MSSQL
     collector
   end
 
-  alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+  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
@@ -41,7 +42,7 @@ begin
       Arel::Visitors::VISITORS['sqlserver'].class_eval do
         include ArelExtensions::Visitors::MSSQL
 
-        alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+        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
@@ -50,7 +51,7 @@ begin
           old_visit_Arel_Nodes_SelectStatement(o,collector)
         end
 
-        alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
+        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 << '('
@@ -65,17 +66,18 @@ begin
           collector
         end
 
-        alias_method :old_primary_Key_From_Table, :primary_Key_From_Table
+        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)
+                        @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
           column_name ? t[column_name] : nil
         end
       end
     end
   end
-  rescue LoadError
+rescue LoadError
 rescue => e
     e
 end

data/lib/arel_extensions/visitors/convert_format.rb

@@ -0,0 +1,37 @@
+module ArelExtensions
+  module Visitors
+    # Convert date format in strftime syntax to whatever the RDBMs
+    # wants, based on the table of conversion +mapping+.
+    def self.strftime_to_format format, mapping
+      @mapping_regexps ||= {}
+      @mapping_regexps[mapping] ||=
+        Regexp.new(
+          mapping
+            .keys
+            .map{|k| Regexp.escape(k)}
+            .join('|')
+        )
+
+      regexp = @mapping_regexps[mapping]
+      s = StringScanner.new format
+      res = StringIO.new
+      while !s.eos?
+        res <<
+          case
+          when s.scan(regexp)
+            if v = mapping[s.matched]
+              v
+            else
+              # Should never happen.
+              s.matched
+            end
+          when s.scan(/[^%]+/)
+            s.matched
+          when s.scan(/./)
+            s.matched
+          end
+      end
+      res.string
+    end
+  end
+end

data/lib/arel_extensions/visitors/ibm_db.rb

@@ -1,7 +1,6 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::IBM_DB
-
       def visit_ArelExtensions_Nodes_Ceil o, collector
         collector << "CEILING("
         collector = visit o.expr, collector
@@ -12,14 +11,13 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << "LTRIM(RTRIM("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::IBM_DB::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << "))"
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << "DAY("
         collector = visit o.left, collector
@@ -33,9 +31,8 @@ module ArelExtensions
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_Duration o, collector
-        #visit left for period
+        # visit left for period
         if o.left == "d"
           collector << "DAY("
         elsif o.left == "m"
@@ -45,7 +42,7 @@ module ArelExtensions
         elsif o.left == "y"
           collector << "YEAR("
         end
-        #visit right
+        # visit right
         if o.right.is_a?(Arel::Attributes::Attribute)
           collector = visit o.right, collector
         else
@@ -55,12 +52,11 @@ module ArelExtensions
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "COALESCE("
         collector = visit o.left, collector
         collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
+        if (o.right.is_a?(Arel::Attributes::Attribute))
           collector = visit o.right, collector
         else
           collector << "'#{o.right}'"
@@ -68,9 +64,6 @@ module ArelExtensions
         collector << ")"
         collector
       end
-
-
-
     end
   end
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -1,13 +1,25 @@
 module ArelExtensions
   module Visitors
     module MSSQL
-      Arel::Visitors::MSSQL::DATE_MAPPING = {'d' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week', 'h' => 'hour', 'mn' => 'minute', 's' => 'second'}
+      Arel::Visitors::MSSQL::DATE_MAPPING = {
+        'd' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week', 'h' => 'hour', 'mn' => 'minute', 's' => 'second'
+      }.freeze
+
       Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' =>   '', '%b' => '', '%^b' => '', # year, month
         '%d' => 'DD', '%e' => '', '%j' =>   '', '%w' => 'dw', '%A' => '', # day, weekday
         '%H' => 'hh', '%k' => '', '%I' =>   '', '%l' =>   '', '%P' => '', '%p' => '', # hours
         '%M' => 'mi', '%S' => 'ss', '%L' => 'ms', '%N' => 'ns', '%z' => 'tz'
-      }
+      }.freeze
+
+      Arel::Visitors::MSSQL::DATE_FORMAT_REGEX =
+        Regexp.new(
+          Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES
+            .keys
+            .map{|k| Regexp.escape(k)}
+            .join('|')
+        ).freeze
+
       # TODO; all others... http://www.sql-server-helper.com/tips/date-formats.aspx
       Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS = {
         'YYYY-MM-DD' => 120,
@@ -19,7 +31,7 @@ module ArelExtensions
         'DD-MM-YY'   => 5,
         'DD.MM.YYYY' => 104,
         'YYYY-MM-DDTHH:MM:SS:MMM' => 126
-      }
+      }.freeze
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
@@ -32,7 +44,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Log10 o, collector
           collector << "LOG10("
           o.expressions.each_with_index { |arg, i|
-            collector << Arel::Visitors::ToSql::COMMA unless i == 0
+            collector << Arel::Visitors::ToSql::COMMA if i != 0
             collector = visit arg, collector
           }
           collector << ")"
@@ -42,7 +54,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POWER("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << Arel::Visitors::ToSql::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -66,7 +78,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
+          collector << Arel::Visitors::MSSQL::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -76,7 +88,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "REPLICATE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << Arel::Visitors::ToSql::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -86,12 +98,12 @@ module ArelExtensions
 
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        if o.right_node_type == :ruby_date || o.right_node_type == :ruby_time || o.right_node_type == :date || o.right_node_type == :datetime || o.right_node_type == :time
-          collector << if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
-                          'DATEDIFF(second'
-                      else
-                        'DATEDIFF(day'
-                      end
+        case o.right_node_type
+        when :ruby_date, :ruby_time, :date, :datetime, :time
+          collector << case o.left_node_type
+                       when :ruby_time, :datetime, :time then 'DATEDIFF(second'
+                       else                                   'DATEDIFF(day'
+                       end
           collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.right, collector
           collector << Arel::Visitors::MSSQL::COMMA
@@ -151,7 +163,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Round o, collector
         collector << "ROUND("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
+          collector << Arel::Visitors::MSSQL::COMMA if i != 0
           collector = visit arg, collector
         }
         if o.expressions.length == 1
@@ -242,42 +254,34 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
-        f = o.iso_format.dup
-        Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
-        if Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS[f]
+        f = ArelExtensions::Visitors::strftime_to_format(o.iso_format, Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES)
+        if fmt = Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS[f]
           collector << "CONVERT(VARCHAR(#{f.length})"
           collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.left, collector
           collector << Arel::Visitors::MSSQL::COMMA
-          collector << Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS[f].to_s
+          collector << fmt.to_s
           collector << ')'
           collector
         else
+          s = StringScanner.new o.iso_format
           collector << "("
-          t = o.iso_format.split('%')
-          t.each_with_index {|str, i|
-            if i == 0 && t[0] != '%'
-              collector = visit Arel::Nodes.build_quoted(str), collector
-              if str.length > 1
-                collector << Arel::Visitors::MSSQL::COMMA
-                collector = visit Arel::Nodes.build_quoted(str.sub(/\A./, '')), collector
-              end
-            elsif str.length > 0
-              if !Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]].blank?
-                collector << 'LTRIM(STR(DATEPART('
-                collector << Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]]
-                collector << Arel::Visitors::MSSQL::COMMA
-                collector = visit o.left, collector
-                collector << ')))'
-                if str.length > 1
-                  collector << ' + '
-                  collector = visit Arel::Nodes.build_quoted(str.sub(/\A./, '')), collector
-                end
-              end
+          sep = ''
+          while !s.eos?
+            collector << sep
+            sep = ' + '
+            case
+            when s.scan(Arel::Visitors::MSSQL::DATE_FORMAT_REGEX)
+              dir = Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES[s.matched]
+              collector << 'LTRIM(STR(DATEPART('
+              collector << dir
+              collector << Arel::Visitors::MSSQL::COMMA
+              collector = visit o.left, collector
+              collector << ')))'
+            when s.scan(/[^%]+|./)
+              collector = visit Arel::Nodes.build_quoted(s.matched), collector
             end
-            collector << ' + ' if t[i + 1]
-          }
-
+          end
           collector << ')'
           collector
         end
@@ -286,7 +290,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Replace o, collector
         collector << "REPLACE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
+          collector << Arel::Visitors::MSSQL::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -296,7 +300,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_FindInSet o, collector
         collector << "dbo.FIND_IN_SET("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
+          collector << Arel::Visitors::MSSQL::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -409,7 +413,7 @@ module ArelExtensions
         collector << ") WITHIN GROUP (ORDER BY "
         if o.order.present?
           o.order.each_with_index do |order,i|
-            collector << Arel::Visitors::Oracle::COMMA unless i == 0
+            collector << Arel::Visitors::Oracle::COMMA if i != 0
             collector = visit order, collector
           end
         else