arel_extensions 1.2.2 → 1.2.13

data/lib/arel_extensions/visitors/sqlite.rb

@@ -1,6 +1,6 @@
 module ArelExtensions
   module Visitors
-    Arel::Visitors::SQLite.class_eval do
+    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
         '%Y' => '%Y', '%C' =>   '', '%y' => '%y', '%m' => '%m', '%B' => '%M', '%b' => '%b', '%^b' => '%b', # year, month
@@ -150,13 +150,13 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ' IS NULL'
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << ' IS NOT NULL'
           collector
       end
@@ -193,18 +193,28 @@ module ArelExtensions
         collector
       end
 
-      # CASE WHEN ROUND(3.42,1) > round(3.42) THEN round(3.42) ELSE round(3.42)-1 END
-      # OR CAST(3.14 AS INTEGER)
+      # CAST(
+      #   CASE
+      #     WHEN 3.42 >= 0 THEN CAST(3.42 AS INT)
+      #     WHEN CAST(3.42 AS INT) = 3.42 THEN CAST(3.42 AS INT)
+      #     ELSE CAST((3.42 - 1.0) AS INT)
+      #   END
+      #   AS FLOAT
+      # )
       def visit_ArelExtensions_Nodes_Floor o, collector
-        collector << "CASE WHEN ROUND("
+        collector << "CAST(CASE WHEN "
         collector = visit o.left, collector
-        collector << ", 1) > ROUND("
+        collector << " >= 0 THEN CAST("
         collector = visit o.left, collector
-        collector << ") THEN ROUND("
+        collector << " AS INT) WHEN CAST("
+        collector = visit o.left, collector
+        collector << " AS INT) = "
         collector = visit o.left, collector
-        collector << ") ELSE ROUND("
+        collector << " THEN CAST("
         collector = visit o.left, collector
-        collector << ") - 1 END"
+        collector << " AS INT) ELSE CAST(("
+        collector = visit o.left, collector
+        collector << " - 1.0) AS INT) END AS FLOAT)"
         collector
       end
 
@@ -225,9 +235,8 @@ module ArelExtensions
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
           o.left.each_with_index do |row, idx|
             collector << 'SELECT '
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
                 case value
                 when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                   collector = visit value.as(attr.name), collector
@@ -248,12 +257,17 @@ module ArelExtensions
         def visit_ArelExtensions_InsertManager_BulkValues o, collector
           o.left.each_with_index do |row, idx|
             collector << 'SELECT '
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
                 case value
                 when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
                   collector = visit value.as(attr.name), collector
+                when Integer
+                  collector <<  value.to_s
+                  if idx == 0
+                    collector << " AS "
+                    collector << quote(attr.name)
+                  end
                 else
                   collector << (attr && attr.able_to_type_cast? ? quote(attr.type_cast_for_database(value)) : quote(value).to_s)
                   if idx == 0
@@ -270,32 +284,36 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Union o, collector
-        if o.left.is_a?(Arel::SelectManager)
-          collector = visit o.left.ast, collector
-        else
-          collector = visit o.left, collector
-        end
+        collector =
+          if o.left.is_a?(Arel::SelectManager)
+            visit o.left.ast, collector
+          else
+            visit o.left, collector
+          end
         collector << " UNION "
-        if o.right.is_a?(Arel::SelectManager)
-          collector = visit o.right.ast, collector
-        else
-          collector = visit o.right, collector
-        end
+        collector =
+          if o.right.is_a?(Arel::SelectManager)
+            visit o.right.ast, collector
+          else
+            visit o.right, collector
+          end
         collector
       end
 
       def visit_ArelExtensions_Nodes_UnionAll o, collector
-        if o.left.is_a?(Arel::SelectManager)
-          collector = visit o.left.ast, collector
-        else
-          collector = visit o.left, collector
-        end
+        collector =
+          if o.left.is_a?(Arel::SelectManager)
+            visit o.left.ast, collector
+          else
+            visit o.left, collector
+          end
         collector << " UNION ALL "
-        if o.right.is_a?(Arel::SelectManager)
-          collector = visit o.right.ast, collector
-        else
-          collector = visit o.right, collector
-        end
+        collector =
+          if o.right.is_a?(Arel::SelectManager)
+            visit o.right.ast, collector
+          else
+            visit o.right, collector
+          end
         collector
       end
 
@@ -346,16 +364,6 @@ module ArelExtensions
         collector
       end
 
-
-      alias_method :old_visit_Arel_Nodes_SelectStatement, :visit_Arel_Nodes_SelectStatement
-      def visit_Arel_Nodes_SelectStatement o, collector
-        if !collector.value.blank? && o.limit.blank?
-          o = o.dup
-          o.orders = []
-        end
-        old_visit_Arel_Nodes_SelectStatement(o,collector)
-      end
-
       alias_method :old_visit_Arel_Nodes_As, :visit_Arel_Nodes_As
       def visit_Arel_Nodes_As o, collector
         if o.left.is_a?(Arel::Nodes::Binary)

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Visitors
-  Arel::Visitors::ToSql.class_eval do
+    class Arel::Visitors::ToSql
+      Arel::Visitors::ToSql::COMMA = ', ' unless defined?(Arel::Visitors::ToSql::COMMA)
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
@@ -52,14 +53,14 @@ module ArelExtensions
         collector << ")"
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_Log10 o, collector
         collector << "LOG10("
         collector = visit o.left, collector
         collector << ")"
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_Power o, collector
         collector << "POW("
         o.expressions.each_with_index { |arg, i|
@@ -70,6 +71,13 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Sum o, collector
+        collector << "SUM("
+        collector = visit o.expr, collector
+        collector << ")"
+        collector
+      end
+
       # String functions
       def visit_ArelExtensions_Nodes_Concat o, collector
         collector << "CONCAT("
@@ -84,9 +92,9 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
-        if o.right && o.right != 'NULL'
+        if o.separator && o.separator != 'NULL'
           collector << Arel::Visitors::ToSql::COMMA
-          collector = visit o.right, collector
+          collector = visit o.separator, collector
         end
         collector << ")"
         collector
@@ -127,14 +135,26 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Replace o, collector
         collector << "REPLACE("
-        o.expressions.each_with_index { |arg, i|
-          collector << Arel::Visitors::ToSql::COMMA unless i == 0
-          collector = visit arg, collector
-        }
+        visit o.left, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit o.pattern, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit o.substitute, collector
         collector << ")"
         collector
       end
-  
+
+      def visit_ArelExtensions_Nodes_RegexpReplace o, collector
+        collector << "REGEXP_REPLACE("
+        visit o.left, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit Arel::Nodes.build_quoted(o.pattern.to_s), collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit o.substitute, collector
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "REPEAT("
         o.expressions.each_with_index { |arg, i|
@@ -218,7 +238,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Blank o, collector
     #visit o.left.coalesce('').trim.length.eq(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) = 0"
@@ -229,7 +249,7 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_NotBlank o, collector
     #visit o.left.coalesce('').trim.length.gt(0), collector
         collector << 'LENGTH(TRIM(COALESCE('
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << Arel::Visitors::ToSql::COMMA
         collector = visit Arel::Nodes.build_quoted(''), collector
         collector << "))) > 0"
@@ -269,12 +289,12 @@ module ArelExtensions
           as_attr = Arel::Nodes::SqlLiteral.new('int')
         when :decimal, :float, :number
           as_attr = Arel::Nodes::SqlLiteral.new('float')
-        when :datetime  
+        when :datetime
           as_attr = Arel::Nodes::SqlLiteral.new('datetime')
         when :time
           as_attr = Arel::Nodes::SqlLiteral.new('time')
-        when :binary  
-          as_attr = Arel::Nodes::SqlLiteral.new('binary')  
+        when :binary
+          as_attr = Arel::Nodes::SqlLiteral.new('binary')
         else
           as_attr = Arel::Nodes::SqlLiteral.new(o.as_attr.to_s)
         end
@@ -305,7 +325,7 @@ module ArelExtensions
         collector << ")"
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_DateSub o, collector
         collector << "DATE_SUB("
         collector = visit o.left, collector
@@ -367,14 +387,14 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector << "ISNULL("
-        collector = visit o.left, collector
+        collector = visit o.expr, collector
         collector << ")"
         collector
       end
 
       def visit_ArelExtensions_Nodes_IsNotNull o, collector
           collector << "NOT ISNULL("
-          collector = visit o.left, collector
+          collector = visit o.expr, collector
           collector << ")"
           collector
       end
@@ -384,7 +404,7 @@ module ArelExtensions
         collector = visit o.left, collector
         collector << ") THEN "
         collector = visit o.right, collector
-        if o.expressions[2]  
+        if o.expressions[2]
           collector << " ELSE "
           collector = visit o.expressions[2], collector
         end
@@ -408,16 +428,15 @@ module ArelExtensions
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
             collector << '('
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value, collector
-                else
-                  collector << quote(value, attr && column_for(attr)).to_s
-                end
-                collector << Arel::Visitors::ToSql::COMMA unless i == len
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              else
+                collector << quote(value, attr && column_for(attr)).to_s
+              end
+              collector << Arel::Visitors::ToSql::COMMA unless i == len
             }
             collector << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -429,16 +448,17 @@ module ArelExtensions
           row_nb = o.left.length
           o.left.each_with_index do |row, idx|
             collector << '('
-            v = Arel::Nodes::Values.new(row, o.cols)
-            len = v.expressions.length - 1
-            v.expressions.zip(v.columns).each_with_index { |(value, attr), i|
-                case value
-                when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
-                  collector = visit value, collector
-                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
+            len = row.length - 1
+            row.zip(o.cols).each_with_index { |(value, attr), i|
+              case value
+              when Arel::Nodes::SqlLiteral, Arel::Nodes::BindParam
+                collector = visit value, collector
+              when Integer
+                collector << value.to_s
+              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 << (idx == row_nb-1 ? ')' : '), ')
           end
@@ -452,7 +472,7 @@ module ArelExtensions
         collector = visit o.right, collector
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_UnionAll o, collector
         collector = visit o.left, collector
         collector << " UNION ALL "
@@ -489,25 +509,25 @@ module ArelExtensions
         visit Arel::Nodes.build_quoted(o.expr), collector
       end
 
-      def visit_ArelExtensions_Nodes_FormattedNumber o, collector  
+      def visit_ArelExtensions_Nodes_FormattedNumber o, collector
         visit o.left, collector
       end
-  
-      remove_method(:visit_Arel_Nodes_LessThan) rescue nil  
+
+      remove_method(:visit_Arel_Nodes_LessThan) rescue nil
       def visit_Arel_Nodes_LessThan o, collector
         collector = visit o.left, collector
         collector << " < "
         visit o.right, collector
       end
-  
-      def visit_ArelExtensions_Nodes_Std o, collector  
+
+      def visit_ArelExtensions_Nodes_Std o, collector
         collector << "STD("
         visit o.left, collector
         collector << ")"
         collector
       end
-  
-      def visit_ArelExtensions_Nodes_Variance o, collector  
+
+      def visit_ArelExtensions_Nodes_Variance o, collector
         collector << "VARIANCE("
         visit o.left, collector
         collector << ")"
@@ -523,11 +543,13 @@ module ArelExtensions
         collector
       end
 
+      # Boolean logic.
+
       alias_method :old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And
       def visit_Arel_Nodes_And o, collector
         case o.children.length
         when 0
-          collector << '1=1' # but this should not happen
+          collector << '1 = 1' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
@@ -543,10 +565,11 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Or o, collector
+      alias_method :old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or
+      def visit_Arel_Nodes_Or o, collector
         case o.children.length
         when 0
-          collector << '0=1' # but this should not happen
+          collector << '1 = 0' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
@@ -562,16 +585,6 @@ module ArelExtensions
         collector
       end
 
-      alias_method :old_visit_Arel_Nodes_Or, :visit_Arel_Nodes_Or
-      def visit_Arel_Nodes_Or o, collector
-        collector << '('
-        collector = visit o.left, collector
-        collector << ') OR ('
-        collector = visit o.right, collector
-        collector << ')'
-        collector
-      end
-
       def visit_ArelExtensions_Nodes_Json o,collector
         case o.dict
         when Array
@@ -611,7 +624,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_JsonGroup o, collector
         if o.as_array
-          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ',o.orders) : o.dict.group_concat(', ')) + ']'
+          res = Arel::Nodes.build_quoted('[') + (o.orders ? o.dict.group_concat(', ', order: Array(o.orders)) : o.dict.group_concat(', ')).coalesce('') + ']'
           collector = visit res, collector
         else
           res = Arel::Nodes.build_quoted('{')
@@ -626,7 +639,7 @@ module ArelExtensions
             else
               kv += v
             end
-            res = res + kv.group_concat(', ',orders)
+            res = res + kv.group_concat(', ', order: Array(orders)).coalesce('')
           end
           res = res + '}'
           collector = visit res, collector