Permalink
Browse files

Fix that validates_acceptance_of still works for non-existent tables …

…(useful for bootstrapping new databases). Closes #10474 [hasmanyjosh]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8377 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 66e97c3 commit d98728e09132cfceea89436eb1a120cbe5a2219d @technoweenie technoweenie committed Dec 12, 2007
Showing with 18 additions and 2 deletions.
  1. +2 −0 activerecord/CHANGELOG
  2. +8 −2 activerecord/lib/active_record/validations.rb
  3. +8 −0 activerecord/test/validations_test.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Fix that validates_acceptance_of still works for non-existent tables (useful for bootstrapping new databases). Closes #10474 [hasmanyjosh]
+
* Ensure that the :uniq option for has_many :through associations retains the order. #10463 [remvee]
* Base.exists? doesn't rescue exceptions to avoid hiding SQL errors. #10458 [Michael Klishin]
@@ -429,7 +429,7 @@ def validates_confirmation_of(*attr_names)
configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
configuration.update(attr_names.extract_options!)
- attr_accessor *(attr_names.map { |n| "#{n}_confirmation" })
+ attr_accessor(*(attr_names.map { |n| "#{n}_confirmation" }))
validates_each(attr_names, configuration) do |record, attr_name, value|
record.errors.add(attr_name, configuration[:message]) unless record.send("#{attr_name}_confirmation").nil? or value == record.send("#{attr_name}_confirmation")
@@ -462,7 +462,13 @@ def validates_acceptance_of(*attr_names)
configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save, :allow_nil => true, :accept => "1" }
configuration.update(attr_names.extract_options!)
- attr_accessor *attr_names.reject { |name| column_names.include? name.to_s }
+ db_cols = begin
+ column_names
+ rescue ActiveRecord::StatementInvalid
+ []
+ end
+ names = attr_names.reject { |name| db_cols.include?(name.to_s) }
+ attr_accessor(*names)
validates_each(attr_names,configuration) do |record, attr_name, value|
record.errors.add(attr_name, configuration[:message]) unless value == configuration[:accept]
@@ -301,6 +301,14 @@ def test_validates_acceptance_of_as_database_column
assert_equal "Dan Brown", reply["author_name"]
end
+ def test_validates_acceptance_of_with_non_existant_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_validate_presences
Topic.validates_presence_of(:title, :content)

0 comments on commit d98728e

Please sign in to comment.