arel_extensions 0.8.2 → 0.8.3

data/lib/arel_extensions/visitors/postgresql.rb

@@ -2,46 +2,6 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::PostgreSQL.class_eval do
 
-      def visit_ArelExtensions_Nodes_Concat o, collector
-        arg = o.left.relation.engine.columns.find{|c| c.name == o.left.name.to_s}.type
-        collector = visit o.left, collector
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector << '||'
-          collector = visit o.right, collector
-        elsif ( arg == :date || arg == :datetime)
-          collector << " + INTERVAL '#{o.right} day'"
-          collector
-        else
-          collector << " ||'"
-          collector << "#{o.right}'"
-        end
-          collector
-      end
-
-
-    def visit_ArelExtensions_Nodes_Coalesce o, collector
-      collector << "COALESCE("
-      if(o.left.is_a?(Arel::Attributes::Attribute))
-        collector = visit o.left, collector
-      else
-        collector << "#{o.left}"
-      end
-         o.other.each { |a|
-        collector << ","
-        if(a.is_a?(Arel::Attributes::Attribute))
-          collector = visit a, collector
-        else
-          if(a.is_a?(Integer))
-            collector << "#{a}"
-          else
-            collector << "'#{a}'"
-          end
-        end
-      }
-      collector << ")"
-      collector
-    end
-
       def visit_ArelExtensions_Nodes_DateDiff o, collector
 
         collector = visit o.left, collector
@@ -55,89 +15,65 @@ module ArelExtensions
       end
 
 
-    def visit_ArelExtensions_Nodes_Duration o, collector
-      #visit left for period
-      if(o.left == "d")
-        collector << "EXTRACT(DAY FROM"
-      elsif(o.left == "m")
-        collector << "EXTRACT(MONTH FROM "
-      elsif (o.left == "w")
-        collector << "EXTRACT(WEEK FROM"
-      elsif (o.left == "y")
-        collector << "EXTRACT(YEAR FROM"
-      end
-      #visit right
-      if(o.right.is_a?(Arel::Attributes::Attribute))
-        collector = visit o.right, collector
-      else
-        collector << "'#{o.right}'"
+      def visit_ArelExtensions_Nodes_Duration o, collector
+        #visit left for period
+        if o.left == "d"
+          collector << "EXTRACT(DAY FROM"
+        elsif o.left == "m"
+          collector << "EXTRACT(MONTH FROM "
+        elsif (o.left == "w")
+          collector << "EXTRACT(WEEK FROM"
+        elsif (o.left == "y")
+          collector << "EXTRACT(YEAR FROM"
+        end
+        #visit right
+        if(o.right.is_a?(Arel::Attributes::Attribute))
+          collector = visit o.right, collector
+        else
+          collector << o.right
+        end
+        collector << ")"
+        collector
       end
-      collector << ")"
-      collector
-    end
-
-
-    def visit_ArelExtensions_Nodes_Findis o, collector
-
-    end
 
-    def visit_ArelExtensions_Nodes_Floor o, collector
-      collector << "FLOOR("
-     if((o.expr).is_a?(Arel::Attributes::Attribute))
-      collector = visit o.expr, collector
-     end
-      collector << ")"
-      collector
-    end
-
-
-    def visit_ArelExtensions_Nodes_Length o, collector
-      collector << "LENGTH("
-      collector = visit o.expr, collector
-      collector << ")"
-      collector
-    end
-
-
-    def visit_ArelExtensions_Nodes_Locate o, collector
-      collector << "position("
-      if(o.val.is_a?(Arel::Attributes::Attribute))
-        collector = visit o.val, collector
-      else
-        collector << "'#{o.val}'"
+      def visit_ArelExtensions_Nodes_Locate o, collector
+        collector << "position("
+        if(o.val.is_a?(Arel::Attributes::Attribute))
+          collector = visit o.val, collector
+        else
+          collector << "'#{o.val}'"
+        end
+        collector << " IN "
+        collector = visit o.expr, collector
+        collector << ")"
+        collector
       end
-      collector << " IN "
-      collector = visit o.expr, collector
-      collector << ")"
-      collector
-    end
 
-    def visit_ArelExtensions_Nodes_Isnull o, collector
-      collector << "coalesce("
-      collector = visit o.left, collector
-      collector << ","
-      if(o.right.is_a?(Arel::Attributes::Attribute))
-        collector = visit o.right, collector
-      else
-        collector << "'#{o.right}'"
+      def visit_ArelExtensions_Nodes_Isnull o, collector
+        collector << "coalesce("
+        collector = visit o.left, collector
+        collector << ","
+        if(o.right.is_a?(Arel::Attributes::Attribute))
+          collector = visit o.right, collector
+        else
+          collector << "'#{o.right}'"
+        end
+        collector << ")"
+        collector
       end
-      collector << ")"
-      collector
-    end
-
 
-     def visit_ArelExtensions_Nodes_Rand o, collector
-       collector << "random("
-       if(o.left != nil && o.right != nil)
-       collector << "'#{o.left}'"
-       collector << ","
-       collector << "'#{o.right}'"
-       end
-       collector << ")"
-       collector
-     end
+      def visit_ArelExtensions_Nodes_Rand o, collector
+        collector << "random("
+        if(o.left != nil && o.right != nil)
+         collector << "'#{o.left}'"
+         collector << ","
+         collector << "'#{o.right}'"
+        end
+        collector << ")"
+        collector
+      end
 
-     def visit_ArelExtensions_Nodes_Replace o, collector
+      def visit_ArelExtensions_Nodes_Replace o, collector
        collector << "REPLACE("
        collector = visit o.expr,collector
        collector << ","
@@ -154,49 +90,35 @@ module ArelExtensions
        end
        collector << ")"
        collector
-     end
-
-
-    remove_method :visit_Arel_Nodes_Regexp
-    def visit_Arel_Nodes_Regexp o, collector
-      collector = visit o.left, collector
-      collector << " ~ "
-      collector << "'#{o.right}'"
-      collector
-    end
-
-    remove_method :visit_Arel_Nodes_NotRegexp
-    def visit_Arel_Nodes_NotRegexp o, collector
-      collector = visit o.left, collector
-      collector << " !~ "
-      collector << "'#{o.right}'"
-      collector
-    end
-
+      end
 
-    def visit_ArelExtensions_Nodes_Soundex o, collector
-      collector << "soundex("
-     if((o.expr).is_a?(Arel::Attributes::Attribute))
-      collector = visit o.expr, collector
-    else
-        collector << "'#{o.expr}'"
-     end
-      collector << ")"
-      collector
-    end
 
+      remove_method(:visit_Arel_Nodes_Regexp) rescue nil
+      def visit_Arel_Nodes_Regexp o, collector
+        collector = visit o.left, collector
+        collector << " ~ "
+        collector << "'#{o.right}'"
+        collector
+      end
 
-    def visit_ArelExtensions_Nodes_Sum o, collector
-      collector << "sum("
-     if((o.expr).is_a?(Arel::Attributes::Attribute))
-      collector = visit o.expr, collector
-    else
-        collector << "'#{o.expr}'"
-     end
-      collector << ")"
-      collector
-    end
+      remove_method(:visit_Arel_Nodes_NotRegexp) rescue nil
+      def visit_Arel_Nodes_NotRegexp o, collector
+        collector = visit o.left, collector
+        collector << " !~ "
+        collector << o.right
+        collector
+      end
 
+      def visit_ArelExtensions_Nodes_Sum o, collector
+        collector << "sum("
+       if((o.expr).is_a?(Arel::Attributes::Attribute))
+        collector = visit o.expr, collector
+      else
+          collector << "'#{o.expr}'"
+       end
+        collector << ")"
+        collector
+      end
 
       def visit_ArelExtensions_Nodes_Trim o , collector
           collector << 'TRIM(BOTH '

data/lib/arel_extensions/visitors/sqlite.rb

@@ -2,26 +2,6 @@ module ArelExtensions
   module Visitors
     Arel::Visitors::SQLite.class_eval do
 
-
-      def visit_ArelExtensions_Nodes_Coalesce o, collector
-        collector << "COALESCE("
-        if(o.left.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.left, collector
-        else
-          collector << "#{o.left}"
-        end
-           o.other.each { |a|
-          collector << ","
-          if(a.is_a?(Arel::Attributes::Attribute))
-            collector = visit a, collector
-          else
-            collector << "#{a}"
-          end
-        }
-        collector << ")"
-        collector
-      end
-
       # Date operations
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << "date("
@@ -138,70 +118,6 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Round o, collector
-        collector << "ROUND("
-        collector = visit o.left, collector
-        collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
-        collector << ")"
-        collector
-      end
-
-      def visit_ArelExtensions_Nodes_Soundex o, collector
-        collector << "SOUNDEX("
-        if((o.expr).is_a?(Arel::Attributes::Attribute ))
-          collector = visit o.expr, collector
-        else
-          collector << "'#{o.expr}'"
-        end
-        collector << ")"
-        collector
-      end
-
-      def visit_ArelExtensions_Nodes_Trim o , collector
-        collector << "TRIM("
-        collector = visit o.left, collector
-        collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
-        collector << ")"
-        collector
-      end
-
-      def visit_ArelExtensions_Nodes_Ltrim o , collector
-          collector << "LTRIM("
-        collector = visit o.left, collector
-        collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
-        collector << ")"
-        collector
-      end
-
-
-      def visit_ArelExtensions_Nodes_Rtrim o , collector
-        collector << "RTRIM("
-        collector = visit o.left, collector
-        collector << ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
-        collector << ")"
-        collector
-      end
-
       def visit_ArelExtensions_Nodes_Wday o, collector
         collector << "strftime('%w',"
         if((o.date).is_a?(Arel::Attributes::Attribute))

data/lib/arel_extensions/visitors/to_sql.rb

@@ -90,8 +90,59 @@ module ArelExtensions
         collector
       end
 
+      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 = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
+      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 = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
+      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 = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
+
+      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 = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
 
   	  #comparators
+
+      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 = visit arg, collector
+        }
+        collector << ")"
+        collector
+      end
+
   	  def visit_ArelExtensions_Nodes_DateDiff o, collector
   	    collector << "DATEDIFF("
   	    collector = visit o.left, collector

data/test/database.yml

@@ -9,14 +9,18 @@ jdbc-sqlite:
 mysql:
   adapter: mysql2
   database: arext_test
-  username: 
+  username: travis
   encoding: utf8
 jdbc-mysql:
   adapter: jdbcmysql
   database: arext_test
-  username:
+  username: travis
   encoding: utf8
 postgres:
   adapter: postgresql
   database: arext_test
+  username: postgres
+jdbc-postgres:
+  adapter: jdbcpostgresql
+  database: arext_test
   username: postgres

data/test/real_db_test.rb

@@ -1,17 +1,14 @@
-require 'test/unit'
 require 'rubygems'
+require 'minitest/autorun'
 require 'active_record'
 
 $:.unshift "#{File.dirname(__FILE__)}../../lib"
 require 'arel_extensions'
 
-# change here your target
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:") # requires compilation with extensions enabled
-#ActiveRecord::Base.establish_connection(:adapter=> "mysql2",:host=> "localhost",:username=> 'tester', :password => "testp", :database=> "tests")
-#ActiveRecord::Base.establish_connection(:adapter=>'postgresql',:host=> "localhost",:username=> 'tester',:password => "testp", :database=> "tests")
-
-
 def setup_db
+  ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+  ActiveRecord::Base.establish_connection(ENV['DB'].try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
+  ActiveRecord::Base.default_timezone = :utc
   @cnx = ActiveRecord::Base.connection
   if ActiveRecord::Base.connection.adapter_name =~ /sqlite/i
     $sqlite = true
@@ -38,7 +35,7 @@ def setup_db
       t.column :name, :string
       t.column :created_at, :date
       t.column :updated_at, :date
-      t.column :score, :floor
+      t.column :score, :decimal
   end
 end
 
@@ -51,20 +48,20 @@ class User < ActiveRecord::Base
 end
 
 
-class ListTest < Test::Unit::TestCase
+class ListTest < Minitest::Test
 
   def setup
     d = Date.new(2016,05,23)
     setup_db
-    User.create! :age => 5, :name => "Lucas", :created_at => d , :score => 20.16
-    User.create! :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
-    User.create! :age => 20, :name => "Camille", :created_at => d, :score => 20.16
-    User.create! :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
+    User.create :age => 5, :name => "Lucas", :created_at => d , :score => 20.16
+    User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
+    User.create :age => 20, :name => "Camille", :created_at => d, :score => 20.16
+    User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
     u = User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16
     @myung = User.where(:id => u.id)
-    User.create! :age => 25, :name => "Laure", :created_at => d, :score =>20.16
-    User.create! :age =>nil, :name => "Test", :created_at => d, :score => 1.62
-    User.create! :age =>-0, :name => "Negatif", :created_at => d, :score => 0.17
+    User.create :age => 25, :name => "Laure", :created_at => d, :score =>20.16
+    User.create :age =>nil, :name => "Test", :created_at => d, :score => 1.62
+    User.create :age =>-0, :name => "Negatif", :created_at => d, :score => 0.17
   end
 
   def teardown
@@ -89,7 +86,7 @@ class ListTest < Test::Unit::TestCase
         assert_equal "Camille",User.where(User.arel_table[:name].eq("Camille")).select((User.arel_table[:name].coalesce("Null","default")).as("res")).first.res
     else
       assert_equal "Camille",User.where(User.arel_table[:name].eq("Camille")).select((User.arel_table[:name].coalesce("Null",20)).as("res")).first.res
-      assert_equal 20,User.where(User.arel_table[:name].eq("Test")).select((User.arel_table[:age].coalesce("Null",20)).as("res")).first.res
+      assert_equal 20,User.where(User.arel_table[:name].eq("Test")).select((User.arel_table[:age].coalesce(nil,20)).as("res")).first.res
     end
   end
 

data/test/visitors/test_bulk_insert_oracle.rb

@@ -15,7 +15,11 @@ module ArelExtensions
       end
 
       def compile node
-        @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        if Arel::VERSION.to_i > 5
+          @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        else
+          @visitor.accept(node)
+        end
       end
 
       it "should import large set of data in Oracle" do

data/test/visitors/test_bulk_insert_sqlite.rb

@@ -16,7 +16,11 @@ module ArelExtensions
       end
       
       def compile node
-        @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        if Arel::VERSION.to_i > 5
+          @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        else
+          @visitor.accept(node)
+        end
       end
 
       it "should import large set of data" do

data/test/visitors/test_bulk_insert_to_sql.rb

@@ -16,7 +16,11 @@ module ArelExtensions
       end
 
       def compile node
-        @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        if Arel::VERSION.to_i > 5
+          @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        else
+          @visitor.accept(node)
+        end
       end
 
 

data/test/visitors/test_oracle.rb

@@ -13,7 +13,11 @@ module ArelExtensions
       end
 
       def compile node
-        @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        if Arel::VERSION.to_i > 5
+          @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        else
+          @visitor.accept(node)
+        end
       end
 
       # Comparators

data/test/visitors/test_to_sql.rb

@@ -15,7 +15,11 @@ module ArelExtensions
       end
 
       def compile node
-        @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        if Arel::VERSION.to_i > 5
+          @visitor.accept(node, Arel::Collectors::SQLString.new).value
+        else
+          @visitor.accept(node)
+        end
       end
 
       # Math Functions

data/test/with_ar/test_math_sqlite.rb

@@ -27,13 +27,13 @@ module ArelExtensions
         class User < ActiveRecord::Base
         end
         d = Date.new(2016, 5,23)
-        User.create! :age => 5, :name => "Lucas", :created_at => d, :score => 20.16
-        User.create! :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
-        User.create! :age => 20, :name => "Camille", :created_at => d, :score => 20.16
-        User.create! :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
-        User.create! :age => 23, :name => "Myung", :created_at => d, :score => 20.16
+        User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16
+        User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
+        User.create :age => 20, :name => "Camille", :created_at => d, :score => 20.16
+        User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
+        User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16
         @laure = User.create :age => 25, :name => "Laure", :created_at => d, :score =>20.16
-        User.create! :age => nil, :name => "Test", :created_at => d, :score => 1.62
+        User.create :age => nil, :name => "Test", :created_at => d, :score => 1.62
         @neg = User.create :age => -20, :name => "Negatif", :created_at => d, :score => 0.17
         @table = Arel::Table.new(:users)
         @age = @table[:age]
@@ -51,7 +51,10 @@ module ArelExtensions
         #CEIL # require extensions
 
         # RAND
-        assert_equal 5, User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count
+#        puts User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).to_sql if User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count == 0
+#        assert_equal 5, User.where(@table[:score].eq(20.16)).order(Arel.rand).limit(50).count
+        assert 42 != User.select(Arel.rand.as('res')).first.res
+        assert 0 <= User.select(Arel.rand.abs.as('res')).first.res
         assert_equal 8, User.order(Arel.rand).limit(50).count
       end
 

data/test/with_ar/test_string_mysql.rb

@@ -12,13 +12,14 @@ module ArelExtensions
         ActiveRecord::Base.default_timezone = :utc
         begin 
           @cnx = ActiveRecord::Base.connection
-          Arel::Table.engine = ActiveRecord::Base
         rescue => e
-          puts e.inspect
+          puts "\n#{e.inspect}"
           ActiveRecord::Base.establish_connection(ENV['DB'] || :sqlite)
           @cnx = ActiveRecord::Base.connection
         end
-        @cnx.drop_table(:users) rescue nil 
+        Arel::Table.engine = ActiveRecord::Base
+        @cnx.drop_table(:users) rescue nil
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -33,14 +34,14 @@ module ArelExtensions
         class User < ActiveRecord::Base
         end
         d = Date.new(2016, 5,23)
-        @lucas = User.create! :age => 5, :name => "Lucas", :created_at => d, :score => 20.16
+        @lucas = User.create :age => 5, :name => "Lucas", :created_at => d, :score => 20.16
         sophie = User.create :age => 15, :name => "Sophie", :created_at => d, :score => 20.16
         @sophie = User.where(:id => sophie.id)
-        User.create! :age => 20, :name => "Camille", :created_at => d, :score => 20.16
-        User.create! :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
-        User.create! :age => 23, :name => "Myung", :created_at => d, :score => 20.16
+        User.create :age => 20, :name => "Camille", :created_at => d, :score => 20.16
+        User.create :age => 21, :name => "Arthur", :created_at => d, :score => 65.62
+        User.create :age => 23, :name => "Myung", :created_at => d, :score => 20.16
         @laure = User.create :age => 25, :name => "Laure", :created_at => d, :score =>20.16
-        User.create! :age => nil, :name => "Test", :created_at => d, :score => 1.62
+        User.create :age => nil, :name => "Test", :created_at => d, :score => 1.62
         @neg = User.create :age => -20, :name => "Negatif", :created_at => d, :score => 0.17
         @table = Arel::Table.new(:users)
         @name = @table[:name]
@@ -63,8 +64,6 @@ module ArelExtensions
         assert_equal 1, User.where((User.arel_table[:age] + "1").eq(6)).count
         assert_equal 1, User.where((User.arel_table[:age] + User.arel_table[:age]).eq(10)).count
 
-
-
         # Replace
         assert_equal "LucaX", User.where(:id => @lucas).select(@name.replace("s","X").as("res")).first.res
         assert_equal "replace", User.where(:id => @lucas).select(@name.replace(@name,"replace").as("res")).first.res