ibm_db 3.0.4-x86-mingw32 → 3.0.5-x86-mingw32

data/test/cases/validations_repair_helper.rb

@@ -1,23 +1,23 @@
-module ActiveRecord
-  module ValidationsRepairHelper
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def repair_validations(*model_classes)
-        teardown do
-          model_classes.each do |k|
-            k.clear_validators!
-          end
-        end
-      end
-    end
-
-    def repair_validations(*model_classes)
-      yield if block_given?
-    ensure
-      model_classes.each do |k|
-        k.clear_validators!
-      end
-    end
-  end
-end
+module ActiveRecord
+  module ValidationsRepairHelper
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def repair_validations(*model_classes)
+        teardown do
+          model_classes.each do |k|
+            k.clear_validators!
+          end
+        end
+      end
+    end
+
+    def repair_validations(*model_classes)
+      yield if block_given?
+    ensure
+      model_classes.each do |k|
+        k.clear_validators!
+      end
+    end
+  end
+end

data/test/cases/validations_test.rb

@@ -1,165 +1,165 @@
-# encoding: utf-8
-require "cases/helper"
-require 'models/topic'
-require 'models/reply'
-require 'models/person'
-require 'models/developer'
-require 'models/computer'
-require 'models/parrot'
-require 'models/company'
-
-class ValidationsTest < ActiveRecord::TestCase
-  fixtures :topics, :developers
-
-  # Most of the tests mess with the validations of Topic, so lets repair it all the time.
-  # Other classes we mess with will be dealt with in the specific tests
-  repair_validations(Topic)
-
-  def test_valid_uses_create_context_when_new
-    r = WrongReply.new
-    r.title = "Wrong Create"
-    assert_not r.valid?
-    assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
-    assert_equal ["is Wrong Create"], r.errors[:title], "A reply with a bad content should contain an error"
-  end
-
-  def test_valid_uses_update_context_when_persisted
-    r = WrongReply.new
-    r.title = "Bad"
-    r.content = "Good"
-    assert r.save, "First validation should be successful"
-
-    r.title = "Wrong Update"
-    assert_not r.valid?, "Second validation should fail"
-
-    assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
-    assert_equal ["is Wrong Update"], r.errors[:title], "A reply with a bad content should contain an error"
-  end
-
-  def test_valid_using_special_context
-    r = WrongReply.new(:title => "Valid title")
-    assert !r.valid?(:special_case)
-    assert_equal "Invalid", r.errors[:author_name].join
-
-    r.author_name = "secret"
-    r.content = "Good"
-    assert r.valid?(:special_case)
-
-    r.author_name = nil
-    assert_not r.valid?(:special_case)
-    assert_equal "Invalid", r.errors[:author_name].join
-
-    r.author_name = "secret"
-    assert r.valid?(:special_case)
-  end
-
-  def test_validate
-    r = WrongReply.new
-
-    r.validate
-    assert_empty r.errors[:author_name]
-
-    r.validate(:special_case)
-    assert_not_empty r.errors[:author_name]
-
-    r.author_name = "secret"
-
-    r.validate(:special_case)
-    assert_empty r.errors[:author_name]
-  end
-
-  def test_invalid_record_exception
-    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.create! }
-    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.new.save! }
-
-    r = WrongReply.new
-    invalid = assert_raise ActiveRecord::RecordInvalid do
-      r.save!
-    end
-    assert_equal r, invalid.record
-  end
-
-  def test_validate_with_bang
-    assert_raise(ActiveRecord::RecordInvalid) do
-      WrongReply.new.validate!
-    end
-  end
-
-  def test_validate_with_bang_and_context
-    assert_raise(ActiveRecord::RecordInvalid) do
-      WrongReply.new.validate!(:special_case)
-    end
-    r = WrongReply.new(:title => "Valid title", :author_name => "secret", :content => "Good")
-    assert r.validate!(:special_case)
-  end
-
-  def test_exception_on_create_bang_many
-    assert_raise(ActiveRecord::RecordInvalid) do
-      WrongReply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
-    end
-  end
-
-  def test_exception_on_create_bang_with_block
-    assert_raise(ActiveRecord::RecordInvalid) do
-      WrongReply.create!({ "title" => "OK" }) do |r|
-        r.content = nil
-      end
-    end
-  end
-
-  def test_exception_on_create_bang_many_with_block
-    assert_raise(ActiveRecord::RecordInvalid) do
-      WrongReply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
-        r.content = nil
-      end
-    end
-  end
-
-  def test_save_without_validation
-    reply = WrongReply.new
-    assert !reply.save
-    assert reply.save(:validate => false)
-  end
-
-  def test_validates_acceptance_of_with_non_existent_table
-    Object.const_set :IncorporealModel, Class.new(ActiveRecord::Base)
-
-    assert_nothing_raised ActiveRecord::StatementInvalid do
-      IncorporealModel.validates_acceptance_of(:incorporeal_column)
-    end
-  end
-
-  def test_throw_away_typing
-    d = Developer.new("name" => "David", "salary" => "100,000")
-    assert !d.valid?
-    assert_equal 100, d.salary
-    assert_equal "100,000", d.salary_before_type_cast
-  end
-
-  def test_validates_acceptance_of_as_database_column
-    Topic.validates_acceptance_of(:approved)
-    topic = Topic.create("approved" => true)
-    assert topic["approved"]
-  end
-
-  def test_validators
-    assert_equal 1, Parrot.validators.size
-    assert_equal 1, Company.validators.size
-    assert_equal 1, Parrot.validators_on(:name).size
-    assert_equal 1, Company.validators_on(:name).size
-  end
-
-  def test_numericality_validation_with_mutation
-    Topic.class_eval do
-      attribute :wibble, ActiveRecord::Type::String.new
-      validates_numericality_of :wibble, only_integer: true
-    end
-
-    topic = Topic.new(wibble: '123-4567')
-    topic.wibble.gsub!('-', '')
-
-    assert topic.valid?
-  ensure
-    Topic.reset_column_information
-  end
-end
+# encoding: utf-8
+require "cases/helper"
+require 'models/topic'
+require 'models/reply'
+require 'models/person'
+require 'models/developer'
+require 'models/computer'
+require 'models/parrot'
+require 'models/company'
+
+class ValidationsTest < ActiveRecord::TestCase
+  fixtures :topics, :developers
+
+  # Most of the tests mess with the validations of Topic, so lets repair it all the time.
+  # Other classes we mess with will be dealt with in the specific tests
+  repair_validations(Topic)
+
+  def test_valid_uses_create_context_when_new
+    r = WrongReply.new
+    r.title = "Wrong Create"
+    assert_not r.valid?
+    assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
+    assert_equal ["is Wrong Create"], r.errors[:title], "A reply with a bad content should contain an error"
+  end
+
+  def test_valid_uses_update_context_when_persisted
+    r = WrongReply.new
+    r.title = "Bad"
+    r.content = "Good"
+    assert r.save, "First validation should be successful"
+
+    r.title = "Wrong Update"
+    assert_not r.valid?, "Second validation should fail"
+
+    assert r.errors[:title].any?, "A reply with a bad title should mark that attribute as invalid"
+    assert_equal ["is Wrong Update"], r.errors[:title], "A reply with a bad content should contain an error"
+  end
+
+  def test_valid_using_special_context
+    r = WrongReply.new(:title => "Valid title")
+    assert !r.valid?(:special_case)
+    assert_equal "Invalid", r.errors[:author_name].join
+
+    r.author_name = "secret"
+    r.content = "Good"
+    assert r.valid?(:special_case)
+
+    r.author_name = nil
+    assert_not r.valid?(:special_case)
+    assert_equal "Invalid", r.errors[:author_name].join
+
+    r.author_name = "secret"
+    assert r.valid?(:special_case)
+  end
+
+  def test_validate
+    r = WrongReply.new
+
+    r.validate
+    assert_empty r.errors[:author_name]
+
+    r.validate(:special_case)
+    assert_not_empty r.errors[:author_name]
+
+    r.author_name = "secret"
+
+    r.validate(:special_case)
+    assert_empty r.errors[:author_name]
+  end
+
+  def test_invalid_record_exception
+    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.create! }
+    assert_raise(ActiveRecord::RecordInvalid) { WrongReply.new.save! }
+
+    r = WrongReply.new
+    invalid = assert_raise ActiveRecord::RecordInvalid do
+      r.save!
+    end
+    assert_equal r, invalid.record
+  end
+
+  def test_validate_with_bang
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.new.validate!
+    end
+  end
+
+  def test_validate_with_bang_and_context
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.new.validate!(:special_case)
+    end
+    r = WrongReply.new(:title => "Valid title", :author_name => "secret", :content => "Good")
+    assert r.validate!(:special_case)
+  end
+
+  def test_exception_on_create_bang_many
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.create!([ { "title" => "OK" }, { "title" => "Wrong Create" }])
+    end
+  end
+
+  def test_exception_on_create_bang_with_block
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.create!({ "title" => "OK" }) do |r|
+        r.content = nil
+      end
+    end
+  end
+
+  def test_exception_on_create_bang_many_with_block
+    assert_raise(ActiveRecord::RecordInvalid) do
+      WrongReply.create!([{ "title" => "OK" }, { "title" => "Wrong Create" }]) do |r|
+        r.content = nil
+      end
+    end
+  end
+
+  def test_save_without_validation
+    reply = WrongReply.new
+    assert !reply.save
+    assert reply.save(:validate => false)
+  end
+
+  def test_validates_acceptance_of_with_non_existent_table
+    Object.const_set :IncorporealModel, Class.new(ActiveRecord::Base)
+
+    assert_nothing_raised ActiveRecord::StatementInvalid do
+      IncorporealModel.validates_acceptance_of(:incorporeal_column)
+    end
+  end
+
+  def test_throw_away_typing
+    d = Developer.new("name" => "David", "salary" => "100,000")
+    assert !d.valid?
+    assert_equal 100, d.salary
+    assert_equal "100,000", d.salary_before_type_cast
+  end
+
+  def test_validates_acceptance_of_as_database_column
+    Topic.validates_acceptance_of(:approved)
+    topic = Topic.create("approved" => true)
+    assert topic["approved"]
+  end
+
+  def test_validators
+    assert_equal 1, Parrot.validators.size
+    assert_equal 1, Company.validators.size
+    assert_equal 1, Parrot.validators_on(:name).size
+    assert_equal 1, Company.validators_on(:name).size
+  end
+
+  def test_numericality_validation_with_mutation
+    Topic.class_eval do
+      attribute :wibble, ActiveRecord::Type::String.new
+      validates_numericality_of :wibble, only_integer: true
+    end
+
+    topic = Topic.new(wibble: '123-4567')
+    topic.wibble.gsub!('-', '')
+
+    assert topic.valid?
+  ensure
+    Topic.reset_column_information
+  end
+end

data/test/cases/view_test.rb

@@ -1,113 +1,119 @@
-require "cases/helper"
-require "models/book"
-
-module ViewBehavior
-  extend ActiveSupport::Concern
-
-  included do
-    fixtures :books
-  end
-
-  class Ebook < ActiveRecord::Base
-    self.primary_key = "id"
-  end
-
-  def setup
-    super
-    @connection = ActiveRecord::Base.connection
-    create_view "ebooks", <<-SQL
-      SELECT id, name, status FROM books WHERE format = 'ebook'
-    SQL
-  end
-
-  def teardown
-    super
-    drop_view "ebooks"
-  end
-
-  def test_reading
-    books = Ebook.all
-    assert_equal [books(:rfr).id], books.map(&:id)
-    assert_equal ["Ruby for Rails"], books.map(&:name)
-  end
-
-  def test_table_exists
-    view_name = Ebook.table_name
-    assert @connection.table_exists?(view_name), "'#{view_name}' table should exist"
-  end
-
-  def test_column_definitions
-    assert_equal([["id", :integer],
-                  ["name", :string],
-                  ["status", :integer]], Ebook.columns.map { |c| [c.name, c.type] })
-  end
-
-  def test_attributes
-    assert_equal({"id" => 2, "name" => "Ruby for Rails", "status" => 0},
-                 Ebook.first.attributes)
-  end
-
-  def test_does_not_assume_id_column_as_primary_key
-    model = Class.new(ActiveRecord::Base) do
-      self.table_name = "ebooks"
-    end
-    assert_nil model.primary_key
-  end
-end
-
-if ActiveRecord::Base.connection.supports_views?
-class ViewWithPrimaryKeyTest < ActiveRecord::TestCase
-  include ViewBehavior
-
-  private
-  def create_view(name, query)
-    @connection.execute "CREATE VIEW #{name} AS #{query}"
-  end
-
-  def drop_view(name)
-    @connection.execute "DROP VIEW #{name}" if @connection.table_exists? name
-  end
-end
-
-class ViewWithoutPrimaryKeyTest < ActiveRecord::TestCase
-  fixtures :books
-
-  class Paperback < ActiveRecord::Base; end
-
-  setup do
-    @connection = ActiveRecord::Base.connection
-    @connection.execute <<-SQL
-      CREATE VIEW paperbacks
-        AS SELECT name, status FROM books WHERE format = 'paperback'
-    SQL
-  end
-
-  teardown do
-    @connection.execute "DROP VIEW paperbacks" if @connection.table_exists? "paperbacks"
-  end
-
-  def test_reading
-    books = Paperback.all
-    assert_equal ["Agile Web Development with Rails"], books.map(&:name)
-  end
-
-  def test_table_exists
-    view_name = Paperback.table_name
-    assert @connection.table_exists?(view_name), "'#{view_name}' table should exist"
-  end
-
-  def test_column_definitions
-    assert_equal([["name", :string],
-                  ["status", :integer]], Paperback.columns.map { |c| [c.name, c.type] })
-  end
-
-  def test_attributes
-    assert_equal({"name" => "Agile Web Development with Rails", "status" => 0},
-                 Paperback.first.attributes)
-  end
-
-  def test_does_not_have_a_primary_key
-    assert_nil Paperback.primary_key
-  end
-end
-end
+require "cases/helper"
+require "models/book"
+
+module ViewBehavior
+  extend ActiveSupport::Concern
+
+  included do
+    fixtures :books
+  end
+
+  class Ebook < ActiveRecord::Base
+    self.primary_key = "id"
+  end
+
+  def setup
+    super
+    @connection = ActiveRecord::Base.connection
+    create_view "ebooks", <<-SQL
+      SELECT id, name, status FROM books WHERE format = 'ebook'
+    SQL
+  end
+
+  def teardown
+    super
+    drop_view "ebooks"
+  end
+
+  def test_reading
+    books = Ebook.all
+    assert_equal [books(:rfr).id], books.map(&:id)
+    assert_equal ["Ruby for Rails"], books.map(&:name)
+  end
+
+  def test_table_exists
+    view_name = Ebook.table_name
+    # TODO: switch this assertion around once we changed #tables to not return views.
+    assert @connection.table_exists?(view_name), "'#{view_name}' table should exist"
+  end
+
+  def test_views_ara_valid_data_sources
+    view_name = Ebook.table_name
+    assert @connection.data_source_exists?(view_name), "'#{view_name}' should be a data source"
+  end
+
+  def test_column_definitions
+    assert_equal([["id", :integer],
+                  ["name", :string],
+                  ["status", :integer]], Ebook.columns.map { |c| [c.name, c.type] })
+  end
+
+  def test_attributes
+    assert_equal({"id" => 2, "name" => "Ruby for Rails", "status" => 0},
+                 Ebook.first.attributes)
+  end
+
+  def test_does_not_assume_id_column_as_primary_key
+    model = Class.new(ActiveRecord::Base) do
+      self.table_name = "ebooks"
+    end
+    assert_nil model.primary_key
+  end
+end
+
+if ActiveRecord::Base.connection.supports_views?
+class ViewWithPrimaryKeyTest < ActiveRecord::TestCase
+  include ViewBehavior
+
+  private
+  def create_view(name, query)
+    @connection.execute "CREATE VIEW #{name} AS #{query}"
+  end
+
+  def drop_view(name)
+    @connection.execute "DROP VIEW #{name}" if @connection.table_exists? name
+  end
+end
+
+class ViewWithoutPrimaryKeyTest < ActiveRecord::TestCase
+  fixtures :books
+
+  class Paperback < ActiveRecord::Base; end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.execute <<-SQL
+      CREATE VIEW paperbacks
+        AS SELECT name, status FROM books WHERE format = 'paperback'
+    SQL
+  end
+
+  teardown do
+    @connection.execute "DROP VIEW paperbacks" if @connection.table_exists? "paperbacks"
+  end
+
+  def test_reading
+    books = Paperback.all
+    assert_equal ["Agile Web Development with Rails"], books.map(&:name)
+  end
+
+  def test_table_exists
+    view_name = Paperback.table_name
+    assert @connection.table_exists?(view_name), "'#{view_name}' table should exist"
+  end
+
+  def test_column_definitions
+    assert_equal([["name", :string],
+                  ["status", :integer]], Paperback.columns.map { |c| [c.name, c.type] })
+  end
+
+  def test_attributes
+    assert_equal({"name" => "Agile Web Development with Rails", "status" => 0},
+                 Paperback.first.attributes)
+  end
+
+  def test_does_not_have_a_primary_key
+    assert_nil Paperback.primary_key
+  end
+end
+end