ibm_db 3.0.5-x86-mingw32 → 5.0.5-x86-mingw32

data/test/cases/batches_test.rb

@@ -37,9 +37,9 @@ class EachTest < ActiveRecord::TestCase
 
   if Enumerator.method_defined? :size
     def test_each_should_return_a_sized_enumerator
-      assert_equal 11, Post.find_each(:batch_size => 1).size
-      assert_equal 5, Post.find_each(:batch_size => 2, :start => 7).size
-      assert_equal 11, Post.find_each(:batch_size => 10_000).size
+      assert_equal 11, Post.find_each(batch_size: 1).size
+      assert_equal 5, Post.find_each(batch_size:  2, start: 7).size
+      assert_equal 11, Post.find_each(batch_size: 10_000).size
     end
   end
 
@@ -53,7 +53,7 @@ class EachTest < ActiveRecord::TestCase
   end
 
   def test_each_should_raise_if_select_is_set_without_id
-    assert_raise(RuntimeError) do
+    assert_raise(ArgumentError) do
       Post.select(:title).find_each(batch_size: 1) { |post|
         flunk "should not call this block"
       }
@@ -69,13 +69,15 @@ class EachTest < ActiveRecord::TestCase
   end
 
   def test_warn_if_limit_scope_is_set
-    ActiveRecord::Base.logger.expects(:warn)
-    Post.limit(1).find_each { |post| post }
+    assert_called(ActiveRecord::Base.logger, :warn) do
+      Post.limit(1).find_each { |post| post }
+    end
   end
 
   def test_warn_if_order_scope_is_set
-    ActiveRecord::Base.logger.expects(:warn)
-    Post.order("title").find_each { |post| post }
+    assert_called(ActiveRecord::Base.logger, :warn) do
+      Post.order("title").find_each { |post| post }
+    end
   end
 
   def test_logger_not_required
@@ -99,7 +101,16 @@ class EachTest < ActiveRecord::TestCase
 
   def test_find_in_batches_should_start_from_the_start_option
     assert_queries(@total) do
-      Post.find_in_batches(:batch_size => 1, :start => 2) do |batch|
+      Post.find_in_batches(batch_size: 1, start: 2) do |batch|
+        assert_kind_of Array, batch
+        assert_kind_of Post, batch.first
+      end
+    end
+  end
+
+  def test_find_in_batches_should_end_at_the_finish_option
+    assert_queries(6) do
+      Post.find_in_batches(batch_size: 1, finish: 5) do |batch|
         assert_kind_of Array, batch
         assert_kind_of Post, batch.first
       end
@@ -128,14 +139,15 @@ class EachTest < ActiveRecord::TestCase
 
   def test_find_in_batches_should_not_use_records_after_yielding_them_in_case_original_array_is_modified
     not_a_post = "not a post"
-    not_a_post.stubs(:id).raises(StandardError, "not_a_post had #id called on it")
+    def not_a_post.id; end
+    not_a_post.stub(:id, ->{ raise StandardError.new("not_a_post had #id called on it") }) do
+      assert_nothing_raised do
+        Post.find_in_batches(:batch_size => 1) do |batch|
+          assert_kind_of Array, batch
+          assert_kind_of Post, batch.first
 
-    assert_nothing_raised do
-      Post.find_in_batches(:batch_size => 1) do |batch|
-        assert_kind_of Array, batch
-        assert_kind_of Post, batch.first
-
-        batch.map! { not_a_post }
+          batch.map! { not_a_post }
+        end
       end
     end
   end
@@ -149,7 +161,43 @@ class EachTest < ActiveRecord::TestCase
     end
     # posts.first will be ordered using id only. Title order scope should not apply here
     assert_not_equal first_post, posts.first
-    assert_equal posts(:welcome), posts.first
+    assert_equal posts(:welcome).id, posts.first.id
+  end
+
+  def test_find_in_batches_should_error_on_ignore_the_order
+    assert_raise(ArgumentError) do
+      PostWithDefaultScope.find_in_batches(error_on_ignore: true){}
+    end
+  end
+
+  def test_find_in_batches_should_not_error_if_config_overriden
+    # Set the config option which will be overriden
+    prev = ActiveRecord::Base.error_on_ignored_order_or_limit
+    ActiveRecord::Base.error_on_ignored_order_or_limit = true
+    assert_nothing_raised do
+      PostWithDefaultScope.find_in_batches(error_on_ignore: false){}
+    end
+  ensure
+    # Set back to default
+    ActiveRecord::Base.error_on_ignored_order_or_limit = prev
+  end
+
+  def test_find_in_batches_should_error_on_config_specified_to_error
+    # Set the config option
+    prev = ActiveRecord::Base.error_on_ignored_order_or_limit
+    ActiveRecord::Base.error_on_ignored_order_or_limit = true
+    assert_raise(ArgumentError) do
+      PostWithDefaultScope.find_in_batches(){}
+    end
+  ensure
+    # Set back to default
+    ActiveRecord::Base.error_on_ignored_order_or_limit = prev
+  end
+
+  def test_find_in_batches_should_not_error_by_default
+    assert_nothing_raised do
+      PostWithDefaultScope.find_in_batches(){}
+    end
   end
 
   def test_find_in_batches_should_not_ignore_the_default_scope_if_it_is_other_then_order
@@ -172,7 +220,7 @@ class EachTest < ActiveRecord::TestCase
     start_nick = nick_order_subscribers.second.nick
 
     subscribers = []
-    Subscriber.find_in_batches(:batch_size => 1, :start => start_nick) do |batch|
+    Subscriber.find_in_batches(batch_size: 1, start: start_nick) do |batch|
       subscribers.concat(batch)
     end
 
@@ -181,15 +229,16 @@ class EachTest < ActiveRecord::TestCase
 
   def test_find_in_batches_should_use_any_column_as_primary_key_when_start_is_not_specified
     assert_queries(Subscriber.count + 1) do
-      Subscriber.find_each(:batch_size => 1) do |subscriber|
-        assert_kind_of Subscriber, subscriber
+      Subscriber.find_in_batches(batch_size: 1) do |batch|
+        assert_kind_of Array, batch
+        assert_kind_of Subscriber, batch.first
       end
     end
   end
 
   def test_find_in_batches_should_return_an_enumerator
     enum = nil
-    assert_queries(0) do
+    assert_no_queries do
       enum = Post.find_in_batches(:batch_size => 1)
     end
     assert_queries(4) do
@@ -200,11 +249,239 @@ class EachTest < ActiveRecord::TestCase
     end
   end
 
+  def test_in_batches_should_not_execute_any_query
+    assert_no_queries do
+      assert_kind_of ActiveRecord::Batches::BatchEnumerator, Post.in_batches(of: 2)
+    end
+  end
+
+  def test_in_batches_should_yield_relation_if_block_given
+    assert_queries(6) do
+      Post.in_batches(of: 2) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+      end
+    end
+  end
+
+  def test_in_batches_should_be_enumerable_if_no_block_given
+    assert_queries(6) do
+      Post.in_batches(of: 2).each do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+      end
+    end
+  end
+
+  def test_in_batches_each_record_should_yield_record_if_block_is_given
+    assert_queries(6) do
+      Post.in_batches(of: 2).each_record do |post|
+        assert post.title.present?
+        assert_kind_of Post, post
+      end
+    end
+  end
+
+  def test_in_batches_each_record_should_return_enumerator_if_no_block_given
+    assert_queries(6) do
+      Post.in_batches(of: 2).each_record.with_index do |post, i|
+        assert post.title.present?
+        assert_kind_of Post, post
+      end
+    end
+  end
+
+  def test_in_batches_each_record_should_be_ordered_by_id
+    ids = Post.order('id ASC').pluck(:id)
+    assert_queries(6) do
+      Post.in_batches(of: 2).each_record.with_index do |post, i|
+        assert_equal ids[i], post.id
+      end
+    end
+  end
+
+  def test_in_batches_update_all_affect_all_records
+    assert_queries(6 + 6) do # 6 selects, 6 updates
+      Post.in_batches(of: 2).update_all(title: "updated-title")
+    end
+    assert_equal Post.all.pluck(:title), ["updated-title"] * Post.count
+  end
+
+  def test_in_batches_delete_all_should_not_delete_records_in_other_batches
+    not_deleted_count = Post.where('id <= 2').count
+    Post.where('id > 2').in_batches(of: 2).delete_all
+    assert_equal 0, Post.where('id > 2').count
+    assert_equal not_deleted_count, Post.count
+  end
+
+  def test_in_batches_should_not_be_loaded
+    Post.in_batches(of: 1) do |relation|
+      assert_not relation.loaded?
+    end
+
+    Post.in_batches(of: 1, load: false) do |relation|
+      assert_not relation.loaded?
+    end
+  end
+
+  def test_in_batches_should_be_loaded
+    Post.in_batches(of: 1, load: true) do |relation|
+      assert relation.loaded?
+    end
+  end
+
+  def test_in_batches_if_not_loaded_executes_more_queries
+    assert_queries(@total + 1) do
+      Post.in_batches(of: 1, load: false) do |relation|
+        assert_not relation.loaded?
+      end
+    end
+  end
+
+  def test_in_batches_should_return_relations
+    assert_queries(@total + 1) do
+      Post.in_batches(of: 1) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+      end
+    end
+  end
+
+  def test_in_batches_should_start_from_the_start_option
+    post = Post.order('id ASC').where('id >= ?', 2).first
+    assert_queries(2) do
+      relation = Post.in_batches(of: 1, start: 2).first
+      assert_equal post, relation.first
+    end
+  end
+
+  def test_in_batches_should_end_at_the_finish_option
+    post = Post.order('id DESC').where('id <= ?', 5).first
+    assert_queries(7) do
+      relation = Post.in_batches(of: 1, finish: 5, load: true).reverse_each.first
+      assert_equal post, relation.last
+    end
+  end
+
+  def test_in_batches_shouldnt_execute_query_unless_needed
+    assert_queries(2) do
+      Post.in_batches(of: @total) { |relation| assert_kind_of ActiveRecord::Relation, relation }
+    end
+
+    assert_queries(1) do
+      Post.in_batches(of: @total + 1) { |relation| assert_kind_of ActiveRecord::Relation, relation }
+    end
+  end
+
+  def test_in_batches_should_quote_batch_order
+    c = Post.connection
+    assert_sql(/ORDER BY #{c.quote_table_name('posts')}.#{c.quote_column_name('id')}/) do
+      Post.in_batches(of: 1) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+        assert_kind_of Post, relation.first
+      end
+    end
+  end
+
+  def test_in_batches_should_not_use_records_after_yielding_them_in_case_original_array_is_modified
+    not_a_post = "not a post"
+    def not_a_post.id
+      raise StandardError.new("not_a_post had #id called on it")
+    end
+
+    assert_nothing_raised do
+      Post.in_batches(of: 1) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+        assert_kind_of Post, relation.first
+
+        relation = [not_a_post] * relation.count
+      end
+    end
+  end
+
+  def test_in_batches_should_not_ignore_default_scope_without_order_statements
+    special_posts_ids = SpecialPostWithDefaultScope.all.map(&:id).sort
+    posts = []
+    SpecialPostWithDefaultScope.in_batches do |relation|
+      posts.concat(relation)
+    end
+    assert_equal special_posts_ids, posts.map(&:id)
+  end
+
+  def test_in_batches_should_not_modify_passed_options
+    assert_nothing_raised do
+      Post.in_batches({ of: 42, start: 1 }.freeze){}
+    end
+  end
+
+  def test_in_batches_should_use_any_column_as_primary_key
+    nick_order_subscribers = Subscriber.order('nick asc')
+    start_nick = nick_order_subscribers.second.nick
+
+    subscribers = []
+    Subscriber.in_batches(of: 1, start: start_nick) do |relation|
+      subscribers.concat(relation)
+    end
+
+    assert_equal nick_order_subscribers[1..-1].map(&:id), subscribers.map(&:id)
+  end
+
+  def test_in_batches_should_use_any_column_as_primary_key_when_start_is_not_specified
+    assert_queries(Subscriber.count + 1) do
+      Subscriber.in_batches(of: 1, load: true) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+        assert_kind_of Subscriber, relation.first
+      end
+    end
+  end
+
+  def test_in_batches_should_return_an_enumerator
+    enum = nil
+    assert_no_queries do
+      enum = Post.in_batches(of: 1)
+    end
+    assert_queries(4) do
+      enum.first(4) do |relation|
+        assert_kind_of ActiveRecord::Relation, relation
+        assert_kind_of Post, relation.first
+      end
+    end
+  end
+
+  def test_in_batches_relations_should_not_overlap_with_each_other
+    seen_posts = []
+    Post.in_batches(of: 2, load: true) do |relation|
+      relation.to_a.each do |post|
+        assert_not seen_posts.include?(post)
+        seen_posts << post
+      end
+    end
+  end
+
+  def test_in_batches_relations_with_condition_should_not_overlap_with_each_other
+    seen_posts = []
+    author_id = Post.first.author_id
+    posts_by_author = Post.where(author_id: author_id)
+    Post.in_batches(of: 2) do |batch|
+      seen_posts += batch.where(author_id: author_id)
+    end
+
+    assert_equal posts_by_author.pluck(:id).sort, seen_posts.map(&:id).sort
+  end
+
+  def test_in_batches_relations_update_all_should_not_affect_matching_records_in_other_batches
+    Post.update_all(author_id: 0)
+    person = Post.last
+    person.update_attributes(author_id: 1)
+
+    Post.in_batches(of: 2) do |batch|
+      batch.where('author_id >= 1').update_all('author_id = author_id + 1')
+    end
+    assert_equal 2, person.reload.author_id # incremented only once
+  end
+
   if Enumerator.method_defined? :size
     def test_find_in_batches_should_return_a_sized_enumerator
       assert_equal 11, Post.find_in_batches(:batch_size => 1).size
       assert_equal 6, Post.find_in_batches(:batch_size => 2).size
-      assert_equal 4, Post.find_in_batches(:batch_size => 2, :start => 4).size
+      assert_equal 4, Post.find_in_batches(batch_size: 2, start: 4).size
       assert_equal 4, Post.find_in_batches(:batch_size => 3).size
       assert_equal 1, Post.find_in_batches(:batch_size => 10_000).size
     end

data/test/cases/binary_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require "cases/helper"
 
 # Without using prepared statements, it makes no sense to test
@@ -21,10 +20,6 @@ unless current_adapter?(:DB2Adapter)
 
       name = binary.name
 
-      # MySQL adapter doesn't properly encode things, so we have to do it
-      if current_adapter?(:MysqlAdapter, :DB2Adapter)
-        name.force_encoding(Encoding::UTF_8)
-      end
       assert_equal 'いただきます！', name
     end
 
@@ -32,11 +27,8 @@ unless current_adapter?(:DB2Adapter)
       Binary.delete_all
 
       FIXTURES.each do |filename|
-        data = File.read(ASSETS_ROOT + "/#{filename}")				
+        data = File.read(ASSETS_ROOT + "/#{filename}")
         data.force_encoding('ASCII-8BIT')
-		if current_adapter?(:DB2Adapter)
-			data.force_encoding(Encoding::UTF_8)
-		end
         data.freeze
 
         bin = Binary.new(:data => data)
@@ -44,7 +36,7 @@ unless current_adapter?(:DB2Adapter)
 
         bin.save!
         assert_equal data, bin.data, 'Data differs from original after save'
-	
+
         assert_equal data, bin.reload.data, 'Reloaded data differs from original'
       end
     end

data/test/cases/bind_parameter_test.rb

@@ -3,44 +3,49 @@ require 'models/topic'
 require 'models/author'
 require 'models/post'
 
-module ActiveRecord
-  class BindParameterTest < ActiveRecord::TestCase
-    fixtures :topics, :authors, :posts
-
-    class LogListener
-      attr_accessor :calls
-
-      def initialize
-        @calls = []
+if ActiveRecord::Base.connection.supports_statement_cache? &&
+   ActiveRecord::Base.connection.prepared_statements
+  module ActiveRecord
+    class BindParameterTest < ActiveRecord::TestCase
+      fixtures :topics, :authors, :posts
+
+      class LogListener
+        attr_accessor :calls
+
+        def initialize
+          @calls = []
+        end
+
+        def call(*args)
+          calls << args
+        end
       end
 
-      def call(*args)
-        calls << args
+      def setup
+        super
+		puts "BindParameterTest - setup"
+        @connection = ActiveRecord::Base.connection
+        @subscriber = LogListener.new
+        @pk = Topic.columns_hash[Topic.primary_key]
+        @subscription = ActiveSupport::Notifications.subscribe("sql.active_record", @subscriber)
       end
-    end
-
-    def setup
-      super
-      @connection = ActiveRecord::Base.connection
-      @subscriber   = LogListener.new
-      @pk         = Topic.columns_hash[Topic.primary_key]
-      @subscription = ActiveSupport::Notifications.subscribe('sql.active_record', @subscriber)
-    end
 
-    teardown do
-      ActiveSupport::Notifications.unsubscribe(@subscription)
-    end
+      def teardown
+	    puts "BindParameterTest - teardown"
+        ActiveSupport::Notifications.unsubscribe(@subscription)
+      end
 
-    if ActiveRecord::Base.connection.supports_statement_cache?
       def test_bind_from_join_in_subquery
+	    puts "BindParameterTest - test_bind_from_join_in_subquery"
         subquery = Author.joins(:thinking_posts).where(name: 'David')
         scope = Author.from(subquery, 'authors').where(id: 1)
         assert_equal 1, scope.count
       end
 
       def test_binds_are_logged
-        sub   = @connection.substitute_at(@pk)
-        binds = [[@pk, 1]]
+	    puts "BindParameterTest - test_binds_are_logged"
+        sub   = Arel::Nodes::BindParam.new
+        binds = [Relation::QueryAttribute.new("id", 1, Type::Value.new)]
         sql   = "select * from topics where id = #{sub.to_sql}"
 
         @connection.exec_query(sql, 'SQL', binds)
@@ -49,52 +54,57 @@ module ActiveRecord
         assert_equal binds, message[4][:binds]
       end
 
-      def test_binds_are_logged_after_type_cast
-        sub   = @connection.substitute_at(@pk)
-        binds = [[@pk, "3"]]
-        sql   = "select * from topics where id = #{sub.to_sql}"
-
-        @connection.exec_query(sql, 'SQL', binds)
-
-        message = @subscriber.calls.find { |args| args[4][:sql] == sql }
-        assert_equal [[@pk, 3]], message[4][:binds]
-      end
-
       def test_find_one_uses_binds
+	    puts "BindParameterTest - test_find_one_uses_binds"
         Topic.find(1)
-        binds = [[@pk, 1]]
-        message = @subscriber.calls.find { |args| args[4][:binds] == binds }
+        message = @subscriber.calls.find { |args| args[4][:binds].any? { |attr| attr.value == 1 } }
         assert message, 'expected a message with binds'
       end
 
-      def test_logs_bind_vars
-        payload = {
-          :name  => 'SQL',
-          :sql   => 'select * from topics where id = ?',
-          :binds => [[@pk, 10]]
-        }
-        event  = ActiveSupport::Notifications::Event.new(
-          'foo',
-          Time.now,
-          Time.now,
-          123,
-          payload)
-
-        logger = Class.new(ActiveRecord::LogSubscriber) {
-          attr_reader :debugs
-          def initialize
-            super
-            @debugs = []
-          end
-
-          def debug str
-            @debugs << str
-          end
-        }.new
-
-        logger.sql event
-        assert_match([[@pk.name, 10]].inspect, logger.debugs.first)
+      def test_logs_binds_after_type_cast
+	    puts "BindParameterTest - test_logs_binds_after_type_cast"
+        binds = [Relation::QueryAttribute.new("id", "10", Type::Integer.new)]
+        assert_logs_binds(binds)
+      end
+
+      def test_logs_legacy_binds_after_type_cast
+	    puts "BindParameterTest - test_logs_legacy_binds_after_type_cast"
+        binds = [[@pk, "10"]]
+        assert_logs_binds(binds)
       end
+
+      private
+        def assert_logs_binds(binds)
+          payload = {
+            name: "SQL",
+            sql: "select * from topics where id = ?",
+            binds: binds,
+            type_casted_binds: @connection.type_casted_binds(binds)
+          }
+
+          event = ActiveSupport::Notifications::Event.new(
+            "foo",
+            Time.now,
+            Time.now,
+            123,
+            payload)
+
+          logger = Class.new(ActiveRecord::LogSubscriber) {
+            attr_reader :debugs
+
+            def initialize
+              super
+              @debugs = []
+            end
+
+            def debug(str)
+              @debugs << str
+            end
+          }.new
+
+          logger.sql(event)
+          assert_match([[@pk.name, 10]].inspect, logger.debugs.first)
+        end
     end
   end
 end