arel_extensions 1.2.5 → 1.2.8

data/lib/arel_extensions/visitors/mysql.rb

@@ -97,26 +97,28 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Collate o, collector
-        case o.expressions.first
-        when Arel::Attributes::Attribute
-          charset = case o.option
+        charset =
+          case o.expressions.first
+          when Arel::Attributes::Attribute
+            case o.option
             when 'latin1','utf8'
               o.option
             else
               Arel::Table.engine.connection.charset || 'utf8'
             end
-        else
-          charset = (o.option == 'latin1') ? 'latin1' : 'utf8'
-        end
+          else
+            (o.option == 'latin1') ? 'latin1' : 'utf8'
+          end
         collector = visit o.expressions.first, collector
-        if o.ai
-          collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+        collector <<
+          if o.ai
+            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
           #doesn't work in latin1
-        elsif o.ci
-          collector << " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
-        else
-          collector << " COLLATE #{charset}_bin"
-        end
+          elsif o.ci
+            " COLLATE #{charset == 'latin1' ? 'latin1_general_ci' : 'utf8_unicode_ci' }"
+          else
+            " COLLATE #{charset}_bin"
+          end
         collector
       end
 
@@ -262,7 +264,7 @@ module ArelExtensions
         else
           if o.with_interval
             case o.left
-            when  'd','m','y'
+            when 'd','m','y'
               interval = 'DAY'
             when 'h','mn','s'
               interval = 'SECOND'
@@ -362,20 +364,21 @@ module ArelExtensions
                   else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
         sign_length = ArelExtensions::Nodes::Length.new([sign])
 
-        if o.scientific_notation
-          number = ArelExtensions::Nodes::Concat.new([
-                  Arel::Nodes::NamedFunction.new('FORMAT',[
-                    col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
-                  ]+params),
-                  o.type,
-                  Arel::Nodes::NamedFunction.new('FORMAT',[
-                    col.abs.log10.floor,
-                    0
+        number =
+          if o.scientific_notation
+            ArelExtensions::Nodes::Concat.new([
+                    Arel::Nodes::NamedFunction.new('FORMAT',[
+                      col.abs/Arel::Nodes.build_quoted(10).pow(col.abs.log10.floor)
+                    ]+params),
+                    o.type,
+                    Arel::Nodes::NamedFunction.new('FORMAT',[
+                      col.abs.log10.floor,
+                      0
+                    ])
                   ])
-                ])
-        else
-          number = Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
-        end
+          else
+            Arel::Nodes::NamedFunction.new('FORMAT',[col.abs]+params)
+          end
 
         repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
           when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
@@ -399,19 +402,19 @@ module ArelExtensions
       end
 
       def visit_Aggregate_For_AggregateFunction o, collector
-        if !(Arel::Table.engine.connection.send(:version) >= (Arel::Table.engine.connection.send(:mariadb?) ? '10.2.3' : '8.0'))
+        if !window_supported?
             warn("Warning : ArelExtensions: Window Functions are not available in the current version on the DBMS.")
             return collector
         end
 
-        if o.order || o.group
+        if !o.order.empty? || !o.group.empty?
           collector << " OVER ("
-          if o.group
+          if !o.group.empty?
             collector << " PARTITION BY ("
             visit o.group, collector
             collector << ")"
           end
-          if o.order
+          if !o.order.empty?
             collector << " ORDER BY ("
             visit o.order, collector
             collector << ")"
@@ -433,15 +436,27 @@ module ArelExtensions
         collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
         visit o.left, collector
         collector << ")"
+        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 
       # JSON if implemented only after 10.2.3 in MariaDb and 5.7 in MySql
       def json_supported?
-        Arel::Table.engine.connection.send(:mariadb?) &&
-        Arel::Table.engine.connection.send(:version) >= '10.2.3' ||
-        !Arel::Table.engine.connection.send(:mariadb?) &&
-        Arel::Table.engine.connection.send(:version) >= '5.7.0'
+        version_supported?('10.2.3', '5.7.0')
+      end
+
+      def window_supported?
+        version_supported?('10.2.3', '8.0')
+      end
+
+      def version_supported?(mysql_v = '10.2.3',mariadb_v = '5.7.0')
+        conn = Arel::Table.engine.connection
+        conn.send(:mariadb?) &&
+          (conn.respond_to?(:get_database_version) && conn.send(:get_database_version) >= mysql_v ||
+          conn.respond_to?(:version) && conn.send(:version) >= mysql_v) ||
+          !Arel::Table.engine.connection.send(:mariadb?) &&
+          (conn.respond_to?(:get_database_version) && conn.send(:get_database_version) >= mariadb_v ||
+          conn.respond_to?(:version) && conn.send(:version) >= mariadb_v)
       end
 
       def visit_ArelExtensions_Nodes_Json o,collector

data/lib/arel_extensions/visitors/oracle.rb

@@ -131,11 +131,12 @@ module ArelExtensions
         collector << "(LISTAGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        if o.separator  && o.separator != 'NULL'
-          collector = visit o.separator, collector
-        else
-          collector = visit Arel::Nodes.build_quoted(','), collector
-        end
+        collector =
+          if o.separator && o.separator != 'NULL'
+            visit o.separator, collector
+          else
+            visit Arel::Nodes.build_quoted(','), collector
+          end
         collector << ") WITHIN GROUP (ORDER BY "
         if !o.order.blank?
           o.order.each_with_index do |order,i|
@@ -154,7 +155,7 @@ module ArelExtensions
         o.expressions.each_with_index { |arg, i|
           collector << Arel::Visitors::Oracle::COMMA unless i == 0
           if i > 0 && o.left_node_type == :text
-            if arg == ''  || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
+            if arg == '' || (arg.is_a?(Arel::Nodes::Quoted) && (arg.expr == ''))
               collector << "NULL"
             else
               collector << 'TO_CLOB('

data/lib/arel_extensions/visitors/oracle12.rb

@@ -68,7 +68,7 @@ module ArelExtensions
             if i != 0
               collector << Arel::Visitors::MySQL::COMMA
             end
-            collector  = visit v, collector
+            collector = visit v, collector
           end
           collector << ')'
         when Hash

data/lib/arel_extensions/visitors/postgresql.rb

@@ -120,11 +120,12 @@ module ArelExtensions
         o.order = nil
         visit_Aggregate_For_AggregateFunction o, collector
         collector << Arel::Visitors::PostgreSQL::COMMA
-        if o.separator  && o.separator != 'NULL'
-          collector = visit o.separator, collector
-        else
-          collector = visit Arel::Nodes.build_quoted(','), collector
-        end
+        collector =
+          if o.separator && o.separator != 'NULL'
+            visit o.separator, collector
+          else
+            visit Arel::Nodes.build_quoted(','), collector
+          end
         collector << ")"
         collector
       end
@@ -302,6 +303,22 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_RegexpReplace o, collector
+        collector << "REGEXP_REPLACE("
+        visit o.left, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        tab = o.pattern.inspect+ 'g' # Make it always global
+        pattern = tab.split('/')[1..-2].join('/') 
+        flags = tab.split('/')[-1]
+        visit Arel::Nodes.build_quoted(pattern), collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit o.substitute, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        visit Arel::Nodes.build_quoted(flags+"g"), collector
+        collector << ")"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_IsNull o, collector
         collector = visit o.expr, collector
         collector << ' IS NULL'
@@ -371,27 +388,28 @@ module ArelExtensions
                   else(o.flags.include?('+') ? '+' : (o.flags.include?(' ') ? ' ' : ''))
         sign_length = ArelExtensions::Nodes::Length.new([sign])
 
-        if o.scientific_notation
-          number = 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::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::Nodes.build_quoted('FM'+nines_before)
-                    ])])
-                ])
-        else
-          number = Arel::Nodes::NamedFunction.new('TRIM',[
-                Arel::Nodes::NamedFunction.new('TO_CHAR',[
-                  Arel::Nodes.build_quoted(col.abs),
-                  Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
-                ])])
-        end
+        number =
+          if o.scientific_notation
+            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::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::Nodes.build_quoted('FM'+nines_before)
+                  ])])
+              ])
+          else
+            Arel::Nodes::NamedFunction.new('TRIM',[
+              Arel::Nodes::NamedFunction.new('TO_CHAR',[
+                Arel::Nodes.build_quoted(col.abs),
+                Arel::Nodes.build_quoted('FM'+nines_before+'"'+comma+'"V'+nines_after)
+              ])])
+          end
 
         repeated_char = (o.width == 0) ? Arel::Nodes.build_quoted('') : ArelExtensions::Nodes::Case.new().
           when(Arel::Nodes.build_quoted(o.width).abs-(number.length+sign_length)>0).
@@ -466,7 +484,7 @@ module ArelExtensions
             if i != 0
               collector << Arel::Visitors::MySQL::COMMA
             end
-            collector  = visit v, collector
+            collector = visit v, collector
           end
           collector << '])'
         when Hash

data/lib/arel_extensions/visitors/sqlite.rb

@@ -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
 
@@ -270,32 +280,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
 

data/lib/arel_extensions/visitors/to_sql.rb

@@ -1,6 +1,7 @@
 module ArelExtensions
   module Visitors
-  Arel::Visitors::ToSql.class_eval do
+    Arel::Visitors::ToSql.class_eval do
+      Arel::Visitors::ToSql::COMMA = ', ' unless defined?(Arel::Visitors::ToSql::COMMA)
 
       # Math Functions
       def visit_ArelExtensions_Nodes_Abs o, collector
@@ -134,10 +135,22 @@ 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

data/test/visitors/test_bulk_insert_oracle.rb

@@ -9,8 +9,8 @@ module ArelExtensions
         @table = Arel::Table.new(:users)
         @cols = ['name', 'comments', 'created_at']
         @data = [
-        	['nom1', "sdfdsfdsfsdf", '2016-01-01'],
-        	['nom2', "sdfdsfdsfsdf", '2016-01-01']
+          ['nom1', "sdfdsfdsfsdf", '2016-01-01'],
+          ['nom2', "sdfdsfdsfsdf", '2016-01-01']
         ]
       end
 
@@ -24,11 +24,11 @@ module ArelExtensions
 
       it "should import large set of data in Oracle" do
         insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(@conn).into(@table)
-      	insert_manager.bulk_insert(@cols, @data)
-      	sql = compile(insert_manager.ast)
-      	sql.must_be_like %Q[INSERT INTO "users" ("name", "comments", "created_at") ((SELECT 'nom1', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL) UNION ALL (SELECT 'nom2', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL))]
+        insert_manager.bulk_insert(@cols, @data)
+        sql = compile(insert_manager.ast)
+        sql.must_be_like %Q[INSERT INTO "users" ("name", "comments", "created_at") ((SELECT 'nom1', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL) UNION ALL (SELECT 'nom2', 'sdfdsfdsfsdf', '2016-01-01' FROM DUAL))]
       end
 
-	  end
+    end
   end
 end

data/test/visitors/test_bulk_insert_sqlite.rb

@@ -11,8 +11,8 @@ module ArelExtensions
         Arel::Table.engine = @conn
         @cols = ['id', 'name', 'comments', 'created_at']
         @data = [
-        	[23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
-        	[25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
+          [23, 'nom1', "sdfdsfdsfsdf", '2016-01-01'],
+          [25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
         ]
       end
 
@@ -28,9 +28,9 @@ module ArelExtensions
         insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(@conn).into(@table)
         insert_manager.bulk_insert(@cols, @data)
         sql = compile(insert_manager.ast)
-    	  sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
+        sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") SELECT 23 AS 'id', 'nom1' AS 'name', 'sdfdsfdsfsdf' AS 'comments', '2016-01-01' AS 'created_at' UNION ALL SELECT 25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01']
       end
 
-	  end
+    end
   end
-end
+end