ibm_db 3.0.4 → 5.0.4

data/test/cases/integration_test.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 
 require 'cases/helper'
 require 'models/company'
@@ -82,7 +81,7 @@ class IntegrationTest < ActiveRecord::TestCase
 
   def test_cache_key_format_for_existing_record_with_updated_at
     dev = Developer.first
-    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key
+    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:usec)}", dev.cache_key
   end
 
   def test_cache_key_format_for_existing_record_with_updated_at_and_custom_cache_timestamp_format
@@ -97,7 +96,9 @@ class IntegrationTest < ActiveRecord::TestCase
     owner.update_column :updated_at, Time.current
     key = owner.cache_key
 
-    assert pet.touch
+    travel(1.second) do
+      assert pet.touch
+    end
     assert_not_equal key, owner.reload.cache_key
   end
 
@@ -110,30 +111,45 @@ class IntegrationTest < ActiveRecord::TestCase
   def test_cache_key_for_updated_on
     dev = Developer.first
     dev.updated_at = nil
-    assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:nsec)}", dev.cache_key
+    assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:usec)}", dev.cache_key
   end
 
   def test_cache_key_for_newer_updated_at
     dev = Developer.first
     dev.updated_at += 3600
-    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:nsec)}", dev.cache_key
+    assert_equal "developers/#{dev.id}-#{dev.updated_at.utc.to_s(:usec)}", dev.cache_key
   end
 
   def test_cache_key_for_newer_updated_on
     dev = Developer.first
     dev.updated_on += 3600
-    assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:nsec)}", dev.cache_key
+    assert_equal "developers/#{dev.id}-#{dev.updated_on.utc.to_s(:usec)}", dev.cache_key
   end
 
   def test_cache_key_format_is_precise_enough
+    skip("Subsecond precision is not supported") unless subsecond_precision_supported?
     dev = Developer.first
     key = dev.cache_key
     dev.touch
     assert_not_equal key, dev.cache_key
   end
 
+  def test_cache_key_format_is_not_too_precise
+    skip("Subsecond precision is not supported") unless subsecond_precision_supported?
+    dev = Developer.first
+    dev.touch
+    key = dev.cache_key
+    assert_equal key, dev.reload.cache_key
+  end
+
   def test_named_timestamps_for_cache_key
     owner = owners(:blackbeard)
-    assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:nsec)}", owner.cache_key(:updated_at, :happy_at)
+    assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:usec)}", owner.cache_key(:updated_at, :happy_at)
+  end
+
+  def test_cache_key_when_named_timestamp_is_nil
+    owner = owners(:blackbeard)
+    owner.happy_at = nil
+    assert_equal "owners/#{owner.id}", owner.cache_key(:happy_at)
   end
 end

data/test/cases/invalid_connection_test.rb

@@ -1,7 +1,8 @@
 require "cases/helper"
 
+if current_adapter?(:Mysql2Adapter)
 class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   class Bird < ActiveRecord::Base
   end
@@ -9,7 +10,7 @@ class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
   def setup
     # Can't just use current adapter; sqlite3 will create a database
     # file on the fly.
-    Bird.establish_connection adapter: 'mysql', database: 'i_do_not_exist'
+    Bird.establish_connection adapter: 'mysql2', database: 'i_do_not_exist'
   end
 
   teardown do
@@ -20,3 +21,4 @@ class TestAdapterWithInvalidConnection < ActiveRecord::TestCase
     assert_equal "#{Bird.name} (call '#{Bird.name}.connection' to establish a connection)", Bird.inspect
   end
 end
+end

data/test/cases/invertible_migration_test.rb

@@ -1,8 +1,11 @@
 require "cases/helper"
 
+class Horse < ActiveRecord::Base
+end
+
 module ActiveRecord
   class InvertibleMigrationTest < ActiveRecord::TestCase
-    class SilentMigration < ActiveRecord::Migration
+    class SilentMigration < ActiveRecord::Migration::Current
       def write(text = '')
         # sssshhhhh!!
       end
@@ -76,7 +79,33 @@ module ActiveRecord
       end
     end
 
-    class LegacyMigration < ActiveRecord::Migration
+    class ChangeColumnDefault1 < SilentMigration
+      def change
+        create_table("horses") do |t|
+          t.column :name, :string, default: "Sekitoba"
+        end
+      end
+    end
+
+    class ChangeColumnDefault2 < SilentMigration
+      def change
+        change_column_default :horses, :name, from: "Sekitoba", to: "Diomed"
+      end
+    end
+
+    class DisableExtension1 < SilentMigration
+      def change
+        enable_extension "hstore"
+      end
+    end
+
+    class DisableExtension2 < SilentMigration
+      def change
+        disable_extension "hstore"
+      end
+    end
+
+    class LegacyMigration < ActiveRecord::Migration::Current
       def self.up
         create_table("horses") do |t|
           t.column :content, :text
@@ -122,14 +151,24 @@ module ActiveRecord
       end
     end
 
+    class RevertCustomForeignKeyTable < SilentMigration
+      def change
+        change_table(:horses) do |t|
+          t.references :owner, foreign_key: { to_table: :developers }
+        end
+      end
+    end
+
     setup do
       @verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, false
     end
 
     teardown do
       %w[horses new_horses].each do |table|
-        if ActiveRecord::Base.connection.table_exists?(table)
-          ActiveRecord::Base.connection.drop_table(table)
+        ActiveSupport::Deprecation.silence do
+          if ActiveRecord::Base.connection.table_exists?(table)
+            ActiveRecord::Base.connection.drop_table(table)
+          end
         end
       end
       ActiveRecord::Migration.verbose = @verbose_was
@@ -144,26 +183,30 @@ module ActiveRecord
     end
 
     def test_exception_on_removing_index_without_column_option
-      RemoveIndexMigration1.new.migrate(:up)
-      migration = RemoveIndexMigration2.new
-      migration.migrate(:up)
+      index_definition = ["horses", [:name, :color]]
+      migration1 = RemoveIndexMigration1.new
+      migration1.migrate(:up)
+      assert migration1.connection.index_exists?(*index_definition)
 
-      assert_raises(IrreversibleMigration) do
-        migration.migrate(:down)
-      end
+      migration2 = RemoveIndexMigration2.new
+      migration2.migrate(:up)
+      assert_not migration2.connection.index_exists?(*index_definition)
+
+      migration2.migrate(:down)
+      assert migration2.connection.index_exists?(*index_definition)
     end
 
     def test_migrate_up
       migration = InvertibleMigration.new
       migration.migrate(:up)
-      assert migration.connection.table_exists?("horses"), "horses should exist"
+      ActiveSupport::Deprecation.silence { assert migration.connection.table_exists?("horses"), "horses should exist" }
     end
 
     def test_migrate_down
       migration = InvertibleMigration.new
       migration.migrate :up
       migration.migrate :down
-      assert !migration.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert !migration.connection.table_exists?("horses") }
     end
 
     def test_migrate_revert
@@ -171,11 +214,11 @@ module ActiveRecord
       revert = InvertibleRevertMigration.new
       migration.migrate :up
       revert.migrate :up
-      assert !migration.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert !migration.connection.table_exists?("horses") }
       revert.migrate :down
-      assert migration.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert migration.connection.table_exists?("horses") }
       migration.migrate :down
-      assert !migration.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert !migration.connection.table_exists?("horses") }
     end
 
     def test_migrate_revert_by_part
@@ -183,18 +226,24 @@ module ActiveRecord
       received = []
       migration = InvertibleByPartsMigration.new
       migration.test = ->(dir){
-        assert migration.connection.table_exists?("horses")
-        assert migration.connection.table_exists?("new_horses")
+        ActiveSupport::Deprecation.silence do
+          assert migration.connection.table_exists?("horses")
+          assert migration.connection.table_exists?("new_horses")
+        end
         received << dir
       }
       migration.migrate :up
       assert_equal [:both, :up], received
-      assert !migration.connection.table_exists?("horses")
-      assert migration.connection.table_exists?("new_horses")
+      ActiveSupport::Deprecation.silence do
+        assert !migration.connection.table_exists?("horses")
+        assert migration.connection.table_exists?("new_horses")
+      end
       migration.migrate :down
       assert_equal [:both, :up, :both, :down], received
-      assert migration.connection.table_exists?("horses")
-      assert !migration.connection.table_exists?("new_horses")
+      ActiveSupport::Deprecation.silence do
+        assert migration.connection.table_exists?("horses")
+        assert !migration.connection.table_exists?("new_horses")
+      end
     end
 
     def test_migrate_revert_whole_migration
@@ -203,20 +252,56 @@ module ActiveRecord
         revert = RevertWholeMigration.new(klass)
         migration.migrate :up
         revert.migrate :up
-        assert !migration.connection.table_exists?("horses")
+        ActiveSupport::Deprecation.silence { assert !migration.connection.table_exists?("horses") }
         revert.migrate :down
-        assert migration.connection.table_exists?("horses")
+        ActiveSupport::Deprecation.silence { assert migration.connection.table_exists?("horses") }
         migration.migrate :down
-        assert !migration.connection.table_exists?("horses")
+        ActiveSupport::Deprecation.silence { assert !migration.connection.table_exists?("horses") }
       end
     end
 
     def test_migrate_nested_revert_whole_migration
       revert = NestedRevertWholeMigration.new(InvertibleRevertMigration)
       revert.migrate :down
-      assert revert.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert revert.connection.table_exists?("horses") }
       revert.migrate :up
-      assert !revert.connection.table_exists?("horses")
+      ActiveSupport::Deprecation.silence { assert !revert.connection.table_exists?("horses") }
+    end
+
+    def test_migrate_revert_change_column_default
+      migration1 = ChangeColumnDefault1.new
+      migration1.migrate(:up)
+      assert_equal "Sekitoba", Horse.new.name
+
+      migration2 = ChangeColumnDefault2.new
+      migration2.migrate(:up)
+      Horse.reset_column_information
+      assert_equal "Diomed", Horse.new.name
+
+      migration2.migrate(:down)
+      Horse.reset_column_information
+      assert_equal "Sekitoba", Horse.new.name
+    end
+
+    if current_adapter?(:PostgreSQLAdapter)
+      def test_migrate_enable_and_disable_extension
+        migration1 = InvertibleMigration.new
+        migration2 = DisableExtension1.new
+        migration3 = DisableExtension2.new
+
+        migration1.migrate(:up)
+        migration2.migrate(:up)
+        assert_equal true, Horse.connection.extension_enabled?('hstore')
+
+        migration3.migrate(:up)
+        assert_equal false, Horse.connection.extension_enabled?('hstore')
+
+        migration3.migrate(:down)
+        assert_equal true, Horse.connection.extension_enabled?('hstore')
+
+        migration2.migrate(:down)
+        assert_equal false, Horse.connection.extension_enabled?('hstore')
+      end
     end
 
     def test_revert_order
@@ -245,24 +330,24 @@ module ActiveRecord
 
     def test_legacy_up
       LegacyMigration.migrate :up
-      assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist"
+      ActiveSupport::Deprecation.silence { assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist" }
     end
 
     def test_legacy_down
       LegacyMigration.migrate :up
       LegacyMigration.migrate :down
-      assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist"
+      ActiveSupport::Deprecation.silence { assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist" }
     end
 
     def test_up
       LegacyMigration.up
-      assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist"
+      ActiveSupport::Deprecation.silence { assert ActiveRecord::Base.connection.table_exists?("horses"), "horses should exist" }
     end
 
     def test_down
       LegacyMigration.up
       LegacyMigration.down
-      assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist"
+      ActiveSupport::Deprecation.silence { assert !ActiveRecord::Base.connection.table_exists?("horses"), "horses should not exist" }
     end
 
     def test_migrate_down_with_table_name_prefix
@@ -271,13 +356,20 @@ module ActiveRecord
       migration = InvertibleMigration.new
       migration.migrate(:up)
       assert_nothing_raised { migration.migrate(:down) }
-      assert !ActiveRecord::Base.connection.table_exists?("p_horses_s"), "p_horses_s should not exist"
+      ActiveSupport::Deprecation.silence { assert !ActiveRecord::Base.connection.table_exists?("p_horses_s"), "p_horses_s should not exist" }
     ensure
       ActiveRecord::Base.table_name_prefix = ActiveRecord::Base.table_name_suffix = ''
     end
 
+    def test_migrations_can_handle_foreign_keys_to_specific_tables
+      migration = RevertCustomForeignKeyTable.new
+      InvertibleMigration.migrate(:up)
+      migration.migrate(:up)
+      migration.migrate(:down)
+    end
+
     # MySQL 5.7 and Oracle do not allow to create duplicate indexes on the same columns
-    unless current_adapter?(:MysqlAdapter, :Mysql2Adapter, :OracleAdapter)
+    unless current_adapter?(:Mysql2Adapter, :OracleAdapter)
       def test_migrate_revert_add_index_with_name
         RevertNamedIndexMigration1.new.migrate(:up)
         RevertNamedIndexMigration2.new.migrate(:up)

data/test/cases/json_serialization_test.rb

@@ -7,7 +7,6 @@ require 'models/tag'
 require 'models/comment'
 
 module JsonSerializationHelpers
-
   private
 
   def set_include_root_in_json(value)
@@ -21,7 +20,6 @@ end
 
 class JsonSerializationTest < ActiveRecord::TestCase
   include JsonSerializationHelpers
-  fixtures :authors, :author_addresses
 
   class NamespacedContact < Contact
     column :name, :string
@@ -103,6 +101,17 @@ class JsonSerializationTest < ActiveRecord::TestCase
     assert_match %r{"favorite_quote":"Constraints are liberating"}, methods_json
   end
 
+  def test_uses_serializable_hash_with_frozen_hash
+    def @contact.serializable_hash(options = nil)
+      super({ only: %w(name) }.freeze)
+    end
+
+    json = @contact.to_json
+    assert_match %r{"name":"Konata Izumi"}, json
+    assert_no_match %r{awesome}, json
+    assert_no_match %r{age}, json
+  end
+
   def test_uses_serializable_hash_with_only_option
     def @contact.serializable_hash(options=nil)
       super(only: %w(name))

data/test/cases/locking_test.rb

@@ -29,7 +29,7 @@ end
 class OptimisticLockingTest < ActiveRecord::TestCase
   fixtures :people, :legacy_things, :references, :string_key_objects, :peoples_treasures
 
-  def test_lock_version_is_incremented
+  def test_quote_value_passed_lock_col
     p1 = Person.find(1)
     assert_equal 0, p1.lock_version
 
@@ -169,6 +169,12 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 1, p1.lock_version
   end
 
+  def test_lock_new_when_explicitly_passing_nil
+    p1 = Person.new(:first_name => 'anika', lock_version: nil)
+    p1.save!
+    assert_equal 0, p1.lock_version
+  end
+
   def test_touch_existing_lock
     p1 = Person.find(1)
     assert_equal 0, p1.lock_version
@@ -177,6 +183,16 @@ class OptimisticLockingTest < ActiveRecord::TestCase
     assert_equal 1, p1.lock_version
   end
 
+  def test_touch_stale_object
+    person = Person.create!(first_name: 'Mehmet Emin')
+    stale_person = Person.find(person.id)
+    person.update_attribute(:gender, 'M')
+
+    assert_raises(ActiveRecord::StaleObjectError) do
+      stale_person.touch
+    end
+  end
+
   def test_lock_column_name_existing
     t1 = LegacyThing.find(1)
     t2 = LegacyThing.find(1)
@@ -260,7 +276,7 @@ class OptimisticLockingTest < ActiveRecord::TestCase
       car.wheels << Wheel.create!
     end
     assert_difference 'car.wheels.count', -1  do
-      car.destroy
+      car.reload.destroy
     end
     assert car.destroyed?
   end
@@ -285,10 +301,10 @@ end
 class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase
   fixtures :people, :legacy_things, :references
 
-  # need to disable transactional fixtures, because otherwise the sqlite3
+  # need to disable transactional tests, because otherwise the sqlite3
   # adapter (at least) chokes when we try and change the schema in the middle
   # of a test (see test_increment_counter_*).
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   { :lock_version => Person, :custom_lock_version => LegacyThing }.each do |name, model|
     define_method("test_increment_counter_updates_#{name}") do
@@ -365,7 +381,7 @@ end
 # (See exec vs. async_exec in the PostgreSQL adapter.)
 unless in_memory_db?
   class PessimisticLockingTest < ActiveRecord::TestCase
-    self.use_transactional_fixtures = false
+    self.use_transactional_tests = false
     fixtures :people, :readers
 
     def setup
@@ -431,7 +447,7 @@ unless in_memory_db?
       def test_lock_sending_custom_lock_statement
         Person.transaction do
           person = Person.find(1)
-          assert_sql(/LIMIT 1 FOR SHARE NOWAIT/) do
+          assert_sql(/LIMIT \$?\d FOR SHARE NOWAIT/) do
             person.lock!('FOR SHARE NOWAIT')
           end
         end