arel_extensions 1.2.15 → 1.2.23

data/lib/arel_extensions/visitors/convert_format.rb

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

data/lib/arel_extensions/visitors/ibm_db.rb

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

data/lib/arel_extensions/visitors/mssql.rb

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

data/lib/arel_extensions/visitors/mysql.rb

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