diff options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/errors.rb | 6 | ||||
| -rw-r--r-- | activerecord/lib/active_record/fixtures.rb | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb index 980fe66857..52c70977ef 100644 --- a/activerecord/lib/active_record/errors.rb +++ b/activerecord/lib/active_record/errors.rb @@ -85,13 +85,11 @@ module ActiveRecord # Raised when number of bind variables in statement given to +:condition+ key # (for example, when using +find+ method) does not match number of expected - # variables. + # values supplied. # - # For example, in + # For example, when there are two placeholders with only one value supplied: # # Location.where("lat = ? AND lng = ?", 53.7362) - # - # Two placeholders are given with only one variable to fill them both. class PreparedStatementInvalid < ActiveRecordError end diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index 0d12dd5ddf..4cd5f92207 100644 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -569,7 +569,13 @@ module ActiveRecord @path = path @config = config @model_class = nil - @model_class = class_name + + if class_name.is_a?(Class) # TODO: Should be an AR::Base type class, or any? + @model_class = class_name + else + @model_class = class_name.safe_constantize if class_name + end + @connection = connection @table_name = ( model_class.respond_to?(:table_name) ? |