ibm_db 3.0.4 → 5.0.4

data/test/cases/transaction_isolation_test.rb

@@ -2,7 +2,7 @@ require 'cases/helper'
 
 unless ActiveRecord::Base.connection.supports_transaction_isolation?
   class TransactionIsolationUnsupportedTest < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     class Tag < ActiveRecord::Base
     end
@@ -17,7 +17,7 @@ end
 
 if ActiveRecord::Base.connection.supports_transaction_isolation?
   class TransactionIsolationTest < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
 
     class Tag < ActiveRecord::Base
       self.table_name = 'tags'

data/test/cases/transactions_test.rb

@@ -9,11 +9,11 @@ require 'models/post'
 require 'models/movie'
 
 class TransactionTest < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
   fixtures :topics, :developers, :authors, :posts, :author_addresses
 
   def setup
-    @first, @second = Topic.find(1, 2).sort_by { |t| t.id }
+    @first, @second = Topic.find(1, 2).sort_by(&:id)
   end
 
   def test_persisted_in_a_model_with_custom_primary_key_after_failed_save
@@ -58,6 +58,11 @@ class TransactionTest < ActiveRecord::TestCase
     end
   end
 
+  def test_add_to_null_transaction
+    topic = Topic.new
+    topic.add_to_transaction
+  end
+
   def test_successful_with_return
     committed = false
 
@@ -188,7 +193,7 @@ class TransactionTest < ActiveRecord::TestCase
     assert posts_count > 0
     status = author.update(name: nil, post_ids: [])
     assert !status
-    assert_equal posts_count, author.posts(true).size
+    assert_equal posts_count, author.posts.reload.size
   end
 
   def test_update_should_rollback_on_failure!
@@ -198,7 +203,17 @@ class TransactionTest < ActiveRecord::TestCase
     assert_raise(ActiveRecord::RecordInvalid) do
       author.update!(name: nil, post_ids: [])
     end
-    assert_equal posts_count, author.posts(true).size
+    assert_equal posts_count, author.posts.reload.size
+  end
+
+  def test_cancellation_from_returning_false_in_before_filter
+    def @first.before_save_for_transaction
+      false
+    end
+
+    assert_deprecated do
+      @first.save
+    end
   end
 
   def test_cancellation_from_before_destroy_rollbacks_in_destroy
@@ -477,13 +492,17 @@ class TransactionTest < ActiveRecord::TestCase
   end
 
   def test_rollback_when_commit_raises
-    Topic.connection.expects(:begin_db_transaction)
-    Topic.connection.expects(:commit_db_transaction).raises('OH NOES')
-    Topic.connection.expects(:rollback_db_transaction)
+    assert_called(Topic.connection, :begin_db_transaction) do
+      Topic.connection.stub(:commit_db_transaction, ->{ raise('OH NOES') }) do
+        assert_called(Topic.connection, :rollback_db_transaction) do
 
-    assert_raise RuntimeError do
-      Topic.transaction do
-        # do nothing
+          e = assert_raise RuntimeError do
+            Topic.transaction do
+              # do nothing
+            end
+          end
+          assert_equal 'OH NOES', e.message
+        end
       end
     end
   end
@@ -491,44 +510,42 @@ class TransactionTest < ActiveRecord::TestCase
   def test_rollback_when_saving_a_frozen_record
     topic = Topic.new(:title => 'test')
     topic.freeze
-    e = assert_raise(RuntimeError) { topic.save }
-    assert_match(/frozen/i, e.message) # Not good enough, but we can't do much
-                                       # about it since there is no specific error
-                                       # for frozen objects.
-    assert !topic.persisted?, 'not persisted'
+    e = assert_raise(frozen_error_class) { topic.save }
+    # Not good enough, but we can't do much
+    # about it since there is no specific error
+    # for frozen objects.
+    assert_match(/frozen/i, e.message)
+    assert !topic.persisted?, "not persisted"
     assert_nil topic.id
     assert topic.frozen?, 'not frozen'
   end
 
-  # The behavior of killed threads having a status of "aborting" was changed
-  # in Ruby 2.0, so Thread#kill on 1.9 will prematurely commit the transaction
-  # and there's nothing we can do about it.
-  if !RUBY_VERSION.start_with?('1.9') && !in_memory_db?
-    def test_rollback_when_thread_killed
-      queue = Queue.new
-      thread = Thread.new do
-        Topic.transaction do
-          @first.approved  = true
-          @second.approved = false
-          @first.save
+  def test_rollback_when_thread_killed
+    return if in_memory_db?
 
-          queue.push nil
-          sleep
+    queue = Queue.new
+    thread = Thread.new do
+      Topic.transaction do
+        @first.approved  = true
+        @second.approved = false
+        @first.save
 
-          @second.save
-        end
+        queue.push nil
+        sleep
+
+        @second.save
       end
+    end
 
-      queue.pop
-      thread.kill
-      thread.join
+    queue.pop
+    thread.kill
+    thread.join
 
-      assert @first.approved?, "First should still be changed in the objects"
-      assert !@second.approved?, "Second should still be changed in the objects"
+    assert @first.approved?, "First should still be changed in the objects"
+    assert !@second.approved?, "Second should still be changed in the objects"
 
-      assert !Topic.find(1).approved?, "First shouldn't have been approved"
-      assert Topic.find(2).approved?, "Second should still be approved"
-    end
+    assert !Topic.find(1).approved?, "First shouldn't have been approved"
+    assert Topic.find(2).approved?, "Second should still be approved"
   end
 
   def test_restore_active_record_state_for_all_records_in_a_transaction
@@ -686,7 +703,8 @@ class TransactionTest < ActiveRecord::TestCase
       end
     end
   ensure
-    connection.drop_table("transaction_without_primary_keys") if connection.table_exists? "transaction_without_primary_keys"
+    connection.drop_table 'transaction_without_primary_keys'
+	#, if_exists: true
   end
 
   private
@@ -696,14 +714,14 @@ class TransactionTest < ActiveRecord::TestCase
       meta = class << topic; self; end
       meta.send("define_method", "before_#{filter}_for_transaction") do
         Book.create
-        false
+        throw(:abort)
       end
     end
   end
 end
 
 class TransactionsWithTransactionalFixturesTest < ActiveRecord::TestCase
-  self.use_transactional_fixtures = true
+  self.use_transactional_tests = true
   fixtures :topics
 
   def test_automatic_savepoint_in_outer_transaction
@@ -760,7 +778,7 @@ if current_adapter?(:PostgreSQLAdapter)
           end
         end
 
-        threads.each { |t| t.join }
+        threads.each(&:join)
       end
     end
 
@@ -808,7 +826,7 @@ if current_adapter?(:PostgreSQLAdapter)
           Developer.connection.close
         end
 
-        threads.each { |t| t.join }
+        threads.each(&:join)
       end
 
       assert_equal original_salary, Developer.find(1).salary

data/test/cases/type/adapter_specific_registry_test.rb

@@ -0,0 +1,133 @@
+require "cases/helper"
+
+module ActiveRecord
+  class AdapterSpecificRegistryTest < ActiveRecord::TestCase
+    test "a class can be registered for a symbol" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, ::String)
+      registry.register(:bar, ::Array)
+
+      assert_equal "", registry.lookup(:foo)
+      assert_equal [], registry.lookup(:bar)
+    end
+
+    test "a block can be registered" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo) do |*args|
+        [*args, "block for foo"]
+      end
+      registry.register(:bar) do |*args|
+        [*args, "block for bar"]
+      end
+
+      assert_equal [:foo, 1, "block for foo"], registry.lookup(:foo, 1)
+      assert_equal [:foo, 2, "block for foo"], registry.lookup(:foo, 2)
+      assert_equal [:bar, 1, 2, 3, "block for bar"], registry.lookup(:bar, 1, 2, 3)
+    end
+
+    test "filtering by adapter" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String, adapter: :sqlite3)
+      registry.register(:foo, Array, adapter: :postgresql)
+
+      assert_equal "", registry.lookup(:foo, adapter: :sqlite3)
+      assert_equal [], registry.lookup(:foo, adapter: :postgresql)
+    end
+
+    test "an error is raised if both a generic and adapter specific type match" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String)
+      registry.register(:foo, Array, adapter: :postgresql)
+
+      assert_raises TypeConflictError do
+        registry.lookup(:foo, adapter: :postgresql)
+      end
+      assert_equal "", registry.lookup(:foo, adapter: :sqlite3)
+    end
+
+    test "a generic type can explicitly override an adapter specific type" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String, override: true)
+      registry.register(:foo, Array, adapter: :postgresql)
+
+      assert_equal "", registry.lookup(:foo, adapter: :postgresql)
+      assert_equal "", registry.lookup(:foo, adapter: :sqlite3)
+    end
+
+    test "a generic type can explicitly allow an adapter type to be used instead" do
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String, override: false)
+      registry.register(:foo, Array, adapter: :postgresql)
+
+      assert_equal [], registry.lookup(:foo, adapter: :postgresql)
+      assert_equal "", registry.lookup(:foo, adapter: :sqlite3)
+    end
+
+    test "a reasonable error is given when no type is found" do
+      registry = Type::AdapterSpecificRegistry.new
+
+      e = assert_raises(ArgumentError) do
+        registry.lookup(:foo)
+      end
+
+      assert_equal "Unknown type :foo", e.message
+    end
+
+    test "construct args are passed to the type" do
+      type = Struct.new(:args)
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, type)
+
+      assert_equal type.new, registry.lookup(:foo)
+      assert_equal type.new(:ordered_arg), registry.lookup(:foo, :ordered_arg)
+      assert_equal type.new(keyword: :arg), registry.lookup(:foo, keyword: :arg)
+      assert_equal type.new(keyword: :arg), registry.lookup(:foo, keyword: :arg, adapter: :postgresql)
+    end
+
+    test "registering a modifier" do
+      decoration = Struct.new(:value)
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String)
+      registry.register(:bar, Hash)
+      registry.add_modifier({ array: true }, decoration)
+
+      assert_equal decoration.new(""), registry.lookup(:foo, array: true)
+      assert_equal decoration.new({}), registry.lookup(:bar, array: true)
+      assert_equal "", registry.lookup(:foo)
+    end
+
+    test "registering multiple modifiers" do
+      decoration = Struct.new(:value)
+      other_decoration = Struct.new(:value)
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, String)
+      registry.add_modifier({ array: true }, decoration)
+      registry.add_modifier({ range: true }, other_decoration)
+
+      assert_equal "", registry.lookup(:foo)
+      assert_equal decoration.new(""), registry.lookup(:foo, array: true)
+      assert_equal other_decoration.new(""), registry.lookup(:foo, range: true)
+      assert_equal(
+        decoration.new(other_decoration.new("")),
+        registry.lookup(:foo, array: true, range: true)
+      )
+    end
+
+    test "registering adapter specific modifiers" do
+      decoration = Struct.new(:value)
+      type = Struct.new(:args)
+      registry = Type::AdapterSpecificRegistry.new
+      registry.register(:foo, type)
+      registry.add_modifier({ array: true }, decoration, adapter: :postgresql)
+
+      assert_equal(
+        decoration.new(type.new(keyword: :arg)),
+        registry.lookup(:foo, array: true, adapter: :postgresql, keyword: :arg)
+      )
+      assert_equal(
+        type.new(array: true),
+        registry.lookup(:foo, array: true, adapter: :sqlite3)
+      )
+    end
+  end
+end

data/test/cases/type/date_time_test.rb

@@ -0,0 +1,14 @@
+require "cases/helper"
+require "models/task"
+
+module ActiveRecord
+  module Type
+    class IntegerTest < ActiveRecord::TestCase
+      def test_datetime_seconds_precision_applied_to_timestamp
+        skip "This test is invalid if subsecond precision isn't supported" unless subsecond_precision_supported?
+        p = Task.create!(starting: ::Time.now)
+        assert_equal p.starting.usec, p.reload.starting.usec
+      end
+    end
+  end
+end

data/test/cases/type/integer_test.rb

@@ -4,110 +4,16 @@ require "models/company"
 module ActiveRecord
   module Type
     class IntegerTest < ActiveRecord::TestCase
-      test "simple values" do
-        type = Type::Integer.new
-        assert_equal 1, type.type_cast_from_user(1)
-        assert_equal 1, type.type_cast_from_user('1')
-        assert_equal 1, type.type_cast_from_user('1ignore')
-        assert_equal 0, type.type_cast_from_user('bad1')
-        assert_equal 0, type.type_cast_from_user('bad')
-        assert_equal 1, type.type_cast_from_user(1.7)
-        assert_equal 0, type.type_cast_from_user(false)
-        assert_equal 1, type.type_cast_from_user(true)
-        assert_nil type.type_cast_from_user(nil)
-      end
-
-      test "random objects cast to nil" do
-        type = Type::Integer.new
-        assert_nil type.type_cast_from_user([1,2])
-        assert_nil type.type_cast_from_user({1 => 2})
-        assert_nil type.type_cast_from_user((1..2))
-      end
-
       test "casting ActiveRecord models" do
         type = Type::Integer.new
         firm = Firm.create(:name => 'Apple')
-        assert_nil type.type_cast_from_user(firm)
-      end
-
-      test "casting objects without to_i" do
-        type = Type::Integer.new
-        assert_nil type.type_cast_from_user(::Object.new)
-      end
-
-      test "casting nan and infinity" do
-        type = Type::Integer.new
-        assert_nil type.type_cast_from_user(::Float::NAN)
-        assert_nil type.type_cast_from_user(1.0/0.0)
-      end
-
-      test "changed?" do
-        type = Type::Integer.new
-
-        assert type.changed?(5, 5, '5wibble')
-        assert_not type.changed?(5, 5, '5')
-        assert_not type.changed?(5, 5, '5.0')
-        assert_not type.changed?(-5, -5, '-5')
-        assert_not type.changed?(-5, -5, '-5.0')
-        assert_not type.changed?(nil, nil, nil)
-      end
-
-      test "values below int min value are out of range" do
-        assert_raises(::RangeError) do
-          Integer.new.type_cast_for_database(-2147483649)
-        end
-      end
-
-      test "values above int max value are out of range" do
-        assert_raises(::RangeError) do
-          Integer.new.type_cast_for_database(2147483648)
-        end
-      end
-
-      test "very small numbers are out of range" do
-        assert_raises(::RangeError) do
-          Integer.new.type_cast_for_database(-9999999999999999999999999999999)
-        end
-      end
-
-      test "very large numbers are out of range" do
-        assert_raises(::RangeError) do
-          Integer.new.type_cast_for_database(9999999999999999999999999999999)
-        end
-      end
-
-      test "normal numbers are in range" do
-        type = Integer.new
-        assert_equal(0, type.type_cast_for_database(0))
-        assert_equal(-1, type.type_cast_for_database(-1))
-        assert_equal(1, type.type_cast_for_database(1))
-      end
-
-      test "int max value is in range" do
-        assert_equal(2147483647, Integer.new.type_cast_for_database(2147483647))
-      end
-
-      test "int min value is in range" do
-        assert_equal(-2147483648, Integer.new.type_cast_for_database(-2147483648))
-      end
-
-      test "columns with a larger limit have larger ranges" do
-        type = Integer.new(limit: 8)
-
-        assert_equal(9223372036854775807, type.type_cast_for_database(9223372036854775807))
-        assert_equal(-9223372036854775808, type.type_cast_for_database(-9223372036854775808))
-        assert_raises(::RangeError) do
-          type.type_cast_for_database(-9999999999999999999999999999999)
-        end
-        assert_raises(::RangeError) do
-          type.type_cast_for_database(9999999999999999999999999999999)
-        end
+        assert_nil type.cast(firm)
       end
 
       test "values which are out of range can be re-assigned" do
         klass = Class.new(ActiveRecord::Base) do
           self.table_name = 'posts'
-          attribute :foo, Type::Integer.new
+          attribute :foo, :integer
         end
         model = klass.new