arel_extensions 1.2.23 → 1.3.1

data/lib/arel_extensions/visitors/mssql.rb

@@ -2,27 +2,37 @@ module ArelExtensions
   module Visitors
     module MSSQL
 
-      Arel::Visitors::MSSQL::DATE_MAPPING = {
+      mssql_class = Arel::Visitors.constants.select { |c|
+        Arel::Visitors.const_get(c).is_a?(Class) && %i[MSSQL SQLServer].include?(c)
+      }.first
+
+      LOADED_VISITOR = Arel::Visitors.const_get(mssql_class) || Arel::Visitors.const_get('MSSQL')
+
+      LOADED_VISITOR::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 = {
+      LOADED_VISITOR::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 =
+      LOADED_VISITOR::DATE_FORMAT_FORMAT = {
+        'YY' => '0#', 'MM' => '0#', 'DD' => '0#', 'hh' => '0#', 'mi' => '0#', 'ss' => '0#'
+      }
+
+      LOADED_VISITOR::DATE_FORMAT_REGEX =
         Regexp.new(
-          Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES
+          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
-      Arel::Visitors::MSSQL::DATE_CONVERT_FORMATS = {
+      LOADED_VISITOR::DATE_CONVERT_FORMATS = {
         'YYYY-MM-DD' => 120,
         'YY-MM-DD'  => 120,
         'MM/DD/YYYY' => 101,
@@ -79,7 +89,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 << LOADED_VISITOR::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -102,23 +112,23 @@ module ArelExtensions
         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
+                      when :ruby_time, :datetime, :time then 'DATEDIFF(second'
+                      else                                   'DATEDIFF(day'
+                      end
+          collector << LOADED_VISITOR::COMMA
           collector = visit o.right, collector
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::COMMA
           collector = visit o.left, collector
           collector << ')'
         else
           da = ArelExtensions::Nodes::DateAdd.new([])
           collector << "DATEADD("
           collector = visit da.mssql_datepart(o.right), collector
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::COMMA
           collector << "-("
           collector = visit da.mssql_value(o.right), collector
           collector << ")"
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::COMMA
           collector = visit o.left, collector
           collector << ")"
           collector
@@ -129,9 +139,9 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "DATEADD("
         collector = visit o.mssql_datepart(o.right), collector
-        collector << Arel::Visitors::MSSQL::COMMA
+        collector << LOADED_VISITOR::COMMA
         collector = visit o.mssql_value(o.right), collector
-        collector << Arel::Visitors::MSSQL::COMMA
+        collector << LOADED_VISITOR::COMMA
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -144,8 +154,8 @@ module ArelExtensions
           left = o.left.end_with?('i') ? o.left[0..-2] : o.left
           conv = ['h', 'mn', 's'].include?(o.left)
           collector << 'DATEPART('
-          collector << Arel::Visitors::MSSQL::DATE_MAPPING[left]
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::DATE_MAPPING[left]
+          collector << LOADED_VISITOR::COMMA
           collector << 'CONVERT(datetime,' if conv
           collector = visit o.right, collector
           collector << ')' if conv
@@ -155,20 +165,29 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LEN("
-        collector = visit o.expr, collector
-        collector << ")"
-        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
       end
 
       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 << LOADED_VISITOR::COMMA if i != 0
           collector = visit arg, collector
         }
         if o.expressions.length == 1
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::COMMA
           collector << "0"
         end
         collector << ")"
@@ -178,7 +197,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "CHARINDEX("
         collector = visit o.right, collector
-        collector << Arel::Visitors::MSSQL::COMMA
+        collector << LOADED_VISITOR::COMMA
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -187,28 +206,20 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Substring o, collector
         collector << 'SUBSTRING('
         collector = visit o.expressions[0], collector
-        collector << Arel::Visitors::MSSQL::COMMA
+        collector << LOADED_VISITOR::COMMA
         collector = visit o.expressions[1], collector
-        collector << Arel::Visitors::MSSQL::COMMA
+        collector << LOADED_VISITOR::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
-        if o.right
-          collector << "REPLACE(REPLACE(LTRIM(RTRIM(REPLACE(REPLACE("
-          collector = visit o.left, collector
-          collector << ", ' ', '~'), "
-          collector = visit o.right, collector
-          collector << ", ' '))), ' ', "
-          collector = visit o.right, collector
-          collector << "), '~', ' ')"
-        else
-          collector << "LTRIM(RTRIM("
-          collector = visit o.left, collector
-          collector << "))"
-        end
+        collector << 'TRIM( '
+        collector = visit o.right, collector
+        collector << " FROM "
+        collector = visit o.left, collector
+        collector << ")"
         collector
       end
 
@@ -255,12 +266,21 @@ 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 = ArelExtensions::Visitors::strftime_to_format(o.iso_format, LOADED_VISITOR::DATE_FORMAT_DIRECTIVES)
+        if fmt = LOADED_VISITOR::DATE_CONVERT_FORMATS[f]
           collector << "CONVERT(VARCHAR(#{f.length})"
-          collector << Arel::Visitors::MSSQL::COMMA
+          collector << LOADED_VISITOR::COMMA
+          if o.time_zone
+            collector << 'CONVERT(datetime'
+            collector << LOADED_VISITOR::COMMA
+            collector << ' '
+          end
           collector = visit o.left, collector
-          collector << Arel::Visitors::MSSQL::COMMA
+          if o.time_zone
+            collector << ") AT TIME ZONE 'UTC' AT TIME ZONE "
+            collector = visit o.time_zone, collector
+          end
+          collector << LOADED_VISITOR::COMMA
           collector << fmt.to_s
           collector << ')'
           collector
@@ -272,13 +292,31 @@ module ArelExtensions
             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('
+            when s.scan(LOADED_VISITOR::DATE_FORMAT_REGEX)
+              dir = LOADED_VISITOR::DATE_FORMAT_DIRECTIVES[s.matched]
+              fmt = LOADED_VISITOR::DATE_FORMAT_FORMAT[dir]
+              collector << 'TRIM('
+              collector << 'FORMAT(' if fmt
+              collector << 'STR('    if !fmt
+              collector << 'DATEPART('
               collector << dir
-              collector << Arel::Visitors::MSSQL::COMMA
+              collector << LOADED_VISITOR::COMMA
+              if o.time_zone
+                collector << 'CONVERT(datetime'
+                collector << LOADED_VISITOR::COMMA
+                collector << ' '
+              end
               collector = visit o.left, collector
-              collector << ')))'
+              if o.time_zone
+                collector << ") AT TIME ZONE 'UTC' AT TIME ZONE "
+                collector = visit o.time_zone, collector
+              end
+              collector << ')'
+              collector << ')'                                  if !fmt
+              collector << LOADED_VISITOR::COMMA << "'#{fmt}')" if fmt
+              collector << ')'
+            when s.scan(/^%%/)
+              collector = visit Arel::Nodes.build_quoted('%'), collector
             when s.scan(/[^%]+|./)
               collector = visit Arel::Nodes.build_quoted(s.matched), collector
             end
@@ -291,7 +329,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 << LOADED_VISITOR::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -301,7 +339,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 << LOADED_VISITOR::COMMA if i != 0
           collector = visit arg, collector
         }
         collector << ")"
@@ -387,6 +425,27 @@ 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
+        quote = o.right.is_a?(Arel::Nodes::SqlLiteral) && o.right[0] != '"' && o.right[-1] != '"'
+
+        collector << '"' if quote
+        collector = visit o.right, collector
+        collector << '"' if quote
+
+        collector
+      end
+
       # SQL Server does not know about REGEXP
       def visit_Arel_Nodes_Regexp o, collector
         collector = visit o.left, collector
@@ -554,7 +613,6 @@ module ArelExtensions
         collector << ')'
         collector
       end
-
     end
   end
 end

data/lib/arel_extensions/visitors/mysql.rb

@@ -209,7 +209,13 @@ module ArelExtensions
         when :date, :datetime, :time
           fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
           collector << "DATE_FORMAT("
+          collector << "CONVERT_TZ(" if o.time_zone
           collector = visit o.left, collector
+          if o.time_zone
+            collector << COMMA << "'UTC'" << COMMA
+            collector = visit o.time_zone, collector
+            collector << ')'
+          end
           collector << COMMA
           collector = visit Arel::Nodes.build_quoted(fmt), collector
           collector << ")"
@@ -354,9 +360,16 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS `"
+        collector << " AS "
+
+        # sometimes these values are already quoted, if they are, don't double quote it
+        quote = o.right.is_a?(Arel::Nodes::SqlLiteral) && o.right[0] != '`' && o.right[-1] != '`'
+
+        collector << '`' if quote
         collector = visit o.right, collector
-        collector << "`"
+        collector << '`' if quote
+
+        collector
         collector
       end
 

data/lib/arel_extensions/visitors/oracle.rb

@@ -5,7 +5,7 @@ module ArelExtensions
       SPECIAL_CHARS = {"\t" => 'CHR(9)', "\n" => 'CHR(10)', "\r" => 'CHR(13)'}
       DATE_MAPPING = {'d' => 'DAY', 'm' => 'MONTH', 'w' => 'IW', 'y' => 'YEAR', 'wd' => 'D', 'h' => 'HOUR', 'mn' => 'MINUTE', 's' => 'SECOND'}
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY', '%m' => 'MM', '%B' => 'Month', '%^B' => 'MONTH', '%b' => 'Mon', '%^b' => 'MON',
+        '%Y' => 'YYYY', '%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
@@ -308,7 +308,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "LENGTH#{o.bytewise ? 'B' : ''}("
         collector = visit o.expr, collector
         collector << ")"
         collector
@@ -447,7 +447,12 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Format o, collector
         fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << "TO_CHAR("
+        collector << "CAST(" if o.time_zone
         collector = visit o.left, collector
+        if o.time_zone
+          collector << " as timestamp) at time zone "
+          collector = visit o.time_zone, collector
+        end
         collector << COMMA
         collector = visit Arel::Nodes.build_quoted(fmt), collector
         collector << ")"
@@ -517,7 +522,7 @@ module ArelExtensions
         if element.is_a?(Time)
           ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
         elsif element.is_a?(Arel::Attributes::Attribute)
-          col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+          col = ArelExtensions::column_of(element.relation.table_name, element.name.to_s)
           if col && (col.type == :time)
             ArelExtensions::Nodes::Format.new [element, '%H:%M:%S']
           else

data/lib/arel_extensions/visitors/postgresql.rb

@@ -7,7 +7,7 @@ module ArelExtensions
       }.freeze
 
       DATE_FORMAT_DIRECTIVES = {
-        '%Y' => 'IYYY', '%C' => 'CC', '%y' => 'YY',
+        '%Y' => 'YYYY', '%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
@@ -86,9 +86,15 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS \""
+        collector << " AS "
+
+        # sometimes these values are already quoted, if they are, don't double quote it
+        quote = o.right.is_a?(Arel::Nodes::SqlLiteral) && o.right[0] != '"' && o.right[-1] != '"'
+
+        collector << '"' if quote
         collector = visit o.right, collector
-        collector << "\""
+        collector << '"' if quote
+
         collector
       end
 
@@ -170,6 +176,10 @@ module ArelExtensions
         fmt = ArelExtensions::Visitors::strftime_to_format(o.iso_format, DATE_FORMAT_DIRECTIVES)
         collector << "TO_CHAR("
         collector = visit o.left, collector
+        if o.time_zone
+          collector << " AT TIME ZONE "
+          collector = visit o.time_zone, collector
+        end
         collector << COMMA
         collector = visit Arel::Nodes.build_quoted(fmt), collector
         collector << ")"
@@ -283,9 +293,9 @@ module ArelExtensions
               return collector
             end
         end
-        collector << "EXTRACT(#{DATE_MAPPING[o.left]} FROM "
+        collector << "EXTRACT(#{DATE_MAPPING[o.left]} FROM CAST("
         collector = visit o.right, collector
-        collector << ")"
+        collector << " AS TIMESTAMP WITH TIME ZONE))"
         collector << " * (INTERVAL '1' #{interval})" if interval && o.with_interval
         collector
       end
@@ -368,11 +378,13 @@ module ArelExtensions
         when :number, :decimal, :float
           Arel::Nodes::SqlLiteral.new('numeric')
         when :datetime
-          Arel::Nodes::SqlLiteral.new('timestamp')
+          Arel::Nodes::SqlLiteral.new('timestamp with time zone')
         when :date
           Arel::Nodes::SqlLiteral.new('date')
         when :binary
           Arel::Nodes::SqlLiteral.new('binary')
+        when :jsonb
+          Arel::Nodes::SqlLiteral.new('jsonb')
         else
           Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -401,13 +413,13 @@ module ArelExtensions
             ArelExtensions::Nodes::Concat.new([
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor),
+                    Arel.when(col.not_eq 0).then(col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)).else(1),
                     Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
                   ])]),
                 o.type,
                 Arel::Nodes::NamedFunction.new('TRIM',[
                   Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                    col.abs.log10.floor,
+                    Arel.when(col.not_eq 0).then(col.abs.log10.floor).else(0),
                     Arel::Nodes.build_quoted('FM'+nines_before)
                   ])])
               ])
@@ -511,8 +523,6 @@ module ArelExtensions
           collector << '::jsonb'
         when NilClass
           collector  << %Q['null'::jsonb]
-        when Arel::Attributes::Attribute
-          collector = visit o.dict.cast(:jsonb), collector
         else
           collector = visit o.dict, collector
           collector << '::jsonb'
@@ -532,7 +542,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGet o,collector
         collector = visit o.dict, collector
-        collector << ' -> '
+        collector << ' ->> '
         collector = visit o.key, collector
         collector
       end

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,3 +1,5 @@
+require 'arel_extensions/helpers'
+
 module ArelExtensions
   module Visitors
     class Arel::Visitors::SQLite
@@ -327,7 +329,7 @@ module ArelExtensions
         if element.is_a?(Time)
           return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
         elsif element.is_a?(Arel::Attributes::Attribute)
-          col = Arel::Table.engine.connection.schema_cache.columns_hash(element.relation.table_name)[element.name.to_s]
+          col = ArelExtensions::column_of(element.relation.table_name, element.name.to_s)
           if col && (col.type == :time)
             return Arel::Nodes::NamedFunction.new('STRFTIME',[element, '%H:%M:%S'])
           else
@@ -379,9 +381,10 @@ module ArelExtensions
         else
           collector = visit o.left, collector
         end
-        collector << " AS \""
+        sep = o.right.size > 1 && o.right[0] == '"' && o.right[-1] == '"' ? '' : '"'
+        collector << " AS #{sep}"
         collector = visit o.right, collector
-        collector << "\""
+        collector << "#{sep}"
         collector
       end
 

data/lib/arel_extensions/visitors/to_sql.rb

@@ -8,10 +8,15 @@ module ArelExtensions
       def make_json_string expr
         Arel::Nodes.build_quoted('"') \
         + expr
+            .coalesce('')
             .replace('\\','\\\\').replace('"','\"').replace("\n", '\n') \
         + '"'
       end
 
+      def make_json_null
+        Arel::Nodes.build_quoted("null")
+      end
+
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
         collector << "ABS("
@@ -117,7 +122,7 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Length o, collector
-        collector << "LENGTH("
+        collector << "#{o.bytewise ? '' : 'CHAR_'}LENGTH("
         collector = visit o.left, collector
         collector << ")"
         collector
@@ -601,20 +606,20 @@ module ArelExtensions
       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(make_json_string(v))
+          Arel.when(v.is_null).then(make_json_null).else(make_json_string(v))
         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 + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(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 + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(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 + '"')
+          Arel.when(s.is_null).then(make_json_null).else(make_json_string(s))
         when :nil
-          Arel::Nodes.build_quoted("null")
+          make_json_null
         else
-          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce("null")
+          ArelExtensions::Nodes::Cast.new([v, :string]).coalesce(make_json_null)
         end
       end
 
@@ -636,7 +641,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
+            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string])) + ': '
             res += json_value(o,v)
           end
           res += '}'
@@ -658,7 +663,7 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
+            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string])) + ': '
             kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end

data/lib/arel_extensions/visitors.rb

@@ -9,9 +9,17 @@ if defined?(Arel::Visitors::Oracle)
   require 'arel_extensions/visitors/oracle12'
 end
 
-if defined?(Arel::Visitors::MSSQL)
+if defined?(Arel::Visitors::SQLServer) || defined?(Arel::Visitors::MSSQL)
   require 'arel_extensions/visitors/mssql'
+end
 
+if defined?(Arel::Visitors::SQLServer)
+  class Arel::Visitors::SQLServer
+    include ArelExtensions::Visitors::MSSQL
+  end
+end
+
+if defined?(Arel::Visitors::MSSQL)
   class Arel::Visitors::MSSQL
     include ArelExtensions::Visitors::MSSQL