arel_extensions 1.3.9 → 2.0.0.rc3

data/lib/arel_extensions/visitors/oracle.rb

@@ -1,36 +1,36 @@
-# require 'oracle_visitor'
+#require 'oracle_visitor'
 module ArelExtensions
   module Visitors
-    class Arel::Visitors::Oracle
+    Arel::Visitors::Oracle.class_eval do
+
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
-      DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
-      DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'YYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
-        '%V' => 'IW', '%G' => 'IYYY',                                                                       # ISO week number and year of week
-        '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%a' => 'Dy', '%A' => 'Day',               # day, weekday
+      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 = {
+        '%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
       }
-      NUMBER_COMMA_MAPPING = {'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', '}
+      Arel::Visitors::Oracle::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 if i != 0
-          collector = visit arg, collector
-        }
-        collector << ',10)'
-        collector
+          collector << "LOG("
+          o.expressions.each_with_index { |arg, i|
+            collector << Arel::Visitors::ToSql::COMMA unless i == 0
+            collector = visit arg, collector
+          }
+          collector << ",10)"
+          collector
       end
 
       def visit_ArelExtensions_Nodes_Power o, collector
-        collector << 'POWER('
-        o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA if i != 0
-          collector = visit arg, collector
-        }
-        collector << ')'
-        collector
+            collector << "POWER("
+            o.expressions.each_with_index { |arg, i|
+              collector << Arel::Visitors::ToSql::COMMA unless i == 0
+              collector = visit arg, collector
+            }
+            collector << ")"
+            collector
       end
 
       def visit_ArelExtensions_Nodes_Concat o, collector
@@ -93,6 +93,7 @@ module ArelExtensions
         end
       end
 
+
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
         collector << 'LOWER('
         collector = visit o.left, collector
@@ -108,59 +109,53 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Collate o, collector
-        if o.ai
-          collector << 'NLSSORT('
-          collector = visit o.expressions.first, collector
-          collector << COMMA
-          collector << "'NLS_SORT = BINARY_AI NLS_COMP = LINGUISTIC'"
-          collector << ')'
-        elsif o.ci
-          collector << 'NLSSORT('
-          collector = visit o.expressions.first, collector
-          collector << COMMA
-          collector << "'NLS_SORT = BINARY_CI NLS_COMP = LINGUISTIC'"
-          collector << ')'
-        else
-          collector = visit o.expressions.first, collector
-        end
-      collector
+      if o.ai
+        collector << "NLSSORT("
+        collector = visit o.expressions.first, collector
+        collector << Arel::Visitors::Oracle::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 << "'NLS_SORT = BINARY_CI NLS_COMP = LINGUISTIC'"
+        collector << ")"
+      else
+        collector = visit o.expressions.first, collector
       end
-
-      def visit_Arel_Nodes_RollUp(o, collector)
-        collector << "ROLLUP"
-        grouping_array_or_grouping_element o, collector
+        collector
       end
 
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
-        collector << '(LISTAGG('
+        collector << "(LISTAGG("
         collector = visit o.left, collector
-        collector << COMMA
-        collector =
-          if o.separator && o.separator != 'NULL'
-            visit o.separator, collector
-          else
-            visit Arel.quoted(','), collector
-          end
-        collector << ') WITHIN GROUP (ORDER BY '
-        if !o.order.blank?
-          o.order.each_with_index do |order, i|
-            collector << COMMA if i != 0
+        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 << ") WITHIN GROUP (ORDER BY "
+        if !o.orders.blank?
+          o.orders.each_with_index do |order,i|
+            collector << Arel::Visitors::Oracle::COMMA unless i == 0
             collector = visit order, collector
           end
         else
           collector = visit o.left, collector
         end
-        collector << '))'
+        collector << "))"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Coalesce o, collector
-        collector << 'COALESCE('
+        collector << "COALESCE("
         o.expressions.each_with_index { |arg, i|
-          collector << COMMA if i != 0
+          collector << Arel::Visitors::Oracle::COMMA unless i == 0
           if i > 0 && o.left_node_type == :text
-            if arg == '' || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
-              collector << 'NULL'
+            if arg == ''  || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
+              collector << "NULL"
             else
               collector << 'TO_CLOB('
               collector = visit arg, collector
@@ -170,12 +165,12 @@ module ArelExtensions
             collector = visit arg, collector
           end
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_MD5 o, collector
-        collector << 'LOWER (RAWTOHEX (DBMS_OBFUSCATION_TOOLKIT.md5(input => UTL_I18N.STRING_TO_RAW('
+        collector << "LOWER (RAWTOHEX (DBMS_OBFUSCATION_TOOLKIT.md5(input => UTL_I18N.STRING_TO_RAW("
         collector = visit o.left, collector
         collector << ", 'AL32UTF8'))))"
         collector
@@ -190,7 +185,7 @@ module ArelExtensions
           collector << 'TO_DATE(' if lc
           collector = visit o.left, collector
           collector << ')' if lc
-          collector << ' - '
+          collector << " - "
           collector << 'TO_DATE(' if rc
           collector = visit o.right, collector
           collector << ')' if rc
@@ -200,7 +195,7 @@ module ArelExtensions
             collector << 'TO_DATE(' if lc
             collector = visit o.left, collector
             collector << ')' if lc
-            collector << COMMA
+            collector << Arel::Visitors::Oracle::COMMA
             collector << "'DDD') = "
             collector << 'TO_DATE(' if lc
             collector = visit o.left, collector
@@ -224,20 +219,20 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Duration o, collector
         case o.left
         when 'wd', 'w'
-          collector << 'TO_CHAR('
+          collector << "TO_CHAR("
           collector = visit o.right, collector
-          collector << COMMA
-          collector = visit Arel.quoted(DATE_MAPPING[o.left]), collector
+          collector << Arel::Visitors::Oracle::COMMA
+          collector = visit Arel::Nodes.build_quoted(Arel::Visitors::Oracle::DATE_MAPPING[o.left]), collector
         else
           right = case o.left
-          when  'd', 'm', 'y'
+          when  'd','m','y'
             interval = 'DAY'
             o.right.cast(:date)
-          when 'h', 'mn', 's'
+          when 'h','mn','s'
             interval = 'SECOND'
             o.right.cast(:datetime)
           when /i\z/
-            interval = DATE_MAPPING[o.left[0..-2]]
+            interval = Arel::Visitors::Oracle::DATE_MAPPING[o.left[0..-2]]
             collector << '('
             collector = visit o.right, collector
             collector << ") * (INTERVAL '1' #{interval})"
@@ -246,10 +241,10 @@ module ArelExtensions
             interval = nil
             o.right
           end
-          collector << "EXTRACT(#{DATE_MAPPING[o.left]} FROM "
+          collector << "EXTRACT(#{Arel::Visitors::Oracle::DATE_MAPPING[o.left]} FROM "
           collector = visit right, collector
         end
-        collector << ')'
+        collector << ")"
         collector << " * (INTERVAL '1' #{interval})" if interval && o.with_interval
         collector
       end
@@ -257,45 +252,35 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Cast o, collector
         case o.as_attr
         when :string
-          collector << 'TO_CHAR('
-          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 << "TO_CHAR("
           collector = visit o.left, collector
-          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('
+            collector << "TO_DATE("
             collector = visit o.left, collector
             collector << ",'HH24:MI:SS')"
           else
-            collector << 'TO_DATE(TO_CHAR('
+            collector << "TO_DATE(TO_CHAR("
             collector = visit o.left, collector
             collector << ",'HH24:MI:SS'),'HH24:MI:SS')"
           end
           return collector
         when :number, :decimal
-          collector << 'TO_NUMBER('
+          collector << "TO_NUMBER("
           collector = visit o.left, collector
-          collector << ')'
+          collector << ")"
           return collector
         when :datetime
           as_attr = Arel::Nodes::SqlLiteral.new('timestamp')
         when :date
           if (o.left.respond_to?(:return_type) && o.left.return_type == :string) || o.left.is_a?(Arel::Nodes::Quoted)
-            collector << 'TO_DATE('
+            collector << "TO_DATE("
             collector = visit o.left, collector
             collector << ",'YYYY-MM-DD')"
           else
-            collector << 'TO_DATE(TO_CHAR('
+            collector << "TO_DATE(TO_CHAR("
             collector = visit o.left, collector
             collector << ",'YYYY-MM-DD'),'YYYY-MM-DD')"
           end
@@ -305,18 +290,18 @@ module ArelExtensions
         else
           as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
-        collector << 'CAST('
+        collector << "CAST("
         collector = visit o.left, collector
-        collector << ' AS '
+        collector << " AS "
         collector = visit as_attr, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH#{o.bytewise ? 'B' : ''}("
+        collector << "LENGTH("
         collector = visit o.expr, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -333,51 +318,51 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Rand o, collector
-        collector << 'DBMS_RANDOM.VALUE('
+        collector << "DBMS_RANDOM.VALUE("
         if o.left && o.right
           collector = visit o.left, collector
-          collector << COMMA
+          collector << Arel::Visitors::Oracle::COMMA
           collector = visit o.right, collector
         end
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_Arel_Nodes_Regexp o, collector
-        collector << ' REGEXP_LIKE('
+        collector << " REGEXP_LIKE("
         collector = visit o.left, collector
-        collector << COMMA
+        collector << Arel::Visitors::Oracle::COMMA
         collector = visit o.right, collector
         collector << ')'
         collector
       end
 
       def visit_Arel_Nodes_NotRegexp o, collector
-        collector << ' NOT REGEXP_LIKE('
+        collector << " NOT REGEXP_LIKE("
         collector = visit o.left, collector
-        collector << COMMA
+        collector << Arel::Visitors::Oracle::COMMA
         collector = visit o.right, collector
         collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Locate o, collector
-        collector << 'INSTR('
+        collector << "INSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << COMMA if i != 0
+          collector << Arel::Visitors::Oracle::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Substring o, collector
-        collector << 'SUBSTR('
+        collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << COMMA if i != 0
+          collector << Arel::Visitors::Oracle::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -393,17 +378,17 @@ module ArelExtensions
         if o.type_of_attribute(o.left) == :text
           collector << 'dbms_lob.SUBSTR('
           collector = visit o.left, collector
-          collector << COMMA
+          collector << Arel::Visitors::Oracle::COMMA
           collector << 'COALESCE(dbms_lob.GETLENGTH('
           collector = visit o.left, collector
-          collector << '), 0)'
-          collector << COMMA
+          collector << "), 0)"
+          collector << Arel::Visitors::Oracle::COMMA
           collector << '1)'
         else
           collector = visit o.left, collector
         end
         collector << ')' if o.left.is_a? ArelExtensions::Nodes::Trim
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -416,7 +401,7 @@ module ArelExtensions
         end
         collector << ' FROM '
         collector = visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -429,7 +414,7 @@ module ArelExtensions
         end
         collector << ' FROM '
         collector = visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -444,92 +429,80 @@ 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
-        visit_ArelExtensions_Nodes_FormattedDate o, collector
-      end
-
-      def visit_ArelExtensions_Nodes_FormattedDate o, collector
-        fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
-        collector << 'TO_CHAR('
-        collector << 'CAST(' if o.time_zone
+        collector << "TO_CHAR("
         collector = visit o.left, collector
-        case o.time_zone
-        when Hash
-          src_tz, dst_tz = o.time_zone.first
-          collector << ' as timestamp) at time zone '
-          collector = visit Arel.quoted(src_tz), collector
-          collector < ' at time zone '
-          collector = visit Arel.quoted(dst_tz), collector
-        when String
-          collector << ' as timestamp) at time zone '
-          collector = visit Arel.quoted(o.time_zone), collector
-        end
-        collector << COMMA
-        collector = visit Arel.quoted(fmt), collector
-        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 << ")"
         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 << "LPAD("
+        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
         collector = visit o.expressions[0], collector
-        collector << ')'
+        collector << ")"
         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 << '('
+          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 << COMMA unless i == len
+          collector << " UNION ALL " if idx != 0
+            collector << "(SELECT "
+            v = Arel::Nodes::Values.new(row, o.cols)
+            len = v.expressions.length - 1
+            v.expressions.each_with_index { |value, i|
+                case value
+                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                  collector = visit value, collector
+                else
+                  attr = v.columns[i]
+                  collector << quote(value, attr && column_for(attr)).to_s
+                end
+                collector << Arel::Visitors::Oracle::COMMA unless i == len
             }
             collector << ' FROM DUAL)'
           end
-          collector << ')'
+          collector << ")"
           collector
         end
       else
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
-          collector << '('
+          collector << "("
           o.left.each_with_index do |row, idx|
-            collector << ' UNION ALL ' if idx != 0
-            collector << '(SELECT '
+            collector << " UNION ALL " if idx != 0
+            collector << "(SELECT "
             len = row.length - 1
-            row.zip(o.cols).each_with_index { |(value, attr), i|
+            row.each_with_index { |value, i|
+              attr = o.cols[i]
               case value
               when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                 collector = visit value, collector
-              when Integer
-                collector << value.to_s
               else
                 collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
               end
-              collector << COMMA unless i == len
+              collector << Arel::Visitors::Oracle::COMMA unless i == len
             }
             collector << ' FROM DUAL)'
           end
-          collector << ')'
+          collector << ")"
           collector
         end
       end
@@ -539,7 +512,7 @@ module ArelExtensions
         if element.is_a?(Time)
           ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
         elsif element.is_a?(Arel::Attributes::Attribute)
-          col = Arel.column_of(element.relation.table_name, element.name.to_s)
+          col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
           if col && (col.type == :time)
             ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
           else
@@ -554,7 +527,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_GreaterThanOrEqual) rescue nil
       def visit_Arel_Nodes_GreaterThanOrEqual o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << ' >= '
+        collector << " >= "
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -562,7 +535,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_GreaterThan) rescue nil
       def visit_Arel_Nodes_GreaterThan o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << ' > '
+        collector << " > "
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -570,7 +543,7 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_LessThanOrEqual) rescue nil
       def visit_Arel_Nodes_LessThanOrEqual o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << ' <= '
+        collector << " <= "
         collector = visit get_time_converted(o.right), collector
         collector
       end
@@ -578,30 +551,30 @@ module ArelExtensions
       remove_method(:visit_Arel_Nodes_LessThan) rescue nil
       def visit_Arel_Nodes_LessThan o, collector
         collector = visit get_time_converted(o.left), collector
-        collector << ' < '
+        collector << " < "
         collector = visit get_time_converted(o.right), collector
         collector
       end
 
 
-      alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
+      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
       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
           o.orders = []
         end
-        old_visit_Arel_Nodes_SelectStatement(o, collector)
+        old_visit_Arel_Nodes_SelectStatement(o,collector)
       end
 
-      alias_method(:old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias) rescue nil
+      alias_method :old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias
       def visit_Arel_Nodes_TableAlias o, collector
         if o.name.length > 30
-          o = Arel::Table.new(o.table_name).alias(Arel.shorten(o.name))
+          o = Arel::Table.new(o.table_name).alias(Base64.urlsafe_encode64(Digest::MD5.new.digest(o.name)).tr('=', '').tr('-', '_'))
         end
-        old_visit_Arel_Nodes_TableAlias(o, collector)
+        old_visit_Arel_Nodes_TableAlias(o,collector)
       end
 
-      alias_method(:old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As) rescue nil
+      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 << '('
@@ -610,7 +583,7 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        quote = /(\A".*"\z)|\A[a-zA-Z_]*\z/.match?(o.right.to_s) ? '' : '"'
+        quote = o.right.to_s =~ /(\A["].*["]\z)|\A[a-zA-Z_]*\z/ ? '' : '"'
         collector << " AS #{quote}"
         collector = visit o.right, collector
         collector << "#{quote}"
@@ -621,7 +594,7 @@ module ArelExtensions
         visit_Arel_Nodes_As o, collector
       end
 
-      alias_method(:old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute) rescue nil
+      alias_method :old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
         if join_name.length > 30
@@ -630,56 +603,52 @@ 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 = NUMBER_COMMA_MAPPING[o.locale] || '.,'
+        comma = Arel::Visitors::Oracle::NUMBER_COMMA_MAPPING[o.locale] || '.,'
         comma_in_format = o.precision == 0 ? '' : 'D'
-        nines_after = (1..o.precision - 1).map{'9'}.join('') + '0'
+        nines_after = (1..o.precision-1).map{'9'}.join('')+'0'
         if comma.length == 1
-          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '#{comma} '")
-          nines_before = ('999' * 4 + '990')
+          options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+" '")
+          nines_before = ("999"*4+"990")
         else
-          options = Arel.quoted("NLS_NUMERIC_CHARACTERS = '#{comma}'")
-          nines_before = ('999G' * 4 + '990')
+          options = Arel::Nodes.build_quoted("NLS_NUMERIC_CHARACTERS = '"+comma+"'")
+          nines_before = ("999G"*4+"990")
         end
-        sign = Arel.when(col < 0).
+        sign = ArelExtensions::Nodes::Case.new.when(col<0).
                   then('-').
                   else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
         sign_length = o.flags.include?('+') || o.flags.include?(' ') ?
-                Arel.quoted(1) :
-                Arel.when(col < 0).then(1).else(0)
+                Arel::Nodes.build_quoted(1) :
+                ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
 
         if o.scientific_notation
-          number = Arel::Nodes::NamedFunction.new('TO_CHAR', [
-                Arel.quoted(col.abs),
-                Arel.quoted("FM#{nines_before}#{comma_in_format}#{nines_after}EEEE"),
+          number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
+                Arel::Nodes.build_quoted(col.abs),
+                Arel::Nodes.build_quoted('FM'+nines_before+comma_in_format+nines_after+'EEEE'),
                 options
               ])
           if o.type == 'e'
-            number = number.replace('E', 'e')
+            number = number.replace('E','e')
           end
         else
-          number = Arel::Nodes::NamedFunction.new('TO_CHAR', [
-                Arel.quoted(col.abs),
-                Arel.quoted("FM#{nines_before}#{comma_in_format}#{nines_after}"),
+          number = Arel::Nodes::NamedFunction.new('TO_CHAR',[
+                Arel::Nodes.build_quoted(col.abs),
+                Arel::Nodes.build_quoted('FM'+nines_before+comma_in_format+nines_after),
                 options
               ])
         end
 
-        repeated_char =
-          if o.width == 0
-            Arel.quoted('')
-          else
-            Arel
-              .when(Arel.quoted(o.width).abs - (number.length + sign_length) > 0)
-              .then(Arel.quoted(
-                      o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
-                    ).repeat(Arel.quoted(o.width).abs - (number.length + sign_length))
-                   )
-              .else('')
-          end
-        before = !o.flags.include?('0') && !o.flags.include?('-') ? repeated_char : ''
-        middle = o.flags.include?('0') && !o.flags.include?('-')  ? repeated_char : ''
+        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).
+          then(Arel::Nodes.build_quoted(
+              o.flags.include?('-') ? ' ' : (o.flags.include?('0') ? '0' : ' ')
+            ).repeat(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length))
+          ).
+          else('')
+        before = (!o.flags.include?('0'))&&(!o.flags.include?('-')) ? repeated_char : ''
+        middle = (o.flags.include?('0'))&&(!o.flags.include?('-'))  ? repeated_char : ''
         after  = o.flags.include?('-') ? repeated_char : ''
         full_number = ArelExtensions::Nodes::Concat.new([
             before,
@@ -688,26 +657,26 @@ module ArelExtensions
             number,
             after
           ])
-        collector = visit ArelExtensions::Nodes::Concat.new([Arel.quoted(o.prefix), full_number, Arel.quoted(o.suffix)]), collector
+        collector = visit ArelExtensions::Nodes::Concat.new([Arel::Nodes.build_quoted(o.prefix),full_number,Arel::Nodes.build_quoted(o.suffix)]), collector
         collector
       end
 
       def visit_ArelExtensions_Nodes_Std o, collector
-        collector << (o.unbiased_estimator ? 'STDDEV_SAMP(' : 'STDDEV_POP(')
+        collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
         visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Variance o, collector
-        collector << (o.unbiased_estimator ? 'VAR_SAMP(' : 'VAR_POP(')
+        collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
         visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
-        collector << 'UTL_MATCH.edit_distance('
+        collector << "UTL_MATCH.edit_distance("
         collector = visit o.left, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit o.right, collector
@@ -715,17 +684,6 @@ module ArelExtensions
         collector
       end
 
-      # Utilized by GroupingSet, Cube & RollUp visitors to
-      # handle grouping aggregation semantics
-      def grouping_array_or_grouping_element(o, collector)
-        if o.expr.is_a? Array
-          collector << "( "
-          visit o.expr, collector
-          collector << " )"
-        else
-          visit o.expr, collector
-        end
-      end
     end
   end
 end