arel_extensions 1.2.13 → 1.2.18

data/lib/arel_extensions/visitors/oracle12.rb

@@ -1,6 +1,5 @@
 module ArelExtensions
   module Visitors
-
     Arel::Visitors.send(:remove_const,'Oracle12') if Arel::Visitors.const_defined?('Oracle12')
     Arel::Visitors.const_set('Oracle12',Class.new(Arel::Visitors::Oracle)).class_eval do
       def visit_Arel_Nodes_SelectStatement(o, collector)
@@ -12,6 +11,7 @@ module ArelExtensions
           `SELECT FOR UPDATE and FETCH FIRST n ROWS` generates ORA-02014.`
           MSG
         end
+
         super
       end
 
@@ -84,7 +84,7 @@ module ArelExtensions
             collector << 'FORMAT JSON'
           end
           collector << ')'
-        when String,Numeric,TrueClass,FalseClass
+        when String, Numeric, TrueClass, FalseClass
           collector = visit Arel::Nodes.build_quoted("#{o.dict}"), collector
           collector << ' FORMAT JSON'
         when NilClass
@@ -97,7 +97,6 @@ module ArelExtensions
         end
         collector
       end
-
     end
   end
 end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -1,20 +1,29 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::PostgreSQL
-      Arel::Visitors::PostgreSQL::DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
-      Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+      DATE_MAPPING = {
+        'd' => 'DAY', 'm' => 'MONTH', 'w' => 'WEEK', 'y' => 'YEAR', 'wd' => 'DOW',
+        'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'
+      }.freeze
+
+      DATE_FORMAT_DIRECTIVES = {
+        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY',
+        '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
         '%d' => 'DD', '%e' => 'FMDD', '%j' => 'DDD', '%w' => '', '%A' => 'Day', # day, weekday
         '%H' => 'HH24', '%k' => '', '%I' => 'HH', '%l' => '', '%P' => 'am', '%p' => 'AM', # hours
-        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz' # seconds, subseconds
-      }
-      Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING = { 'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', ' }
+        '%M' => 'MI', '%S' => 'SS', '%L' => 'MS', '%N' => 'US', '%z' => 'tz', # seconds, subseconds
+        '%%' => '%',
+      }.freeze
+
+      NUMBER_COMMA_MAPPING = {
+        'en_US' => '.,', 'fr_FR' => ',', 'sv_SE' => ', '
+      }.freeze
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RANDOM("
-        if(o.left != nil && o.right != nil)
+        if (o.left != nil && o.right != nil)
           collector = visit o.left, collector
-          collector << Arel::Visitors::PostgreSQL::COMMA
+          collector << COMMA
           collector = isit o.right, collector
         end
         collector << ")"
@@ -24,7 +33,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 << ")"
@@ -34,7 +43,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Log10 o, collector
         collector << "LOG("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << Arel::Visitors::ToSql::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -68,7 +77,7 @@ module ArelExtensions
         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 << '('
@@ -89,14 +98,14 @@ module ArelExtensions
           if !o.group.blank?
             collector << " PARTITION BY "
             o.group.each_with_index do |group, i|
-              collector << Arel::Visitors::PostgreSQL::COMMA unless i == 0
+              collector << COMMA if i != 0
               visit group, collector
             end
           end
           if !o.order.blank?
             collector << " ORDER BY "
             o.order.each_with_index do |order, i|
-              collector << Arel::Visitors::PostgreSQL::COMMA unless i == 0
+              collector << COMMA if i != 0
               visit order, collector
             end
           end
@@ -111,7 +120,7 @@ module ArelExtensions
         if o.order && !o.order.blank?
           collector << " ORDER BY"
           o.order.each_with_index do |order, i|
-            collector << Arel::Visitors::PostgreSQL::COMMA unless i == 0
+            collector << COMMA if i != 0
             collector << " "
             visit order, collector
           end
@@ -119,7 +128,7 @@ module ArelExtensions
         collector << ")"
         o.order = nil
         visit_Aggregate_For_AggregateFunction o, collector
-        collector << Arel::Visitors::PostgreSQL::COMMA
+        collector << COMMA
         collector =
           if o.separator && o.separator != 'NULL'
             visit o.separator, collector
@@ -158,14 +167,11 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
+        fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << "TO_CHAR("
         collector = visit o.left, collector
-        collector << Arel::Visitors::PostgreSQL::COMMA
-
-        f = o.iso_format.dup
-        Arel::Visitors::PostgreSQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
-        collector = visit Arel::Nodes.build_quoted(f), collector
-
+        collector << COMMA
+        collector = visit Arel::Nodes.build_quoted(fmt), collector
         collector << ")"
         collector
       end
@@ -173,7 +179,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 << ")"
@@ -231,7 +237,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector = visit o.left, collector
-        collector << ' + ' #(o.right.value >= 0 ? ' + ' : ' - ')
+        collector << ' + ' # (o.right.value >= 0 ? ' + ' : ' - ')
         collector = visit o.postgresql_value(o.right), collector
         collector
       end
@@ -245,7 +251,7 @@ module ArelExtensions
                       end
           collector = visit o.right, collector
           collector << (o.right_node_type == :date ? '::date' : '::timestamp')
-          collector << Arel::Visitors::PostgreSQL::COMMA
+          collector << COMMA
           collector = visit o.left, collector
           collector << (o.left_node_type == :date ? '::date' : '::timestamp')
           collector << ")"
@@ -273,11 +279,11 @@ module ArelExtensions
               collector << "("
               collector = visit o.right, collector
               collector << ")"
-              collector << " * (INTERVAL '1' #{Arel::Visitors::PostgreSQL::DATE_MAPPING[o.left[0..-2]]})"
+              collector << " * (INTERVAL '1' #{DATE_MAPPING[o.left[0..-2]]})"
               return collector
             end
         end
-        collector << "EXTRACT(#{Arel::Visitors::PostgreSQL::DATE_MAPPING[o.left]} FROM "
+        collector << "EXTRACT(#{DATE_MAPPING[o.left]} FROM "
         collector = visit o.right, collector
         collector << ")"
         collector << " * (INTERVAL '1' #{interval})" if interval && o.with_interval
@@ -296,7 +302,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::PostgreSQL::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -308,7 +314,7 @@ module ArelExtensions
         visit o.left, collector
         collector << Arel::Visitors::ToSql::COMMA
         tab = o.pattern.inspect+ 'g' # Make it always global
-        pattern = tab.split('/')[1..-2].join('/') 
+        pattern = tab.split('/')[1..-2].join('/')
         flags = tab.split('/')[-1]
         visit Arel::Nodes.build_quoted(pattern), collector
         collector << Arel::Visitors::ToSql::COMMA
@@ -350,6 +356,8 @@ module ArelExtensions
         as_attr = case o.as_attr
         when :string
           Arel::Nodes::SqlLiteral.new('varchar')
+        when :text, :ntext
+          Arel::Nodes::SqlLiteral.new('text')
         when :time
           Arel::Nodes::SqlLiteral.new('time')
         when :int
@@ -378,8 +386,8 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_FormattedNumber o, collector
         col = o.left.coalesce(0)
-        comma = o.precision == 0 ? '' : (Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale][0] || '.')
-        thousand_separator = Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale][1] || (Arel::Visitors::PostgreSQL::NUMBER_COMMA_MAPPING[o.locale] ? '' : 'G')
+        comma = o.precision == 0 ? '' : (NUMBER_COMMA_MAPPING[o.locale][0] || '.')
+        thousand_separator = NUMBER_COMMA_MAPPING[o.locale][1] || (NUMBER_COMMA_MAPPING[o.locale] ? '' : 'G')
         nines_after = (1..o.precision).map{'9'}.join('')
         nines_before = ("999#{thousand_separator}"*4+"990")
 
@@ -433,7 +441,7 @@ module ArelExtensions
       end
 
 
-      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
+      alias_method(:old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement) rescue nil
       def visit_Arel_Nodes_SelectStatement o, collector
 
         if !(collector.value.blank? || (collector.value.is_a?(Array) && collector.value[0].blank?)) && o.limit.blank? && o.offset.blank?
@@ -443,7 +451,7 @@ module ArelExtensions
         old_visit_Arel_Nodes_SelectStatement(o,collector)
       end
 
-      alias_method :old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias
+      alias_method(:old_visit_Arel_Nodes_TableAlias, :visit_Arel_Nodes_TableAlias) rescue nil
       def visit_Arel_Nodes_TableAlias o, collector
         if o.name.length > 63
           o = Arel::Table.new(o.table_name).alias(Arel.shorten(o.name))
@@ -451,7 +459,7 @@ module ArelExtensions
         old_visit_Arel_Nodes_TableAlias(o,collector)
       end
 
-      alias_method :old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute
+      alias_method(:old_visit_Arel_Attributes_Attribute, :visit_Arel_Attributes_Attribute) rescue nil
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name
         if join_name.length > 63
@@ -569,7 +577,6 @@ module ArelExtensions
         end
         collector
       end
-
     end
   end
 end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,16 +1,23 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::SQLite
-      Arel::Visitors::SQLite::DATE_MAPPING = {'d' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M', 'h' => '%H', 'mn' => '%M', 's' => '%S'}
-      Arel::Visitors::SQLite::DATE_FORMAT_DIRECTIVES = { # ISO C / POSIX
+      DATE_MAPPING = {
+        'd' => '%d', 'm' => '%m', 'w' => '%W', 'y' => '%Y', 'wd' => '%w', 'M' => '%M',
+        'h' => '%H', 'mn' => '%M', 's' => '%S'
+      }.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' => '%M', '%S' => '%S', '%L' =>   '', '%N' => '%f', '%z' => '' # seconds, subseconds
-      }
-      Arel::Visitors::SQLite::NUMBER_COMMA_MAPPING = { 'fr_FR' => {',' => ' ','.' =>','} }
+      }.freeze
+
+      NUMBER_COMMA_MAPPING = {
+        'fr_FR' => {',' => ' ', '.' =>','}
+      }.freeze
 
-      #String functions
+      # String functions
       def visit_ArelExtensions_Nodes_IMatches o, collector # insensitive on ASCII
         collector = visit o.left.ci_collate, collector
         collector << ' LIKE '
@@ -73,7 +80,6 @@ module ArelExtensions
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_IDoesNotMatch o, collector
         collector = visit o.left.lower, collector
         collector << ' NOT LIKE '
@@ -90,14 +96,15 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "date("
         collector = visit o.expressions.first, collector
-        collector << Arel::Visitors::SQLite::COMMA
+        collector << COMMA
         collector = visit o.sqlite_value, collector
         collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_DateDiff o, collector
-        if o.left_node_type == :ruby_time || o.left_node_type == :datetime || o.left_node_type == :time
+        case o.left_node_type
+        when :ruby_time, :datetime, :time
           collector << "strftime('%s', "
           collector = visit o.left, collector
           collector << ") - strftime('%s', "
@@ -113,17 +120,16 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Duration o, collector
-        collector << "strftime('#{Arel::Visitors::SQLite::DATE_MAPPING[o.left]}'#{Arel::Visitors::SQLite::COMMA}"
+        collector << "strftime('#{DATE_MAPPING[o.left]}'#{COMMA}"
         collector = visit o.right, collector
         collector << ")"
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "instr("
         collector = visit o.expr, collector
-        collector << Arel::Visitors::SQLite::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ")"
         collector
@@ -142,7 +148,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::SQLite::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -165,7 +171,7 @@ module ArelExtensions
         collector << "RANDOM("
         if o.left != nil && o.right != nil
           collector = visit o.left, collector
-          collector << Arel::Visitors::SQLite::COMMA
+          collector << COMMA
           collector = visit o.right, collector
         end
         collector << ")"
@@ -247,7 +253,7 @@ module ArelExtensions
                     collector << quote(attr.name)
                   end
                 end
-                collector << Arel::Visitors::SQLite::COMMA unless i == len
+                collector << COMMA unless i == len
             }
             collector << ' UNION ALL ' unless idx == o.left.length - 1
           end
@@ -275,7 +281,7 @@ module ArelExtensions
                     collector << quote(attr.name)
                   end
                 end
-                collector << Arel::Visitors::SQLite::COMMA unless i == len
+                collector << COMMA unless i == len
             }
             collector << ' UNION ALL ' unless idx == o.left.length - 1
           end
@@ -364,7 +370,7 @@ module ArelExtensions
         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 << '('
@@ -381,14 +387,13 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_FormattedNumber o, collector
         format = Arel::Nodes::NamedFunction.new('printf',[Arel::Nodes.build_quoted(o.original_string),o.left])
-        locale_map = Arel::Visitors::SQLite::NUMBER_COMMA_MAPPING[o.locale]
+        locale_map = NUMBER_COMMA_MAPPING[o.locale]
         if locale_map
           format = format.replace(',',locale_map[',']).replace('.',locale_map['.'])
         end
         visit format, collector
         collector
       end
-
     end
   end
 end

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,13 +1,13 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::ToSql
-      Arel::Visitors::ToSql::COMMA = ', ' unless defined?(Arel::Visitors::ToSql::COMMA)
+      COMMA = ', ' unless defined?(COMMA)
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
         collector << "ABS("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -17,7 +17,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Ceil o, collector
         collector << "CEIL("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -27,7 +27,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Floor o, collector
         collector << "FLOOR("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -37,7 +37,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "RAND("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -47,7 +47,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Round o, collector
         collector << "ROUND("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -64,7 +64,7 @@ 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 << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -81,9 +81,9 @@ module ArelExtensions
       # String functions
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
-      o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
-          collector = visit arg, collector
+        o.expressions.each_with_index { |arg, i|
+            collector << COMMA if i != 0
+            collector = visit arg, collector
         }
         collector << ")"
         collector
@@ -93,7 +93,7 @@ module ArelExtensions
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
         if o.separator && o.separator != 'NULL'
-          collector << Arel::Visitors::ToSql::COMMA
+          collector << COMMA
           collector = visit o.separator, collector
         end
         collector << ")"
@@ -117,7 +117,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "LOCATE("
         collector = visit o.right, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -126,7 +126,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << "SUBSTRING("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -136,9 +136,9 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Replace o, collector
         collector << "REPLACE("
         visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         visit o.pattern, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         visit o.substitute, collector
         collector << ")"
         collector
@@ -147,9 +147,9 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_RegexpReplace o, collector
         collector << "REGEXP_REPLACE("
         visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         visit Arel::Nodes.build_quoted(o.pattern.to_s), collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         visit o.substitute, collector
         collector << ")"
         collector
@@ -158,7 +158,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 << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -168,7 +168,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_FindInSet o, collector
         collector << "FIND_IN_SET("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -178,7 +178,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Soundex o, collector
         collector << "SOUNDEX("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -188,7 +188,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Downcase o, collector
         collector << "LOWER("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -198,7 +198,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Upcase o, collector
         collector << "UPPER("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -208,7 +208,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Trim o, collector
         collector << "TRIM("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -218,7 +218,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Ltrim o, collector
         collector << "LTRIM("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -228,7 +228,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Rtrim o, collector
         collector << "RTRIM("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -236,21 +236,20 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Blank o, collector
-    #visit o.left.coalesce('').trim.length.eq(0), collector
+        # visit o.left.coalesce('').trim.length.eq(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
         collector = visit o.expr, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) = 0"
         collector
       end
 
-
       def visit_ArelExtensions_Nodes_NotBlank o, collector
-    #visit o.left.coalesce('').trim.length.gt(0), collector
+        # visit o.left.coalesce('').trim.length.gt(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
         collector = visit o.expr, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) > 0"
         collector
@@ -261,13 +260,13 @@ module ArelExtensions
         when :date, :datetime, :time
           collector << "STRFTIME("
           collector = visit o.right, collector
-          collector << Arel::Visitors::ToSql::COMMA
+          collector << COMMA
           collector = visit o.left, collector
           collector << ")"
         when :integer, :float, :decimal
           collector << "FORMAT("
           collector = visit o.left, collector
-          collector << Arel::Visitors::ToSql::COMMA
+          collector << COMMA
           collector = visit o.right, collector
           collector << ")"
         else
@@ -276,7 +275,7 @@ module ArelExtensions
         collector
       end
 
-      #comparators
+      # comparators
 
       def visit_ArelExtensions_Nodes_Cast o, collector
         collector << "CAST("
@@ -295,6 +294,8 @@ module ArelExtensions
           as_attr = Arel::Nodes::SqlLiteral.new('time')
         when :binary
           as_attr = Arel::Nodes::SqlLiteral.new('binary')
+        when :text, :ntext
+          as_attr = Arel::Nodes::SqlLiteral.new('text')
         else
           as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -306,7 +307,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Coalesce o, collector
         collector << "COALESCE("
         o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
+          collector << COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -320,7 +321,7 @@ module ArelExtensions
                       'DATEDIFF('
                     end
         collector = visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ")"
         collector
@@ -329,13 +330,13 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateSub o, collector
         collector << "DATE_SUB("
         collector = visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ")"
         collector
       end
 
-        # override
+      # override
       remove_method(:visit_Arel_Nodes_As) rescue nil # if Arel::Visitors::ToSql.method_defined?(:visit_Arel_Nodes_As)
       def visit_Arel_Nodes_As o, collector
         if o.left.is_a?(Arel::Nodes::Binary)
@@ -416,7 +417,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "DATE_ADD("
         collector = visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit o.sqlite_value(o.right), collector
         collector << ')'
         collector
@@ -436,7 +437,7 @@ module ArelExtensions
               else
                 collector << quote(value, attr && column_for(attr)).to_s
               end
-              collector << Arel::Visitors::ToSql::COMMA unless i == len
+              collector << COMMA unless i == len
             }
             collector << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -458,7 +459,7 @@ module ArelExtensions
               else
                 collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
               end
-              collector << Arel::Visitors::ToSql::COMMA unless i == len
+              collector << COMMA unless i == len
             }
             collector << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -537,7 +538,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_LevenshteinDistance o, collector
         collector << "LEVENSHTEIN_DISTANCE("
         collector = visit o.left, collector
-        collector << Arel::Visitors::ToSql::COMMA
+        collector << COMMA
         collector = visit o.right, collector
         collector << ')'
         collector
@@ -545,7 +546,7 @@ module ArelExtensions
 
       # Boolean logic.
 
-      alias_method :old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And
+      alias_method(:old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And) rescue nil
       def visit_Arel_Nodes_And o, collector
         case o.children.length
         when 0
@@ -565,7 +566,7 @@ module ArelExtensions
         collector
       end
 
-      alias_method :old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or
+      alias_method(:old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or) rescue nil
       def visit_Arel_Nodes_Or o, collector
         case o.children.length
         when 0
@@ -585,6 +586,26 @@ module ArelExtensions
         collector
       end
 
+      def json_value(o,v)
+        case o.type_of_node(v)
+        when :string
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+        when :date
+          s = v.format('%Y-%m-%d')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :datetime
+          s = v.format('%Y-%m-%dT%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :time
+          s = v.format('%H:%M:%S')
+          Arel.when(s.is_null).then(Arel::Nodes.build_quoted("null")).else(Arel::Nodes.build_quoted('"') + s + '"')
+        when :nil
+          Arel::Nodes.build_quoted("null")
+        else
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+        end
+      end
+
       def visit_ArelExtensions_Nodes_Json o,collector
         case o.dict
         when Array
@@ -593,11 +614,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += json_value(o,v)
           end
           res += ']'
           collector = visit res, collector
@@ -607,12 +624,8 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              res = res + '"' + v + '"'
-            else
-              res += v
-            end
+            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += json_value(o,v)
           end
           res += '}'
           collector = visit res, collector
@@ -633,12 +646,8 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"')+k + '": '
-            if (v.is_a?(Arel::Attributes::Attribute) && o.type_of_attribute(v) == :string) || (v.respond_to?(:return_type) && v.return_type == :string)
-              kv = kv + '"' + v + '"'
-            else
-              kv += v
-            end
+            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'
@@ -646,7 +655,6 @@ module ArelExtensions
         end
         collector
       end
-
     end
   end
 end