arel_extensions 1.6.0 → 2.0.0.rc3

data/test/with_ar/insert_agnostic_test.rb

@@ -1,23 +1,20 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     class InsertManagerTest < Minitest::Test
-      def connect_db
-        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
-        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx') || (RUBY_PLATFORM == 'java')) # not supported
-          @env_db = (RUBY_PLATFORM == 'java' ? 'jdbc-sqlite' : 'sqlite')
-          skip "Platform not supported (DB: #{ENV['DB']}, RUBY_ENGINE: #{RUBY_ENGINE}, RUBY_PLATFORM: #{RUBY_PLATFORM})"
+      def setup_db
+        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
+        if ENV['DB'] == 'oracle' && ((defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx") || (RUBY_PLATFORM == 'java')) # not supported
+          @env_db = (RUBY_PLATFORM == 'java' ? "jdbc-sqlite" : 'sqlite')
+          skip "Platform not supported"
         else
           @env_db = ENV['DB']
         end
         ActiveRecord::Base.establish_connection(@env_db.try(:to_sym) || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ACTIVE_RECORD_VERSION >= V7_0
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
+        ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         if File.exist?("init/#{@env_db}.sql")
@@ -26,17 +23,14 @@ module ArelExtensions
             @cnx.execute(sql) rescue $stderr << "can't create functions\n"
           end
         end
-      end
-
-      def setup_db
-        @cnx.drop_table(:user_tests) rescue nil
+        @cnx.drop_table(:user_tests) rescue nil 
         @cnx.create_table :user_tests do |t|
           t.column :age, :integer
           t.column :name, :string
           t.column :comments, :text
           t.column :created_at, :date
           t.column :updated_at, :datetime
-          t.column :score, :decimal, precision: 20, scale: 10
+          t.column :score, :decimal, :precision => 20, :scale => 10
         end
         if @env_db == 'oracle'
           @cnx.execute(%q[CREATE OR REPLACE trigger user_tests_trg
@@ -55,18 +49,17 @@ END;])
       end
 
       def setup
-        connect_db
         setup_db
         @table = Arel::Table.new(:user_tests)
-        @cols = %w[id name comments created_at]
+        @cols = ['id', 'name', 'comments', 'created_at']
         @data = [
-          [23, 'nom1', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor.', '2016-01-01'],
-          [25, 'nom2', 'sdfdsfdsfsdf', '2016-01-02']
+          [23, 'nom1', "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor.", '2016-01-01'],
+          [25, 'nom2', "sdfdsfdsfsdf", '2016-01-02']
         ]
-        @cols2 = %w[name comments created_at]
+        @cols2 = ['name', 'comments', 'created_at']
         @data2 = [
-          ['nom3', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor.', '2016-01-01'],
-          %w[nom4 sdfdsfdsfsdf 2016-01-04]
+          ['nom3', "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, ultricies sed, dolor.", '2016-01-01'],
+          ['nom4', "sdfdsfdsfsdf", '2016-01-04']
         ]
       end
 
@@ -76,15 +69,16 @@ END;])
 
       # Math Functions
       def test_bulk_insert
-        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new.into(@table) : Arel::InsertManager.new(Arel::Table.engine).into(@table)
+        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(Arel::Table.engine).into(@table)
         insert_manager.bulk_insert(@cols, @data)
         @cnx.execute(insert_manager.to_sql)
-        assert_equal 2, User.count, 'insertions failed'
-        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new.into(@table) : Arel::InsertManager.new(Arel::Table.engine).into(@table)
+        assert_equal 2, User.count, "insertions failed"
+        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(Arel::Table.engine).into(@table)
         insert_manager.bulk_insert(@cols2, @data2)
         @cnx.execute(insert_manager.to_sql)
-        assert_equal 4, User.count, 'insertions failed'
+        assert_equal 4, User.count, "insertions failed"
       end
+
     end
   end
 end

data/test/with_ar/test_bulk_sqlite.rb

@@ -1,20 +1,18 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     describe 'the sqlite visitor' do
+
       before do
-        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
+        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ACTIVE_RECORD_VERSION >= V7_0
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
+        ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -27,23 +25,24 @@ module ArelExtensions
           t.column :price, :decimal
         end
         @table = Arel::Table.new(:users)
-        @cols = %w[id name comments created_at]
+        @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
       after do
         @cnx.drop_table(:users)
       end
 
-      it 'should import large set of data' do
-        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new.into(@table) : Arel::InsertManager.new(ActiveRecord::Base).into(@table)
+      it "should import large set of data" do
+        insert_manager = Arel::VERSION.to_i > 6 ? Arel::InsertManager.new().into(@table) : Arel::InsertManager.new(ActiveRecord::Base).into(@table)
         insert_manager.bulk_insert(@cols, @data)
-        _(insert_manager.to_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 = insert_manager.to_sql
+        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

data/test/with_ar/test_math_sqlite.rb

@@ -1,20 +1,18 @@
-require 'arelx_test_helper'
+require 'helper'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     describe 'the sqlite visitor can do maths' do
+
       before do
-        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
+        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ACTIVE_RECORD_VERSION >= V7_0
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
+        ActiveRecord::Base.default_timezone = :utc
         Arel::Table.engine = ActiveRecord::Base
         @cnx = ActiveRecord::Base.connection
-        @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @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
@@ -28,15 +26,15 @@ module ArelExtensions
         end
         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
-        @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
-        @neg = User.create age: -20, name: 'Negatif', created_at: d, score: 0.17
+        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
+        @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
+        @neg = User.create :age => -20, :name => "Negatif", :created_at => d, :score => 0.17
         @table = Arel::Table.new(:users)
         @age = @table[:age]
       end
@@ -45,20 +43,22 @@ module ArelExtensions
         @cnx.drop_table(:products)
       end
 
-      it 'should do maths' do
-        # ABS
-        assert_equal 20, User.where(id: @neg.id).select(@age.abs.as('res')).first.res
-        assert_equal 14, User.where(id: @laure.id).select((@age - 39).abs.as('res')).first.res
+      it "should do maths" do
+        #ABS
+        assert_equal 20, User.where(:id => @neg.id).select(@age.abs.as("res")).first.res
+        assert_equal 14, User.where(:id => @laure.id).select((@age - 39).abs.as("res")).first.res
 
-        # CEIL # require extensions
+        #CEIL # require extensions
 
         # RAND
-        #        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
+#        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
+
     end
+
   end
-end
+end

data/test/with_ar/test_string_mysql.rb

@@ -1,18 +1,16 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     describe 'the mysql visitor can do string operations' do
+
       before do
-        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
+        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-mysql" : :mysql))
-        if ACTIVE_RECORD_VERSION >= V7_0
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
-        begin
+        ActiveRecord::Base.default_timezone = :utc
+        begin 
           @cnx = ActiveRecord::Base.connection
         rescue => e
           puts "\n#{e.inspect}"
@@ -21,7 +19,7 @@ module ArelExtensions
         end
         Arel::Table.engine = ActiveRecord::Base
         @cnx.drop_table(:users) rescue nil
-        @cnx.drop_table(:products) rescue nil
+        @cnx.drop_table(:products) rescue nil 
         @cnx.create_table :users do |t|
           t.column :age, :integer
           t.column :name, :string
@@ -35,16 +33,16 @@ module ArelExtensions
         end
         class User < ActiveRecord::Base
         end
-        d = Date.new(2016, 5, 23)
-        @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
-        @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
-        @neg = User.create age: -20, name: 'Negatif', created_at: d, score: 0.17
+        d = Date.new(2016, 5,23)
+        @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
+        @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
+        @neg = User.create :age => -20, :name => "Negatif", :created_at => d, :score => 0.17
         @table = Arel::Table.new(:users)
         @name = @table[:name]
       end
@@ -52,24 +50,28 @@ module ArelExtensions
         @cnx.drop_table(:users)
       end
 
-      it 'should do string operations' do
+      it "should do string operations" do
         # concat
         d = Date.new(1997, 6, 15)
-        assert_equal 'SophiePhan', @sophie.select((@name + 'Phan').as('res')).first.res
-        assert_equal 'Sophie2', @sophie.select((@name + 2).as('res')).first.res
-        assert_equal 'Sophie1997-06-15', @sophie.select((@name + d).as('res')).first.res
-        assert_equal 'Sophie15', @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as('res')).first.res
-        assert_equal 'SophieSophie', @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as('res')).first.res
-        assert_equal 'Sophie2016-05-23', @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as('res')).first.res
-        # concat Integer
+        assert_equal "SophiePhan", @sophie.select((@name + "Phan").as("res")).first.res
+        assert_equal "Sophie2", @sophie.select((@name + 2).as("res")).first.res
+        assert_equal "Sophie1997-06-15", @sophie.select((@name + d).as("res")).first.res
+        assert_equal "Sophie15", @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as("res")).first.res
+        assert_equal "SophieSophie", @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as("res")).first.res
+        assert_equal "Sophie2016-05-23", @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as("res")).first.res
+        #concat Integer
         assert_equal 1, User.where((User.arel_table[:age] + 10).eq(33)).count
-        assert_equal 1, User.where((User.arel_table[:age] + '1').eq(6)).count
+        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
+        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
+
+        # 
       end
+
     end
+
   end
-end
+end

data/test/with_ar/test_string_sqlite.rb

@@ -1,20 +1,18 @@
-require 'arelx_test_helper'
+require 'helper'
 require 'date'
 
 module ArelExtensions
-  module WithAr
+  module WthAr
+
     describe 'the sqlite visitor can do string operations' do
+
       before do
-        ActiveRecord::Base.configurations = ConfigLoader.load('test/database.yml')
+        ActiveRecord::Base.configurations = YAML.load_file('test/database.yml')
         ActiveRecord::Base.establish_connection(ENV['DB'] || (RUBY_PLATFORM == 'java' ? :"jdbc-sqlite" : :sqlite))
-        if ACTIVE_RECORD_VERSION >= V7_0
-          ActiveRecord.default_timezone = :utc
-        else
-          ActiveRecord::Base.default_timezone = :utc
-        end
+        ActiveRecord::Base.default_timezone = :utc
         @cnx = ActiveRecord::Base.connection
         Arel::Table.engine = ActiveRecord::Base
-        @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
@@ -28,16 +26,16 @@ module ArelExtensions
         end
         class User < ActiveRecord::Base
         end
-        d = Date.new(2016, 5, 23)
-        @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
-        @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
-        @neg = User.create age: -20, name: 'Negatif', created_at: d, score: 0.17
+        d = Date.new(2016, 5,23)
+        @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
+        @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
+        @neg = User.create :age => -20, :name => "Negatif", :created_at => d, :score => 0.17
         @table = Arel::Table.new(:users)
         @name = @table[:name]
       end
@@ -45,24 +43,30 @@ module ArelExtensions
         @cnx.drop_table(:users)
       end
 
-      it 'should do string operations' do
+      it "should do string operations" do
         # concat
         d = Date.new(1997, 6, 15)
-        assert_equal 'SophiePhan', @sophie.select((@name + 'Phan').as('res')).first.res
-        assert_equal 'Sophie2', @sophie.select((@name + 2).as('res')).first.res
-        assert_equal 'Sophie1997-06-15', @sophie.select((@name + d).as('res')).first.res
-        assert_equal 'Sophie15', @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as('res')).first.res
-        assert_equal 'SophieSophie', @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as('res')).first.res
-        assert_equal 'Sophie2016-05-23', @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as('res')).first.res
-        # concat Integer
+        assert_equal "SophiePhan", @sophie.select((@name + "Phan").as("res")).first.res
+        assert_equal "Sophie2", @sophie.select((@name + 2).as("res")).first.res
+        assert_equal "Sophie1997-06-15", @sophie.select((@name + d).as("res")).first.res
+        assert_equal "Sophie15", @sophie.select((User.arel_table[:name] + User.arel_table[:age]).as("res")).first.res
+        assert_equal "SophieSophie", @sophie.select((User.arel_table[:name] + User.arel_table[:name]).as("res")).first.res
+        assert_equal "Sophie2016-05-23", @sophie.select((User.arel_table[:name] + User.arel_table[:created_at]).as("res")).first.res
+        #concat Integer
         assert_equal 1, User.where((User.arel_table[:age] + 10).eq(33)).count
-        assert_equal 1, User.where((User.arel_table[:age] + '1').eq(6)).count
+        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
+        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
+
+        # 
       end
+
     end
+
   end
-end
+end