arel_extensions 1.2.15 → 1.2.23

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,22 @@
 module ArelExtensions
   module Visitors
     class Arel::Visitors::ToSql
-      Arel::Visitors::ToSql::COMMA = ', ' unless defined?(Arel::Visitors::ToSql::COMMA)
+      COMMA = ', ' unless defined?(COMMA)
+
+      # Escape properly the string expression expr.
+      # Take care of escaping.
+      def make_json_string expr
+        Arel::Nodes.build_quoted('"') \
+        + expr
+            .replace('\\','\\\\').replace('"','\"').replace("\n", '\n') \
+        + '"'
+      end
 
       # 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 +26,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 +36,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 +46,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 +56,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 +73,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 +90,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 +102,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 +126,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 +135,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 +145,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 +156,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 +167,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 +177,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 +187,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 +197,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 +207,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 +217,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 +227,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 +237,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 +245,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 +269,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 +284,7 @@ module ArelExtensions
         collector
       end
 
-      #comparators
+      # comparators
 
       def visit_ArelExtensions_Nodes_Cast o, collector
         collector << "CAST("
@@ -295,6 +303,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 +316,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 +330,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,15 +339,18 @@ 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.respond_to?(:alias)
+          o.left.alias = nil
+        end
         if o.left.is_a?(Arel::Nodes::Binary)
           collector << '('
           collector = visit o.left, collector
@@ -416,7 +429,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 +449,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 +471,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 +550,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 +558,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 +578,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
@@ -588,7 +601,7 @@ 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(Arel::Nodes.build_quoted('"') + v.replace('\\','\\\\').replace('"','\"') + '"')
+          Arel.when(v.is_null).then(Arel::Nodes.build_quoted("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 + '"')
@@ -623,7 +636,7 @@ module ArelExtensions
             if i != 0
               res += ', '
             end
-            res += Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            res += make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
             res += json_value(o,v)
           end
           res += '}'
@@ -645,7 +658,7 @@ module ArelExtensions
             if i != 0
               res = res + ', '
             end
-            kv = Arel::Nodes.build_quoted('"') + ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("").replace('\\','\\\\').replace('"','\"') + '": '
+            kv = make_json_string(ArelExtensions::Nodes::Cast.new([k, :string]).coalesce("")) + ': '
             kv += json_value(o,v)
             res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
@@ -654,7 +667,6 @@ module ArelExtensions
         end
         collector
       end
-
     end
   end
 end