arel_extensions 1.5.3 → 2.0.0.rc3

data/lib/arel_extensions/visitors/mssql.rb

@@ -1,259 +1,126 @@
 module ArelExtensions
   module Visitors
     module MSSQL
-
-      MSSQL_CLASS_NAMES = %i[MSSQL SQLServer].freeze
-
-      mssql_class =
-        Arel::Visitors
-          .constants
-          .select { |c| Arel::Visitors.const_get(c).is_a?(Class)  }
-          .find { |c| MSSQL_CLASS_NAMES.include?(c) }
-
-      # This guard is necessary because:
-      #
-      # 1. const_get(mssql_class) will fail when mssql_class is nil.
-      # 2. mssql_class could be nil under certain conditions:
-      #   1. especially on ruby 2.5 (and surprisingly not jruby 9.2) and 3.0+.
-      #   2. when not working with mssql itself.
-      if mssql_class
-        LOADED_VISITOR = Arel::Visitors.const_get(mssql_class)
-
-        LOADED_VISITOR::DATE_MAPPING = {
-          'd' => 'day', 'm' => 'month', 'y' => 'year',
-          'wd' => 'weekday', 'w' => 'week',
-          'h' => 'hour', 'mn' => 'minute', 's' => 'second'
-        }.freeze
-
-        LOADED_VISITOR::DATE_FORMAT_DIRECTIVES = {
-          '%Y' => 'YYYY', '%C' => '', '%y' => 'YY', '%m' => 'MM', '%B' => 'month', '%^B' => '', '%b' => '', '%^b' => '', # year, month
-          '%V' => 'iso_week', '%G' => '',                                                                                # ISO week number and year of week
-          '%d' => 'DD', '%e' => ''  , '%j' => ''  , '%w' => 'dw', %'a' => '', '%A' => 'weekday',                         # day, weekday
-          '%H' => 'hh', '%k' => ''  , '%I' => ''  , '%l' => ''  , '%P' => '', '%p' => '',                                # hours
-          '%M' => 'mi', '%S' => 'ss', '%L' => 'ms', '%N' => 'ns', '%z' => 'tz'
-        }.freeze
-
-        LOADED_VISITOR::DATE_FORMAT_FORMAT = {
-          'YY' => '0#', 'MM' => '0#', 'DD' => '0#',
-          'hh' => '0#', 'mi' => '0#', 'ss' => '0#',
-          'iso_week' => '0#'
-        }
-
-        LOADED_VISITOR::DATE_NAME = [
-          '%B', '%A'
-        ]
-
-        LOADED_VISITOR::DATE_FORMAT_REGEX =
-          Regexp.new(
-            LOADED_VISITOR::DATE_FORMAT_DIRECTIVES
-              .keys
-              .map{|k| Regexp.escape(k)}
-              .join('|')
-          ).freeze
-
-        # TODO; all others... http://www.sql-server-helper.com/tips/date-formats.aspx
-        LOADED_VISITOR::DATE_CONVERT_FORMATS = {
-          'YYYY-MM-DD' => 120,
-          'YY-MM-DD' => 120,
-          'MM/DD/YYYY' => 101,
-          'MM-DD-YYYY' => 110,
-          'YYYY/MM/DD' => 111,
-          'DD-MM-YYYY' => 105,
-          'DD-MM-YY'   => 5,
-          'DD.MM.YYYY' => 104,
-          'YYYY-MM-DDTHH:MM:SS:MMM' => 126
-        }.freeze
-      end
-
-      # Quoting in JRuby + AR < 5 requires special handling for MSSQL.
-      #
-      # It relied on @connection.quote, which in turn relied on column type for
-      # quoting. We need only to rely on the value type.
-      #
-      # It didn't handle numbers correctly: `quote(1, nil)` translated into
-      # `N'1'` which we don't want.
-      #
-      # The following is adapted from
-      # https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
-      #
-      if RUBY_PLATFORM == 'java' && Arel::VERSION.to_i <= 6
-        def quote_string(s)
-          s.gsub('\\', '\&\&').gsub("'", "''") # ' (for ruby-mode)
-        end
-
-        def quoted_binary(value) # :nodoc:
-          "'#{quote_string(value.to_s)}'"
-        end
-
-        def quoted_date(value)
-          if value.acts_like?(:time)
-            if (ActiveRecord.respond_to?(:default_timezone) && ActiveRecord.default_timezone == :utc) || ActiveRecord::Base.default_timezone == :utc
-              value = value.getutc if value.respond_to?(:getutc) && !value.utc?
-            else
-              value = value.getlocal if value.respond_to?(:getlocal)
-            end
-          end
-          # new versions of AR use `to_fs`, but we want max compatibility, and we're
-          # not going to write it over and over, so it's fine like that.
-          result = value.to_formatted_s(:db)
-          if value.respond_to?(:usec) && value.usec > 0
-            result << '.' << sprintf('%06d', value.usec)
-          else
-            result
-          end
-        end
-
-        def quoted_true
-          'TRUE'
-        end
-
-        def quoted_false
-          'FALSE'
-        end
-
-        def quoted_time(value) # :nodoc:
-          value = value.change(year: 2000, month: 1, day: 1)
-          quoted_date(value).sub(/\A\d{4}-\d{2}-\d{2} /, "")
-        end
-
-        def quote value, column = nil
-          case value
-          when Arel::Nodes::SqlLiteral
-            value
-          when String, Symbol, ActiveSupport::Multibyte::Chars
-            "'#{quote_string(value.to_s)}'"
-          when true
-            quoted_true
-          when false
-            quoted_false
-          when nil
-            'NULL'
-          # BigDecimals need to be put in a non-normalized form and quoted.
-          when BigDecimal
-            value.to_s('F')
-          when Numeric, ActiveSupport::Duration
-            value.to_s
-          when Arel::VERSION.to_i > 6 && ActiveRecord::Type::Time::Value
-            "'#{quoted_time(value)}'"
-          when Date, Time
-            "'#{quoted_date(value)}'"
-          when Class
-            "'#{value}'"
-          else
-            raise TypeError, "can't quote #{value.class.name}"
-          end
-        end
-      end
-
-      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
+      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_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'
+      }
+      # TODO; all others... http://www.sql-server-helper.com/tips/date-formats.aspx
+      Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS = {
+        'YYYY-MM-DD' => 120,
+        'YY-MM-DD'  => 120,
+        'MM/DD/YYYY' => 101,
+        'MM-DD-YYYY' => 110,
+        'YYYY/MM/DD' => 111,
+        'DD-MM-YYYY' => 105,
+        'DD-MM-YY'   => 5,
+        'DD.MM.YYYY' => 104,
+        'YYYY-MM-DDTHH:MM:SS:MMM' => 126
+      }
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
-        collector << 'CEILING('
+        collector << "CEILING("
         collector = visit o.expr, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Log10 o, collector
-        collector << 'LOG10('
+          collector << "LOG10("
           o.expressions.each_with_index { |arg, i|
-            collector << Arel::Visitors::ToSql::COMMA if i != 0
+            collector << Arel::Visitors::ToSql::COMMA unless i == 0
             collector = visit arg, collector
           }
-          collector << ')'
+          collector << ")"
           collector
       end
 
       def visit_ArelExtensions_Nodes_Power o, collector
-        collector << 'POWER('
+        collector << "POWER("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA if i != 0
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector << '('
+        collector << "("
         collector = visit o.expr, collector
-        collector << ' IS NULL)'
+        collector << " IS NULL)"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-        collector << '('
+          collector << "("
           collector = visit o.expr, collector
-          collector << ' IS NOT NULL)'
+          collector << " IS NOT NULL)"
           collector
       end
 
       def visit_ArelExtensions_Nodes_Concat o, collector
-        collector << 'CONCAT('
+        collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
-          collector << LOADED_VISITOR::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Repeat o, collector
-        collector << 'REPLICATE('
+        collector << "REPLICATE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA if i != 0
+          collector << Arel::Visitors::ToSql::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
 
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        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'
+        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
-          collector << LOADED_VISITOR::COMMA
+          collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.right, collector
-          collector << LOADED_VISITOR::COMMA
+          collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.left, collector
           collector << ')'
         else
           da = ArelExtensions::Nodes::DateAdd.new([])
-          collector << 'DATEADD('
+          collector << "DATEADD("
           collector = visit da.mssql_datepart(o.right), collector
-          collector << LOADED_VISITOR::COMMA
-          collector << '-('
+          collector << Arel::Visitors::MSSQL::COMMA
+          collector << "-("
           collector = visit da.mssql_value(o.right), collector
-          collector << ')'
-          collector << LOADED_VISITOR::COMMA
+          collector << ")"
+          collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.left, collector
-          collector << ')'
+          collector << ")"
           collector
         end
         collector
       end
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector
-        collector << 'DATEADD('
+        collector << "DATEADD("
         collector = visit o.mssql_datepart(o.right), collector
-        collector << LOADED_VISITOR::COMMA
+        collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.mssql_value(o.right), collector
-        collector << LOADED_VISITOR::COMMA
+        collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -262,77 +129,68 @@ module ArelExtensions
           collector = visit o.right, collector
         else
           left = o.left.end_with?('i') ? o.left[0..-2] : o.left
-          conv = %w[h mn s].include?(o.left)
+          conv = ['h', 'mn', 's'].include?(o.left)
           collector << 'DATEPART('
-          collector << LOADED_VISITOR::DATE_MAPPING[left]
-          collector << LOADED_VISITOR::COMMA
+          collector << Arel::Visitors::MSSQL::DATE_MAPPING[left]
+          collector << Arel::Visitors::MSSQL::COMMA
           collector << 'CONVERT(datetime,' if conv
           collector = visit o.right, collector
           collector << ')' if conv
-          collector << ')'
+          collector << ")"
         end
         collector
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        if o.bytewise
-          collector << '(DATALENGTH('
-          collector = visit o.expr, collector
-          collector << ') / ISNULL(NULLIF(DATALENGTH(LEFT(COALESCE('
-          collector = visit o.expr, collector
-          collector << ", '#' ), 1 )), 0), 1))"
-          collector
-        else
-          collector << 'LEN('
-          collector = visit o.expr, collector
-          collector << ')'
-          collector
-        end
+        collector << "LEN("
+        collector = visit o.expr, collector
+        collector << ")"
+        collector
       end
 
       def visit_ArelExtensions_Nodes_Round o, collector
-        collector << 'ROUND('
+        collector << "ROUND("
         o.expressions.each_with_index { |arg, i|
-          collector << LOADED_VISITOR::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
         if o.expressions.length == 1
-          collector << LOADED_VISITOR::COMMA
-          collector << '0'
+          collector << Arel::Visitors::MSSQL::COMMA
+          collector << "0"
         end
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Locate o, collector
-        collector << 'CHARINDEX('
+        collector << "CHARINDEX("
         collector = visit o.right, collector
-        collector << LOADED_VISITOR::COMMA
+        collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << 'SUBSTRING('
         collector = visit o.expressions[0], collector
-        collector << LOADED_VISITOR::COMMA
+        collector << Arel::Visitors::MSSQL::COMMA
         collector = visit o.expressions[1], collector
-        collector << LOADED_VISITOR::COMMA
+        collector << Arel::Visitors::MSSQL::COMMA
         collector = o.expressions[2] ? visit(o.expressions[2], collector) : visit(o.expressions[0].length, collector)
         collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Trim o, collector
-        # NOTE: in MSSQL's `blank`, o.right is the space char so we need to
-        # account for it.
-        if o.right && !/\A\s\Z/.match(o.right.expr)
-          collector << 'dbo.TrimChar('
+        if o.right
+          collector << "REPLACE(REPLACE(LTRIM(RTRIM(REPLACE(REPLACE("
           collector = visit o.left, collector
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << ", ' ', '~'), "
           collector = visit o.right, collector
-          collector << ')'
+          collector << ", ' '))), ' ', "
+          collector = visit o.right, collector
+          collector << "), '~', ' ')"
         else
           collector << "LTRIM(RTRIM("
           collector = visit o.left, collector
@@ -343,7 +201,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Ltrim o, collector
         if o.right
-          collector << 'REPLACE(REPLACE(LTRIM(REPLACE(REPLACE('
+          collector << "REPLACE(REPLACE(LTRIM(REPLACE(REPLACE("
           collector = visit o.left, collector
           collector << ", ' ', '~'), "
           collector = visit o.right, collector
@@ -351,16 +209,16 @@ module ArelExtensions
           collector = visit o.right, collector
           collector << "), '~', ' ')"
         else
-          collector << 'LTRIM('
+          collector << "LTRIM("
           collector = visit o.left, collector
-          collector << ')'
+          collector << ")"
         end
         collector
       end
 
       def visit_ArelExtensions_Nodes_Rtrim o, collector
         if o.right
-          collector << 'REPLACE(REPLACE(RTRIM(REPLACE(REPLACE('
+          collector << "REPLACE(REPLACE(RTRIM(REPLACE(REPLACE("
           collector = visit o.left, collector
           collector << ", ' ', '~'), "
           collector = visit o.right, collector
@@ -368,9 +226,9 @@ module ArelExtensions
           collector = visit o.right, collector
           collector << "), '~', ' ')"
         else
-          collector << 'RTRIM('
+          collector << "RTRIM("
           collector = visit o.left, collector
-          collector << ')'
+          collector << ")"
         end
         collector
       end
@@ -384,102 +242,64 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
-        visit_ArelExtensions_Nodes_FormattedDate o, collector
-      end
-
-      def visit_ArelExtensions_Nodes_FormattedDate o, collector
-        f = ArelExtensions::Visitors::strftime_to_format(o.iso_format, LOADED_VISITOR::DATE_FORMAT_DIRECTIVES)
-        if fmt = LOADED_VISITOR::DATE_CONVERT_FORMATS[f]
+        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]
           collector << "CONVERT(VARCHAR(#{f.length})"
-          collector << LOADED_VISITOR::COMMA
-          if o.time_zone
-            collector << 'CONVERT(datetime'
-            collector << LOADED_VISITOR::COMMA
-            collector << ' '
-          end
+          collector << Arel::Visitors::MSSQL::COMMA
           collector = visit o.left, collector
-          case o.time_zone
-          when Hash
-            src_tz, dst_tz = o.time_zone.first
-            collector << ') AT TIME ZONE '
-            collector = visit Arel.quoted(src_tz), collector
-            collector << ' AT TIME ZONE '
-            collector = visit Arel.quoted(dst_tz), collector
-          when String
-            collector << ') AT TIME ZONE '
-            collector = visit Arel.quoted(o.time_zone), collector
-          end
-          collector << LOADED_VISITOR::COMMA
-          collector << fmt.to_s
+          collector << Arel::Visitors::MSSQL::COMMA
+          collector << Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS[f].to_s
           collector << ')'
           collector
         else
-          s = StringScanner.new o.iso_format
-          collector << '('
-          sep = ''
-          while !s.eos?
-            collector << sep
-            sep = ' + '
-            case
-            when s.scan(LOADED_VISITOR::DATE_FORMAT_REGEX)
-              dir = LOADED_VISITOR::DATE_FORMAT_DIRECTIVES[s.matched]
-              fmt = LOADED_VISITOR::DATE_FORMAT_FORMAT[dir]
-              date_name = LOADED_VISITOR::DATE_NAME.include?(s.matched)
-              collector << 'LTRIM(RTRIM('
-              collector << 'FORMAT(' if fmt
-              collector << 'STR('    if !fmt && !date_name
-              collector << (date_name ? 'DATENAME(' : 'DATEPART(')
-              collector << dir
-              collector << LOADED_VISITOR::COMMA
-              if o.time_zone
-                collector << 'CONVERT(datetime'
-                collector << LOADED_VISITOR::COMMA
-                collector << ' '
+          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
-              collector = visit o.left, collector
-              case o.time_zone
-              when Hash
-                src_tz, dst_tz = o.time_zone.first.first, o.time_zone.first.second
-                collector << ') AT TIME ZONE '
-                collector = visit Arel.quoted(src_tz), collector
-                collector << ' AT TIME ZONE '
-                collector = visit Arel.quoted(dst_tz), collector
-              when String
-                collector << ') AT TIME ZONE '
-                collector = visit Arel.quoted(o.time_zone), collector
+            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
-              collector << ')'
-              collector << ')'                                  if !fmt && !date_name
-              collector << LOADED_VISITOR::COMMA << "'#{fmt}')" if fmt
-              collector << '))'
-            when s.scan(/^%%/)
-              collector = visit Arel.quoted('%'), collector
-            when s.scan(/[^%]+|./)
-              collector = visit Arel.quoted(s.matched), collector
             end
-          end
+            collector << ' + ' if t[i + 1]
+          }
+
           collector << ')'
           collector
         end
       end
 
       def visit_ArelExtensions_Nodes_Replace o, collector
-        collector << 'REPLACE('
+        collector << "REPLACE("
         o.expressions.each_with_index { |arg, i|
-          collector << LOADED_VISITOR::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_FindInSet o, collector
-        collector << 'dbo.FIND_IN_SET('
+        collector << "dbo.FIND_IN_SET("
         o.expressions.each_with_index { |arg, i|
-          collector << LOADED_VISITOR::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
-        collector << ')'
+        collector << ")"
         collector
       end
 
@@ -522,9 +342,9 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_AiIMatches o, collector
-        collector = visit o.left.collate(true, true), collector
+        collector = visit o.left.collate(true,true), collector
         collector << ' LIKE '
-        collector = visit o.right.collate(true, true), collector
+        collector = visit o.right.collate(true,true), collector
         if o.escape
           collector << ' ESCAPE '
           visit o.escape, collector
@@ -562,34 +382,6 @@ module ArelExtensions
         collector
       end
 
-      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 '
-        # Sometimes these values are already quoted, if they are, don't double quote it
-        lft, rgt =
-          if o.right.is_a?(Arel::Nodes::SqlLiteral)
-            if Arel::VERSION.to_i >= 6 && o.right[0] != '[' && o.right[-1] != ']'
-              # This is a lie, it's not about arel version, but SQL Server's (>= 2000).
-              ['[', ']']
-            elsif o.right[0] != '"' && o.right[-1] != '"'
-              ['"', '"']
-            else
-              []
-            end
-          end
-        collector << lft if lft
-        collector = visit o.right, collector
-        collector << rgt if rgt
-        collector
-      end
-
       # SQL Server does not know about REGEXP
       def visit_Arel_Nodes_Regexp o, collector
         collector = visit o.left, collector
@@ -603,121 +395,108 @@ module ArelExtensions
         collector
       end
 
-      def visit_Arel_Nodes_RollUp(o, collector)
-        collector << "ROLLUP"
-        grouping_array_or_grouping_element o, collector
-      end
-
+      # TODO;
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
-        collector << '(STRING_AGG('
+        collector << "(STRING_AGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        sep = o.separator.is_a?(Arel::Nodes::Quoted) ? o.separator.expr : o.separator
-        collector =
-          if 'NULL' != sep
-            visit o.separator, collector
-          else
-            visit Arel.quoted(','), collector
-          end
-        collector << ') WITHIN GROUP (ORDER BY '
-        if o.order.present?
-          o.order.each_with_index do |order, i|
-            collector << Arel::Visitors::Oracle::COMMA if i != 0
+        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_MD5 o, collector
         collector << "LOWER(CONVERT(NVARCHAR(32),HashBytes('MD5',CONVERT(VARCHAR,"
         collector = visit o.left, collector
-        collector << ')),2))'
+        collector << ")),2))"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Cast o, collector
-        as_attr =
-          case o.as_attr
-          when :string
-            'varchar'
-          when :time
-            'time'
-          when :date
-            'date'
-          when :datetime
-            'datetime'
-          when :number, :decimal, :float
-            'decimal(10,6)'
-          when :int
-            collector << 'CAST(CAST('
-            collector = visit o.left, collector
-            collector << ' AS decimal(10,0)) AS int)'
-            return collector
-          when :binary
-            'binary'
-          else
-            o.as_attr.to_s
-          end
-        collector << 'CAST('
+        case o.as_attr
+        when :string
+          as_attr = Arel::Nodes::SqlLiteral.new('varchar')
+        when :time
+          as_attr = Arel::Nodes::SqlLiteral.new('time')
+        when :date
+          as_attr = Arel::Nodes::SqlLiteral.new('date')
+        when :datetime
+          as_attr = Arel::Nodes::SqlLiteral.new('datetime')
+        when :number,:decimal, :float
+          as_attr = Arel::Nodes::SqlLiteral.new('decimal(10,6)')
+        when :int
+          collector << "CAST(CAST("
+          collector = visit o.left, collector
+          collector << " AS decimal(10,0)) AS int)"
+          return collector
+        when :binary
+          as_attr = Arel::Nodes::SqlLiteral.new('binary')
+        else
+          as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
+        end
+        collector << "CAST("
         collector = visit o.left, collector
-        collector << ' AS '
-        collector = visit Arel::Nodes::SqlLiteral.new(as_attr), collector
-        collector << ')'
+        collector << " AS "
+        collector = visit as_attr, collector
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_FormattedNumber o, collector
         col = o.left.coalesce(0)
-        locale = Arel.quoted(o.locale.tr('_', '-'))
-        param = Arel.quoted("N#{o.precision}")
-        sign = Arel.when(col < 0).
+        locale = Arel::Nodes.build_quoted(o.locale.tr('_','-'))
+        param = Arel::Nodes.build_quoted("N#{o.precision}")
+        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)
-
-        number =
-          if o.scientific_notation
-            ArelExtensions::Nodes::Concat.new([
-                  Arel::Nodes::NamedFunction.new('FORMAT', [
-                    col.abs / Arel.quoted(10).pow(col.abs.log10.floor),
+              Arel::Nodes.build_quoted(1) :
+              ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
+
+        if o.scientific_notation
+          number = ArelExtensions::Nodes::Concat.new([
+                  Arel::Nodes::NamedFunction.new('FORMAT',[
+                    col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
                     param,
                     locale
                   ]),
                   o.type,
-                  Arel::Nodes::NamedFunction.new('FORMAT', [
+                  Arel::Nodes::NamedFunction.new('FORMAT',[
                     col.abs.log10.floor,
-                    Arel.quoted('N0'),
+                    Arel::Nodes.build_quoted('N0'),
                     locale
                   ])
                 ])
-          else
-            Arel::Nodes::NamedFunction.new('FORMAT', [
-                Arel.quoted(col.abs),
+        else
+          number = Arel::Nodes::NamedFunction.new('FORMAT',[
+                Arel::Nodes.build_quoted(col.abs),
                 param,
                 locale
               ])
-          end
+        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([
@@ -727,27 +506,27 @@ 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 ? 'STDEV(' : 'STDEVP(')
+        collector << (o.unbiased_estimator ? "STDEV(" : "STDEVP(")
         visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_Variance o, collector
-        collector << (o.unbiased_estimator ? 'VAR(' : 'VARP(')
+        collector << (o.unbiased_estimator ? "VAR(" : "VARP(")
         visit o.left, collector
-        collector << ')'
+        collector << ")"
         collector
       end
 
 
       def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
-        collector << 'dbo.LEVENSHTEIN_DISTANCE('
+        collector << "dbo.LEVENSHTEIN_DISTANCE("
         collector = visit o.left, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit o.right, collector
@@ -756,30 +535,20 @@ module ArelExtensions
       end
 
 
-      def visit_ArelExtensions_Nodes_JsonGet o, collector
+      def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector << 'JSON_VALUE('
         collector = visit o.dict, collector
         collector << Arel::Visitors::MySQL::COMMA
         if o.key.is_a?(Integer)
           collector << "\"$[#{o.key}]\""
         else
-          collector = visit Arel.quoted('$.') + o.key, collector
+          collector = visit Arel::Nodes.build_quoted('$.')+o.key, collector
         end
         collector << ')'
         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