arel_extensions 2.0.9 → 2.0.14

data/lib/arel_extensions/visitors/mysql.rb

@@ -1,20 +1,24 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::MySQL
-      Arel::Visitors::MySQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
-      Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
+      DATE_MAPPING = {
+        'd' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'WEEKDAY',
+        'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'
+      }.freeze
+
+      DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b',  # year, month
         '%d' => '%d', '%e' => '%e', '%j' => '%j', '%w' => '%w', '%A' => '%W',                               # day, weekday
         '%H' => '%H', '%k' => '%k', '%I' => '%I', '%l' => '%l', '%P' => '%p', '%p' => '%p',                 # hours
         '%M' => '%i', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => ''
-      }
+      }.freeze
 
 
-      #Math functions
+      # Math functions
       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 << ")"
@@ -24,14 +28,14 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POW("
         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 << ")"
         collector
       end
 
-      #String functions
+      # String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
         collector << 'LOWER('
         collector = visit o.left, collector
@@ -112,10 +116,10 @@ module ArelExtensions
         collector = visit o.expressions.first, collector
         collector <<
           if o.ai
-            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
-          #doesn't work in latin1
+            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci'}"
+          # doesn't work in latin1
           elsif o.ci
-            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci'}"
           else
             " COLLATE #{charset}_bin"
           end
@@ -125,7 +129,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MySQL::COMMA unless i == 0
+          collector << COMMA if i != 0
           if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
             collector << "CAST("
             collector = visit arg, collector
@@ -144,7 +148,7 @@ module ArelExtensions
         if !o.order.blank?
           collector << ' ORDER BY '
           o.order.each_with_index do |order,i|
-            collector << Arel::Visitors::ToSql::COMMA unless i == 0
+            collector << Arel::Visitors::ToSql::COMMA if i != 0
             collector = visit order, collector
           end
         end
@@ -165,7 +169,7 @@ module ArelExtensions
           collector
       end
 
-      def visit_ArelExtensions_Nodes_Ltrim o , collector
+      def visit_ArelExtensions_Nodes_Ltrim o, collector
           collector << 'TRIM(LEADING '
           collector = visit o.right, collector
           collector << " FROM "
@@ -174,7 +178,7 @@ module ArelExtensions
           collector
       end
 
-      def visit_ArelExtensions_Nodes_Rtrim o , collector
+      def visit_ArelExtensions_Nodes_Rtrim o, collector
         collector << 'TRIM(TRAILING '
         collector = visit o.right, collector
         collector << " FROM "
@@ -186,7 +190,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "REPEAT("
         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 << ")"
@@ -202,13 +206,12 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
-        when :date, :datetime
+        when :date, :datetime, :time
+          fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
           collector << "DATE_FORMAT("
           collector = visit o.left, collector
-          collector << Arel::Visitors::MySQL::COMMA
-          f = o.iso_format.dup
-          Arel::Visitors::MySQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
-          collector = visit Arel::Nodes.build_quoted(f), collector
+          collector << COMMA
+          collector = visit Arel::Nodes.build_quoted(fmt), collector
           collector << ")"
         when :integer, :float, :decimal
           collector << "FORMAT("
@@ -225,14 +228,15 @@ module ArelExtensions
       end
 
       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
-                        'TIMESTAMPDIFF(SECOND, '
-                      else
-                        'DATEDIFF('
-                      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 'TIMESTAMPDIFF(SECOND, '
+            else                                   'DATEDIFF('
+            end
           collector = visit o.right, collector
-          collector << Arel::Visitors::MySQL::COMMA
+          collector << COMMA
           collector = visit o.left, collector
           collector << ")"
         else
@@ -256,13 +260,12 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "DATE_ADD("
         collector = visit o.left, collector
-        collector << Arel::Visitors::MySQL::COMMA
+        collector << COMMA
         collector = visit o.mysql_value(o.right), collector
         collector << ")"
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_Duration o, collector
         if o.left == 'wd'
           collector << "(WEEKDAY("
@@ -276,13 +279,13 @@ module ArelExtensions
             when 'h','mn','s'
               interval = 'SECOND'
             when /i\z/
-              interval = Arel::Visitors::MySQL::DATE_MAPPING[o.left[0..-2]]
+              interval = DATE_MAPPING[o.left[0..-2]]
             else
               interval = nil
             end
           end
           collector << " INTERVAL " if o.with_interval && interval
-          collector << "#{Arel::Visitors::MySQL::DATE_MAPPING[o.left]}("
+          collector << "#{DATE_MAPPING[o.left]}("
           collector = visit o.right, collector
           collector << ")"
           collector << " #{interval} " if o.with_interval && interval
@@ -290,7 +293,6 @@ module ArelExtensions
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "ISNULL("
         collector = visit o.expr, collector
@@ -316,30 +318,25 @@ module ArelExtensions
         collector << "CAST("
         collector = visit o.left, collector
         collector << " AS "
-        case o.as_attr
-        when :string
-          as_attr = Arel::Nodes::SqlLiteral.new('char')
-        when :time
-          as_attr = Arel::Nodes::SqlLiteral.new('time')
-        when :int
-          as_attr = Arel::Nodes::SqlLiteral.new('signed')
-        when :number, :decimal
-          as_attr = Arel::Nodes::SqlLiteral.new('decimal(20,6)')
-        when :datetime
-          as_attr = Arel::Nodes::SqlLiteral.new('datetime')
-        when :date
-          as_attr = Arel::Nodes::SqlLiteral.new('date')
-        when :binary
-          as_attr = Arel::Nodes::SqlLiteral.new('binary')
-        else
-          as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
-        end
+        as_attr =
+          Arel::Nodes::SqlLiteral.new(
+            case o.as_attr
+            when :string           then 'char'
+            when :time             then 'time'
+            when :int              then 'signed'
+            when :number, :decimal then 'decimal(20,6)'
+            when :datetime         then 'datetime'
+            when :date             then 'date'
+            when :binary           then 'binary'
+            else                        o.as_attr.to_s
+            end
+          )
         collector = visit as_attr, collector
         collector << ")"
         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? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
           o = o.dup
@@ -348,7 +345,7 @@ module ArelExtensions
         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 << '('
@@ -447,9 +444,9 @@ module ArelExtensions
         collector
       end
 
-      # JSON if implemented only after 10.2.3 in MariaDb and 5.7 in MySql
+      # JSON if implemented only after 10.2.3 (aggregations after 10.5.0) in MariaDb and 5.7 (aggregations after 5.7.22) in MySql
       def json_supported?
-        version_supported?('10.2.3', '5.7.0')
+        version_supported?('10.5.0', '5.7.22')
       end
 
       def window_supported?
@@ -467,21 +464,22 @@ module ArelExtensions
           conn.respond_to?(:version) && conn.send(:version) >= mariadb_v || \
           conn.instance_variable_get(:"@version") && conn.instance_variable_get(:"@version") >= mariadb_v) || \
           !conn.send(:mariadb?) && \
-          (conn.respond_to?(:get_database_version) && conn.send(:get_database_version) >= mysql_v || \
-          conn.respond_to?(:version) && conn.send(:version) >= mysql_v || \
-          conn.instance_variable_get(:"@version") && conn.instance_variable_get(:"@version") >= mysql_v)
+            (conn.respond_to?(:get_database_version) && conn.send(:get_database_version) >= mysql_v || \
+            conn.respond_to?(:version) && conn.send(:version) >= mysql_v || \
+            conn.instance_variable_get(:"@version") && conn.instance_variable_get(:"@version") >= mysql_v)
         # ideally we should parse the instance_variable @full_version because @version contains only the supposedly
         # corresponding mysql version of the current mariadb version (which is not very helpful most of the time)
       end
 
       def visit_ArelExtensions_Nodes_Json o,collector
         return super if !json_supported?
+
         case o.dict
         when Array
           collector << 'JSON_ARRAY('
           o.dict.each.with_index do |v,i|
             if i != 0
-              collector << Arel::Visitors::MySQL::COMMA
+              collector << COMMA
             end
             collector = visit v, collector
           end
@@ -490,10 +488,10 @@ module ArelExtensions
           collector << 'JSON_OBJECT('
           o.dict.each.with_index do |(k,v),i|
             if i != 0
-              collector << Arel::Visitors::MySQL::COMMA
+              collector << COMMA
             end
             collector = visit k, collector
-            collector << Arel::Visitors::MySQL::COMMA
+            collector << COMMA
             collector = visit v, collector
           end
           collector << ')'
@@ -507,7 +505,7 @@ module ArelExtensions
         collector << 'JSON_MERGE_PATCH('
         o.expressions.each.with_index do |v,i|
           if i != 0
-            collector << Arel::Visitors::MySQL::COMMA
+            collector << COMMA
           end
           collector = visit v, collector
         end
@@ -518,7 +516,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector << 'JSON_EXTRACT('
         collector = visit o.dict, collector
-        collector << Arel::Visitors::MySQL::COMMA
+        collector << COMMA
         if o.key.is_a?(Integer)
           collector << "\"$[#{o.key}]\""
         else
@@ -531,13 +529,13 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_JsonSet o,collector
         collector << 'JSON_SET('
         collector = visit o.dict, collector
-        collector << Arel::Visitors::MySQL::COMMA
+        collector << COMMA
         if o.key.is_a?(Integer)
           collector << "\"$[#{o.key}]\""
         else
           collector = visit Arel::Nodes.build_quoted('$.')+o.key, collector
         end
-        collector << Arel::Visitors::MySQL::COMMA
+        collector << COMMA
         collector = visit o.value, collector
         collector << ')'
         collector
@@ -545,6 +543,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         return super if !json_supported?
+
         if o.as_array
           collector << 'JSON_ARRAYAGG('
           collector = visit o.dict, collector
@@ -555,11 +554,11 @@ module ArelExtensions
             collector << 'JSON_MERGE_PATCH(' if o.dict.length > 1
             o.dict.each.with_index do |(k,v),i|
               if i != 0
-                collector << Arel::Visitors::MySQL::COMMA
+                collector << COMMA
               end
               collector << 'JSON_OBJECTAGG('
               collector = visit k, collector
-              collector << Arel::Visitors::MySQL::COMMA
+              collector << COMMA
               collector = visit v, collector
               collector << ')'
             end
@@ -572,7 +571,6 @@ module ArelExtensions
         end
         collector
       end
-
     end
   end
 end

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,22 +1,21 @@
-#require 'oracle_visitor'
+# require 'oracle_visitor'
 module ArelExtensions
   module Visitors
     class Arel::Visitors::Oracle
-
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
-      Arel::Visitors::Oracle::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
-      Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES = {
+      DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
+      DATE_FORMAT_DIRECTIVES = {
         '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day',                             # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM',                   # hours
         '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz'                                # seconds, subseconds
       }
-      Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
+      NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
 
       def visit_ArelExtensions_Nodes_Log10 o, collector
           collector << "LOG("
           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 << ",10)"
@@ -26,7 +25,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 << ")"
@@ -93,7 +92,6 @@ module ArelExtensions
         end
       end
 
-
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
         collector << 'LOWER('
         collector = visit o.left, collector
@@ -112,25 +110,25 @@ module ArelExtensions
       if o.ai
         collector << "NLSSORT("
         collector = visit o.expressions.first, collector
-        collector << Arel::Visitors::Oracle::COMMA
+        collector << COMMA
         collector << "'NLS_SORT = BINARY_AI NLS_COMP = LINGUISTIC'"
         collector << ")"
       elsif o.ci
         collector << "NLSSORT("
         collector = visit o.expressions.first, collector
-        collector << Arel::Visitors::Oracle::COMMA
+        collector << COMMA
         collector << "'NLS_SORT = BINARY_CI NLS_COMP = LINGUISTIC'"
         collector << ")"
       else
         collector = visit o.expressions.first, collector
       end
-        collector
+      collector
       end
 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "(LISTAGG("
         collector = visit o.left, collector
-        collector << Arel::Visitors::Oracle::COMMA
+        collector << COMMA
         collector =
           if o.separator && o.separator != 'NULL'
             visit o.separator, collector
@@ -140,7 +138,7 @@ module ArelExtensions
         collector << ") WITHIN GROUP (ORDER BY "
         if !o.order.blank?
           o.order.each_with_index do |order,i|
-            collector << Arel::Visitors::Oracle::COMMA unless i == 0
+            collector << COMMA if i != 0
             collector = visit order, collector
           end
         else
@@ -153,7 +151,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Coalesce o, collector
         collector << "COALESCE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::Oracle::COMMA unless i == 0
+          collector << COMMA if i != 0
           if i > 0 && o.left_node_type == :text
             if arg == '' || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
               collector << "NULL"
@@ -196,7 +194,7 @@ module ArelExtensions
             collector << 'TO_DATE(' if lc
             collector = visit o.left, collector
             collector << ')' if lc
-            collector << Arel::Visitors::Oracle::COMMA
+            collector << COMMA
             collector << "'DDD') = "
             collector << 'TO_DATE(' if lc
             collector = visit o.left, collector
@@ -222,8 +220,8 @@ module ArelExtensions
         when 'wd', 'w'
           collector << "TO_CHAR("
           collector = visit o.right, collector
-          collector << Arel::Visitors::Oracle::COMMA
-          collector = visit Arel::Nodes.build_quoted(Arel::Visitors::Oracle::DATE_MAPPING[o.left]), collector
+          collector << COMMA
+          collector = visit Arel::Nodes.build_quoted(DATE_MAPPING[o.left]), collector
         else
           right = case o.left
           when  'd','m','y'
@@ -233,7 +231,7 @@ module ArelExtensions
             interval = 'SECOND'
             o.right.cast(:datetime)
           when /i\z/
-            interval = Arel::Visitors::Oracle::DATE_MAPPING[o.left[0..-2]]
+            interval = DATE_MAPPING[o.left[0..-2]]
             collector << '('
             collector = visit o.right, collector
             collector << ") * (INTERVAL '1' #{interval})"
@@ -242,7 +240,7 @@ module ArelExtensions
             interval = nil
             o.right
           end
-          collector << "EXTRACT(#{Arel::Visitors::Oracle::DATE_MAPPING[o.left]} FROM "
+          collector << "EXTRACT(#{DATE_MAPPING[o.left]} FROM "
           collector = visit right, collector
         end
         collector << ")"
@@ -257,6 +255,16 @@ module ArelExtensions
           collector = visit o.left, collector
           collector << ")"
           return collector
+        when :text
+          collector << "TO_CLOB("
+          collector = visit o.left, collector
+          collector << ")"
+          return collector
+        when :ntext
+          collector << "TO_NCLOB("
+          collector = visit o.left, collector
+          collector << ")"
+          return collector
         when :time
           if (o.left.respond_to?(:return_type) && o.left.return_type == :string) || o.left.is_a?(Arel::Nodes::Quoted)
             collector << "TO_DATE("
@@ -322,7 +330,7 @@ module ArelExtensions
         collector << "DBMS_RANDOM.VALUE("
         if o.left && o.right
           collector = visit o.left, collector
-          collector << Arel::Visitors::Oracle::COMMA
+          collector << COMMA
           collector = visit o.right, collector
         end
         collector << ")"
@@ -332,7 +340,7 @@ module ArelExtensions
       def visit_Arel_Nodes_Regexp o, collector
         collector << " REGEXP_LIKE("
         collector = visit o.left, collector
-        collector << Arel::Visitors::Oracle::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ')'
         collector
@@ -341,7 +349,7 @@ module ArelExtensions
       def visit_Arel_Nodes_NotRegexp o, collector
         collector << " NOT REGEXP_LIKE("
         collector = visit o.left, collector
-        collector << Arel::Visitors::Oracle::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ')'
         collector
@@ -350,7 +358,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "INSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::Oracle::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -360,7 +368,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::Oracle::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -379,11 +387,11 @@ module ArelExtensions
         if o.type_of_attribute(o.left) == :text
           collector << 'dbms_lob.SUBSTR('
           collector = visit o.left, collector
-          collector << Arel::Visitors::Oracle::COMMA
+          collector << COMMA
           collector << 'COALESCE(dbms_lob.GETLENGTH('
           collector = visit o.left, collector
           collector << "), 0)"
-          collector << Arel::Visitors::Oracle::COMMA
+          collector << COMMA
           collector << '1)'
         else
           collector = visit o.left, collector
@@ -430,28 +438,25 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << '('
         collector = visit o.left, collector
-        collector << ' + '# (o.right.value >= 0 ? ' + ' : ' - ')
+        collector << ' + ' # (o.right.value >= 0 ? ' + ' : ' - ')
         collector = visit o.oracle_value(o.right), collector
         collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
+        fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << "TO_CHAR("
         collector = visit o.left, collector
-        collector << Arel::Visitors::Oracle::COMMA
-
-        f = o.iso_format.gsub(/\ (\w+)/, ' "\1"')
-        Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
-        collector = visit Arel::Nodes.build_quoted(f), collector
-
+        collector << COMMA
+        collector = visit Arel::Nodes.build_quoted(fmt), collector
         collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "LPAD("
-        collector = visit o.expressions[0], collector #can't put empty string, otherwise it wouldn't work
+        collector = visit o.expressions[0], collector # can't put empty string, otherwise it wouldn't work
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit o.expressions[1], collector
         collector << Arel::Visitors::ToSql::COMMA
@@ -460,24 +465,24 @@ module ArelExtensions
         collector
       end
 
-        # add primary_key if not present, avoid zip
+      # add primary_key if not present, avoid zip
       if Arel::VERSION.to_i < 7
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
           collector << "("
           o.left.each_with_index do |row, idx| # values
           collector << " UNION ALL " if idx != 0
-            collector << "(SELECT "
-            len = row.length - 1
-            row.zip(o.cols).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value, collector
-                else
-                  collector << quote(value, attr && column_for(attr)).to_s
-                end
-                collector << Arel::Visitors::Oracle::COMMA unless i == len
-            }
-            collector << ' FROM DUAL)'
+          collector << "(SELECT "
+          len = row.length - 1
+          row.zip(o.cols).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              else
+                collector << quote(value, attr && column_for(attr)).to_s
+              end
+              collector << COMMA unless i == len
+          }
+          collector << ' FROM DUAL)'
           end
           collector << ")"
           collector
@@ -498,7 +503,7 @@ module ArelExtensions
               else
                 collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
               end
-              collector << Arel::Visitors::Oracle::COMMA unless i == len
+              collector << COMMA unless i == len
             }
             collector << ' FROM DUAL)'
           end
@@ -557,7 +562,7 @@ module ArelExtensions
       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? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
           o = o.dup
@@ -566,7 +571,7 @@ module ArelExtensions
         old_visit_Arel_Nodes_SelectStatement(o,collector)
       end
 
-      alias_method :old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias
+      alias_method(:old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias) rescue nil
       def visit_Arel_Nodes_TableAlias o, collector
         if o.name.length > 30
           o = Arel::Table.new(o.table_name).alias(Base64.urlsafe_encode64(Digest::MD5.new.digest(o.name)).tr('=', '').tr('-', '_'))
@@ -574,7 +579,7 @@ module ArelExtensions
         old_visit_Arel_Nodes_TableAlias(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 << '('
@@ -594,7 +599,7 @@ module ArelExtensions
         visit_Arel_Nodes_As o, collector
       end
 
-      alias_method :old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute
+      alias_method(:old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute) rescue nil
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
         if join_name.length > 30
@@ -603,10 +608,9 @@ module ArelExtensions
         collector << "#{quote_table_name join_name}.#{quote_column_name o.name}"
       end
 
-
       def visit_ArelExtensions_Nodes_FormattedNumber o, collector
         col = o.left.coalesce(0)
-        comma = Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING[o.locale] || '.,'
+        comma = NUMBER_COMMA_MAPPING[o.locale] || '.,'
         comma_in_format = o.precision == 0 ? '' : 'D'
         nines_after = (1..o.precision-1).map{'9'}.join('')+'0'
         if comma.length == 1
@@ -683,7 +687,6 @@ module ArelExtensions
         collector << ')'
         collector
       end
-
     end
   end
 end