arel_extensions 1.2.3 → 1.2.5

data/lib/arel_extensions/visitors/mysql.rb

@@ -139,16 +139,16 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "GROUP_CONCAT("
         collector = visit o.left, collector
-        if !o.orders.blank?
+        if !o.order.blank?
           collector << ' ORDER BY '
-          o.orders.each_with_index do |order,i|
+          o.order.each_with_index do |order,i|
             collector << Arel::Visitors::ToSql::COMMA unless i == 0
             collector = visit order, collector
           end
         end
-        if o.right && o.right != 'NULL'
+        if o.separator && o.separator != 'NULL'
           collector << ' SEPARATOR '
-          collector = visit o.right, collector
+          collector = visit o.separator, collector
         end
         collector << ")"
         collector
@@ -398,10 +398,34 @@ module ArelExtensions
         collector
       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'))
+            warn("Warning : ArelExtensions: Window Functions are not available in the current version on the DBMS.")
+            return collector
+        end
+
+        if o.order || o.group
+          collector << " OVER ("
+          if o.group
+            collector << " PARTITION BY ("
+            visit o.group, collector
+            collector << ")"
+          end
+          if o.order
+            collector << " ORDER BY ("
+            visit o.order, collector
+            collector << ")"
+          end
+          collector << ")"
+        end
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Std o, collector
         collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
         visit o.left, collector
         collector << ")"
+        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 

data/lib/arel_extensions/visitors/oracle.rb

@@ -131,14 +131,14 @@ module ArelExtensions
         collector << "(LISTAGG("
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
-        if o.right  && o.right != 'NULL'
-          collector = visit o.right, collector
+        if o.separator  && o.separator != 'NULL'
+          collector = visit o.separator, collector
         else
           collector = visit Arel::Nodes.build_quoted(','), collector
         end
         collector << ") WITHIN GROUP (ORDER BY "
-        if !o.orders.blank?
-          o.orders.each_with_index do |order,i|
+        if !o.order.blank?
+          o.order.each_with_index do |order,i|
             collector << Arel::Visitors::Oracle::COMMA unless i == 0
             collector = visit order, collector
           end

data/lib/arel_extensions/visitors/postgresql.rb

@@ -83,20 +83,45 @@ module ArelExtensions
         collector
       end
 
+      def visit_Aggregate_For_AggregateFunction o, collector
+        if !o.order.blank? || !o.group.blank?
+          collector << " OVER ("
+          if !o.group.blank?
+            collector << " PARTITION BY "
+            o.group.each_with_index do |group, i|
+              collector << Arel::Visitors::PostgreSQL::COMMA unless 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
+              visit order, collector
+            end
+          end
+          collector << ")"
+        end
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_GroupConcat o, collector
         collector << "array_to_string(array_agg("
         collector = visit o.left, collector
-        if !o.orders.blank?
-          collector << ' ORDER BY '
-          o.orders.each_with_index do |order,i|
+        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 = visit order, collector
+            collector << " "
+            visit order, collector
           end
         end
         collector << ")"
+        o.order = nil
+        visit_Aggregate_For_AggregateFunction o, collector
         collector << Arel::Visitors::PostgreSQL::COMMA
-        if o.right  && o.right != 'NULL'
-          collector = visit o.right, collector
+        if o.separator  && o.separator != 'NULL'
+          collector = visit o.separator, collector
         else
           collector = visit Arel::Nodes.build_quoted(','), collector
         end
@@ -293,6 +318,7 @@ module ArelExtensions
         collector << "sum("
         collector = visit o.expr, collector
         collector << ")"
+        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 
@@ -420,6 +446,7 @@ module ArelExtensions
         collector << (o.unbiased_estimator ? "STDDEV_SAMP(" : "STDDEV_POP(")
         visit o.left, collector
         collector << ")"
+        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 
@@ -427,6 +454,7 @@ module ArelExtensions
         collector << (o.unbiased_estimator ? "VAR_SAMP(" : "VAR_POP(")
         visit o.left, collector
         collector << ")"
+        visit_Aggregate_For_AggregateFunction o, collector
         collector
       end
 

data/lib/arel_extensions/visitors/to_sql.rb

@@ -52,14 +52,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 +70,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 +91,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
@@ -134,7 +141,7 @@ module ArelExtensions
         collector << ")"
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_Repeat o, collector
         collector << "REPEAT("
         o.expressions.each_with_index { |arg, i|
@@ -269,12 +276,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 +312,7 @@ module ArelExtensions
         collector << ")"
         collector
       end
-  
+
       def visit_ArelExtensions_Nodes_DateSub o, collector
         collector << "DATE_SUB("
         collector = visit o.left, collector
@@ -384,7 +391,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
@@ -452,7 +459,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 +496,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 << ")"
@@ -525,40 +532,40 @@ module ArelExtensions
 
       alias_method :old_visit_Arel_Nodes_And, :visit_Arel_Nodes_And
       def visit_Arel_Nodes_And o, collector
+        collector << '('
         case o.children.length
         when 0
           collector << '1=1' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
-          collector << '('
           o.children.each_with_index { |arg, i|
             if i != 0
               collector << ') AND ('
             end
             collector = visit arg, collector
           }
-          collector << ')'
         end
+        collector << ')'
         collector
       end
 
       def visit_ArelExtensions_Nodes_Or o, collector
+        collector << '('
         case o.children.length
         when 0
           collector << '0=1' # but this should not happen
         when 1
           collector = visit o.children[0], collector
         else
-            collector << '('
             o.children.each_with_index { |arg, i|
               if i != 0
                 collector << ') OR ('
               end
               collector = visit arg, collector
             }
-            collector << ')'
         end
+        collector << ')'
         collector
       end
 

data/test/helper.rb

@@ -15,4 +15,4 @@ class Object
   def must_be_like other
     gsub(/\s+/, ' ').strip.must_equal other.gsub(/\s+/, ' ').strip
   end
-end
+end

data/test/real_db_test.rb

@@ -29,7 +29,7 @@ def setup_db
       func.result = value1.index(value2)
     end
   end
-  @cnx.drop_table(:users) rescue nil 
+  @cnx.drop_table(:users) rescue nil
   @cnx.create_table :users do |t|
       t.column :age, :integer
       t.column :name, :string

data/test/test_comparators.rb

@@ -22,7 +22,7 @@ module ArelExtensions
       it "< is equal lt" do
         compile(@table[:id] < 10).must_be_like('"users"."id" < 10')
       end
-      
+
       it "<= is equal lteq" do
         compile(@table[:id] <= 10).must_be_like('"users"."id" <= 10')
       end

data/test/visitors/test_bulk_insert_sqlite.rb

@@ -15,7 +15,7 @@ module ArelExtensions
         	[25, 'nom2', "sdfdsfdsfsdf", '2016-01-01']
         ]
       end
-      
+
       def compile node
         if Arel::VERSION.to_i > 5
           @visitor.accept(node, Arel::Collectors::SQLString.new).value

data/test/visitors/test_bulk_insert_to_sql.rb

@@ -10,8 +10,8 @@ module ArelExtensions
         @table = Arel::Table.new(:users)
         @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
 
@@ -26,12 +26,10 @@ module ArelExtensions
 
       it "should import large set of data using ToSql" 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" ("id", "name", "comments", "created_at") VALUES (23, 'nom1', 'sdfdsfdsfsdf', '2016-01-01'), (25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01')]
+        insert_manager.bulk_insert(@cols, @data)
+        sql = compile(insert_manager.ast)
+        sql.must_be_like %Q[INSERT INTO "users" ("id", "name", "comments", "created_at") VALUES (23, 'nom1', 'sdfdsfdsfsdf', '2016-01-01'), (25, 'nom2', 'sdfdsfdsfsdf', '2016-01-01')]
       end
-
-
-	end
+    end
   end
-end
+end

data/test/visitors/test_oracle.rb

@@ -50,6 +50,7 @@ module ArelExtensions
         compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
         compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
         compile(c =~ /\Atest\Z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
+        compile(c =~ /\Atest\z/).must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
         compile(c =~ '^test$').must_be_like %{REGEXP_LIKE("users"."name", '^test$')}
         compile(c !~ /\Ate\Dst\Z/).must_be_like %{NOT REGEXP_LIKE("users"."name", '^te[^0-9]st$')}
         compile(c.imatches('%test%')).must_be_like %{LOWER("users"."name") LIKE LOWER('%test%')}

data/test/visitors/test_to_sql.rb

@@ -88,6 +88,7 @@ module ArelExtensions
         compile((c >= 'test').as('new_name')).must_be_like %{("users"."name" >= 'test') AS new_name}
         compile(c <= @table[:comments]).must_be_like %{"users"."name" <= "users"."comments"}
         compile(c =~ /\Atest\Z/).must_be_like %{"users"."name" REGEXP '^test$'}
+        compile(c =~ /\Atest\z/).must_be_like %{"users"."name" REGEXP '^test$'}
         compile(c !~ /\Ate\Dst\Z/).must_be_like %{"users"."name" NOT REGEXP '^te[^0-9]st$'}
         compile(c.imatches('%test%')).must_be_like %{"users"."name" ILIKE '%test%'}
         compile(c.imatches_any(['%test%', 't2'])).must_be_like %{(("users"."name" ILIKE '%test%') OR ("users"."name" ILIKE 't2'))}
@@ -120,6 +121,11 @@ module ArelExtensions
         compile(@table[:id] < 42).must_match %{"users"."id" < 42}
         compile(@table[:id] <= 42).must_match %{"users"."id" <= 42}
         compile((@table[:id] <= 42).as('new_name')).must_match %{("users"."id" <= 42) AS new_name}
+        puts @table[:id].count.class
+        compile(@table[:id].count.eq 42).must_match %{COUNT("users"."id") = 42}
+        #compile(@table[:id].count == 42).must_match %{COUNT("users"."id") = 42} # TODO
+        #compile(@table[:id].count != 42).must_match %{COUNT("users"."id") != 42}
+        #compile(@table[:id].count >= 42).must_match %{COUNT("users"."id") >= 42}
       end
 
       it "should accept comparators on dates" do

data/test/with_ar/all_agnostic_test.rb

@@ -154,7 +154,7 @@ module ArelExtensions
         else
           assert_equal 68, User.select((@age.sum + 1).as("res")).take(50).first.res
           assert_equal 134, User.select((@age.sum + @age.sum).as("res")).take(50).first.res
-          assert_equal 201, User.select(((@age * 3).sum).as("res")).take(50).first.res
+          assert_equal 201, User.select((@age * 3).sum.as("res")).take(50).first.res
           assert_equal 4009, User.select(((@age * @age).sum).as("res")).take(50).first.res
         end
       end
@@ -175,6 +175,7 @@ module ArelExtensions
         assert_equal "Sophie,Lucas,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',@name.desc))
         assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',[@score.asc,@name.asc]))
         assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',@score.asc,@name.asc))
+        assert_equal "Lucas,Sophie,Arthur", t(User.where(:name => ['Lucas', 'Sophie','Arthur']), @name.group_concat(',',order: [@score.asc,@name.asc]))
       end
 
       def test_length
@@ -733,9 +734,14 @@ module ArelExtensions
 
         assert ( 15.98625 - t(User.where(nil), @score.average)).abs < 0.01
         assert (613.75488 - t(User.where(nil), @score.variance)).abs < 0.01
-        assert ( 537.0355 - t(User.where(nil), @score.variance(false))).abs < 0.01
+        assert ( 537.0355 - t(User.where(nil), @score.variance(unbiased: false))).abs < 0.01
         assert ( 24.77408 - t(User.where(nil), @score.std)).abs < 0.01
-        assert ( 23.17403 - t(User.where(nil), @score.std(false))).abs < 0.01
+        assert ( 23.17403 - t(User.where(nil), @score.std(unbiased: false))).abs < 0.01
+        skip "Not Yet Implemented" if !['postgresql'].include?(@env_db)
+        assert_equal 2, User.select(@score.std(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
+        assert_equal 2, User.select(@score.variance(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
+        assert_equal 2, User.select(@score.sum(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
+        assert_equal 2, User.select(@comments.group_concat(group: Arel.when(@name > "M").then(0).else(1)).as('res')).map(&:res).uniq.length
       end
 
       def test_levenshtein_distance
@@ -791,6 +797,11 @@ module ArelExtensions
         assert_equal 'ArthurArthur', @arthur.select((@name+@name).as('Na-Me')).first.attributes["Na-Me"]
       end
 
+      def test_exists_in_subquery
+        assert User.where(User.where(nil).exists).first
+      end
+
+
     end
   end
 end