arel_extensions 1.2.23 → 2.0.0.rc3

data/lib/arel_extensions/visitors/ibm_db.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -1,26 +1,13 @@
 module ArelExtensions
   module Visitors
     module MSSQL
-
-      Arel::Visitors::MSSQL::DATE_MAPPING = {
-        'd' => 'day', 'm' => 'month', 'y' => 'year', 'wd' => 'weekday', 'w' => 'week', 'h' => 'hour', 'mn' => 'minute', 's' => 'second'
-      }.freeze
-
+      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'
-      }.freeze
-
-      Arel::Visitors::MSSQL::DATE_FORMAT_REGEX =
-        Regexp.new(
-          Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES
-            .keys
-            .map{|k| Regexp.escape(k)}
-            .join('|')
-        ).freeze
-
+      }
       # TODO; all others... http://www.sql-server-helper.com/tips/date-formats.aspx
       Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS = {
         'YYYY-MM-DD' => 120,
@@ -32,7 +19,7 @@ module ArelExtensions
         'DD-MM-YY'   => 5,
         'DD.MM.YYYY' => 104,
         'YYYY-MM-DDTHH:MM:SS:MMM' => 126
-      }.freeze
+      }
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Ceil o, collector
@@ -45,7 +32,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Log10 o, collector
           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 << ")"
@@ -55,7 +42,7 @@ module ArelExtensions
       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 << Arel::Visitors::ToSql::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -79,7 +66,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -89,7 +76,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Repeat o, collector
         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 << ")"
@@ -99,12 +86,12 @@ module ArelExtensions
 
 
       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'
-                       end
+        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 << Arel::Visitors::MSSQL::COMMA
           collector = visit o.right, collector
           collector << Arel::Visitors::MSSQL::COMMA
@@ -164,7 +151,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Round o, collector
         collector << "ROUND("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
         if o.expressions.length == 1
@@ -255,34 +242,42 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
-        f = ArelExtensions::Visitors::strftime_to_format(o.iso_format, Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES)
-        if fmt = Arel::Visitors::MSSQL::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 << Arel::Visitors::MSSQL::COMMA
           collector = visit o.left, collector
           collector << Arel::Visitors::MSSQL::COMMA
-          collector << fmt.to_s
+          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(Arel::Visitors::MSSQL::DATE_FORMAT_REGEX)
-              dir = Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES[s.matched]
-              collector << 'LTRIM(STR(DATEPART('
-              collector << dir
-              collector << Arel::Visitors::MSSQL::COMMA
-              collector = visit o.left, collector
-              collector << ')))'
-            when s.scan(/[^%]+|./)
-              collector = visit Arel::Nodes.build_quoted(s.matched), collector
+          t = o.iso_format.split('%')
+          t.each_with_index {|str, i|
+            if i == 0 && t[0] != '%'
+              collector = visit Arel::Nodes.build_quoted(str), collector
+              if str.length > 1
+                collector << Arel::Visitors::MSSQL::COMMA
+                collector = visit Arel::Nodes.build_quoted(str.sub(/\A./, '')), collector
+              end
+            elsif str.length > 0
+              if !Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]].blank?
+                collector << 'LTRIM(STR(DATEPART('
+                collector << Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES['%' + str[0]]
+                collector << Arel::Visitors::MSSQL::COMMA
+                collector = visit o.left, collector
+                collector << ')))'
+                if str.length > 1
+                  collector << ' + '
+                  collector = visit Arel::Nodes.build_quoted(str.sub(/\A./, '')), collector
+                end
+              end
             end
-          end
+            collector << ' + ' if t[i + 1]
+          }
+
           collector << ')'
           collector
         end
@@ -291,7 +286,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Replace o, collector
         collector << "REPLACE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -301,7 +296,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_FindInSet o, collector
         collector << "dbo.FIND_IN_SET("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::MSSQL::COMMA if i != 0
+          collector << Arel::Visitors::MSSQL::COMMA unless i == 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -405,16 +400,15 @@ module ArelExtensions
         collector << "(STRING_AGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        collector =
-          if o.separator && o.separator != 'NULL'
-            visit o.separator, collector
-          else
-            visit Arel::Nodes.build_quoted(','), collector
-          end
+        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.order.present?
-          o.order.each_with_index do |order,i|
-            collector << Arel::Visitors::Oracle::COMMA if i != 0
+        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
@@ -472,9 +466,8 @@ module ArelExtensions
               Arel::Nodes.build_quoted(1) :
               ArelExtensions::Nodes::Case.new.when(col<0).then(1).else(0)
 
-        number =
-          if o.scientific_notation
-            ArelExtensions::Nodes::Concat.new([
+        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,
@@ -487,13 +480,13 @@ module ArelExtensions
                     locale
                   ])
                 ])
-          else
-            Arel::Nodes::NamedFunction.new('FORMAT',[
+        else
+          number = Arel::Nodes::NamedFunction.new('FORMAT',[
                 Arel::Nodes.build_quoted(col.abs),
                 param,
                 locale
               ])
-          end
+        end
 
         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).
@@ -555,6 +548,7 @@ module ArelExtensions
         collector
       end
 
+
     end
   end
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -1,24 +1,21 @@
 module ArelExtensions
   module Visitors
-    class Arel::Visitors::MySQL
-      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
+    Arel::Visitors::MySQL.class_eval do
+      Arel::Visitors::MySQL::COMMA = ", "
+      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
         '%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 if i != 0
+            collector << Arel::Visitors::ToSql::COMMA unless i == 0
             collector = visit arg, collector
           }
           collector << ")"
@@ -28,14 +25,14 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POW("
         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
       end
 
-      # String functions
+      #String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
         collector << 'LOWER('
         collector = visit o.left, collector
@@ -101,35 +98,33 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Collate o, collector
-        charset =
-          case o.expressions.first
-          when Arel::Attributes::Attribute
-            case o.option
+        case o.expressions.first
+        when Arel::Attributes::Attribute
+          charset = case o.option
             when 'latin1','utf8'
               o.option
             else
               Arel::Table.engine.connection.charset || 'utf8'
             end
-          else
-            (o.option == 'latin1') ? 'latin1' : 'utf8'
-          end
+        else
+          charset = (o.option == 'latin1') ? 'latin1' : 'utf8'
+        end
         collector = visit o.expressions.first, collector
-        collector <<
-          if o.ai
-            " 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'}"
-          else
-            " COLLATE #{charset}_bin"
-          end
+        if o.ai
+          collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+          #doesn't work in latin1
+        elsif o.ci
+          collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+        else
+          collector << " COLLATE #{charset}_bin"
+        end
         collector
       end
 
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
         o.expressions.each_with_index { |arg, i|
-          collector << COMMA if i != 0
+          collector << Arel::Visitors::MySQL::COMMA unless i == 0
           if (arg.is_a?(Numeric)) || (arg.is_a?(Arel::Attributes::Attribute))
             collector << "CAST("
             collector = visit arg, collector
@@ -145,16 +140,16 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
-        if !o.order.blank?
+        if !o.orders.blank?
           collector << ' ORDER BY '
-          o.order.each_with_index do |order,i|
-            collector << Arel::Visitors::ToSql::COMMA if i != 0
+          o.orders.each_with_index do |order,i|
+            collector << Arel::Visitors::ToSql::COMMA unless i == 0
             collector = visit order, collector
           end
         end
-        if o.separator && o.separator != 'NULL'
+        if o.right && o.right != 'NULL'
           collector << ' SEPARATOR '
-          collector = visit o.separator, collector
+          collector = visit o.right, collector
         end
         collector << ")"
         collector
@@ -169,7 +164,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 "
@@ -178,7 +173,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 "
@@ -190,28 +185,22 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "REPEAT("
         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
       end
 
-      def visit_ArelExtensions_Nodes_RegexpReplace o, collector
-        if !regexp_replace_supported?
-          warn("Warning : ArelExtensions: REGEXP_REPLACE does not seem to be available in the current version of the DBMS, it might crash")
-        end
-        super(o,collector)
-      end
-
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
-        when :date, :datetime, :time
-          fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
+        when :date, :datetime
           collector << "DATE_FORMAT("
           collector = visit o.left, collector
-          collector << COMMA
-          collector = visit Arel::Nodes.build_quoted(fmt), 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 << ")"
         when :integer, :float, :decimal
           collector << "FORMAT("
@@ -228,15 +217,14 @@ module ArelExtensions
       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 'TIMESTAMPDIFF(SECOND, '
-            else                                   'DATEDIFF('
-            end
+        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
           collector = visit o.right, collector
-          collector << COMMA
+          collector << Arel::Visitors::MySQL::COMMA
           collector = visit o.left, collector
           collector << ")"
         else
@@ -260,12 +248,13 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "DATE_ADD("
         collector = visit o.left, collector
-        collector << COMMA
+        collector << Arel::Visitors::MySQL::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("
@@ -274,18 +263,18 @@ module ArelExtensions
         else
           if o.with_interval
             case o.left
-            when 'd','m','y'
+            when  'd','m','y'
               interval = 'DAY'
             when 'h','mn','s'
               interval = 'SECOND'
             when /i\z/
-              interval = DATE_MAPPING[o.left[0..-2]]
+              interval = Arel::Visitors::MySQL::DATE_MAPPING[o.left[0..-2]]
             else
               interval = nil
             end
           end
           collector << " INTERVAL " if o.with_interval && interval
-          collector << "#{DATE_MAPPING[o.left]}("
+          collector << "#{Arel::Visitors::MySQL::DATE_MAPPING[o.left]}("
           collector = visit o.right, collector
           collector << ")"
           collector << " #{interval} " if o.with_interval && interval
@@ -293,6 +282,7 @@ module ArelExtensions
         collector
       end
 
+
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "ISNULL("
         collector = visit o.expr, collector
@@ -318,25 +308,30 @@ module ArelExtensions
         collector << "CAST("
         collector = visit o.left, collector
         collector << " AS "
-        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
-          )
+        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
         collector = visit as_attr, collector
         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
@@ -345,7 +340,7 @@ module ArelExtensions
         old_visit_Arel_Nodes_SelectStatement(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 << '('
@@ -368,21 +363,20 @@ module ArelExtensions
                   else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
         sign_length = ArelExtensions::Nodes::Length.new([sign])
 
-        number =
-          if o.scientific_notation
-            ArelExtensions::Nodes::Concat.new([
-                    Arel::Nodes::NamedFunction.new('FORMAT',[
-                      col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
-                    ]+params),
-                    o.type,
-                    Arel::Nodes::NamedFunction.new('FORMAT',[
-                      col.abs.log10.floor,
-                      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)
+                  ]+params),
+                  o.type,
+                  Arel::Nodes::NamedFunction.new('FORMAT',[
+                    col.abs.log10.floor,
+                    0
                   ])
-          else
-            Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
-          end
+                ])
+        else
+          number = Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
+        end
 
         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).
@@ -405,34 +399,10 @@ module ArelExtensions
         collector
       end
 
-      def visit_Aggregate_For_AggregateFunction o, collector
-        if !window_supported?
-            warn("Warning : ArelExtensions: Window Functions are not available in the current version of the DBMS.")
-            return collector
-        end
-
-        if !o.order.empty? || !o.group.empty?
-          collector << " OVER ("
-          if !o.group.empty?
-            collector << " PARTITION BY ("
-            visit o.group, collector
-            collector << ")"
-          end
-          if !o.order.empty?
-            collector << " ORDER BY ("
-            visit o.order, collector
-            collector << ")"
-          end
-          collector << ")"
-        end
-        collector
-      end
-
       def visit_ArelExtensions_Nodes_Std o, collector
         collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
         visit o.left, collector
         collector << ")"
-        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 
@@ -440,46 +410,25 @@ module ArelExtensions
         collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
         visit o.left, collector
         collector << ")"
-        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 
-      # 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
+      # JSON if implemented only after 10.2.3 in MariaDb and 5.7 in MySql
       def json_supported?
-        version_supported?('10.5.0', '5.7.22')
-      end
-
-      def window_supported?
-        version_supported?('10.2.3', '8.0')
-      end
-
-      def regexp_replace_supported?
-        version_supported?('10.0.5', '8.0')
-      end
-
-      def version_supported?(mariadb_v = '10.2.3', mysql_v = '5.7.0')
-        conn = Arel::Table.engine.connection
-        conn.send(:mariadb?) && \
-          (conn.respond_to?(:get_database_version) && conn.send(:get_database_version) >= mariadb_v || \
-          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)
-        # 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)
+        Arel::Table.engine.connection.send(:mariadb?) &&
+        Arel::Table.engine.connection.send(:version) >= '10.2.3' ||
+        !Arel::Table.engine.connection.send(:mariadb?) &&
+        Arel::Table.engine.connection.send(:version) >= '5.7.0'
       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 << COMMA
+              collector << Arel::Visitors::MySQL::COMMA
             end
             collector = visit v, collector
           end
@@ -488,10 +437,10 @@ module ArelExtensions
           collector << 'JSON_OBJECT('
           o.dict.each.with_index do |(k,v),i|
             if i != 0
-              collector << COMMA
+              collector << Arel::Visitors::MySQL::COMMA
             end
             collector = visit k, collector
-            collector << COMMA
+            collector << Arel::Visitors::MySQL::COMMA
             collector = visit v, collector
           end
           collector << ')'
@@ -505,7 +454,7 @@ module ArelExtensions
         collector << 'JSON_MERGE_PATCH('
         o.expressions.each.with_index do |v,i|
           if i != 0
-            collector << COMMA
+            collector << Arel::Visitors::MySQL::COMMA
           end
           collector = visit v, collector
         end
@@ -516,7 +465,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector << 'JSON_EXTRACT('
         collector = visit o.dict, collector
-        collector << COMMA
+        collector << Arel::Visitors::MySQL::COMMA
         if o.key.is_a?(Integer)
           collector << "\"$[#{o.key}]\""
         else
@@ -529,13 +478,13 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_JsonSet o,collector
         collector << 'JSON_SET('
         collector = visit o.dict, collector
-        collector << COMMA
+        collector << Arel::Visitors::MySQL::COMMA
         if o.key.is_a?(Integer)
           collector << "\"$[#{o.key}]\""
         else
           collector = visit Arel::Nodes.build_quoted('$.')+o.key, collector
         end
-        collector << COMMA
+        collector << Arel::Visitors::MySQL::COMMA
         collector = visit o.value, collector
         collector << ')'
         collector
@@ -543,7 +492,6 @@ 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
@@ -554,11 +502,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 << COMMA
+                collector << Arel::Visitors::MySQL::COMMA
               end
               collector << 'JSON_OBJECTAGG('
               collector = visit k, collector
-              collector << COMMA
+              collector << Arel::Visitors::MySQL::COMMA
               collector = visit v, collector
               collector << ')'
             end
@@ -571,6 +519,7 @@ module ArelExtensions
         end
         collector
       end
+
     end
   end
 end