diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-20 11:44:31 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-20 11:44:31 +0000 |
| commit | cd6beacfb3f503fe28410a67f155bb4509e76819 (patch) | |
| tree | 4a7e4209891581460ba91c021e40292885925088 /activerecord | |
| parent | 6e1012fc9c7a8cf5bb510f213462a9e2cff2e085 (diff) | |
| download | rails-cd6beacfb3f503fe28410a67f155bb4509e76819.tar.gz rails-cd6beacfb3f503fe28410a67f155bb4509e76819.tar.bz2 rails-cd6beacfb3f503fe28410a67f155bb4509e76819.zip | |
Test for forged '' default before it's typecast. Closes #6156.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 5 | ||||
| -rw-r--r-- | activerecord/test/defaults_test.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 12aff760eb..376581db2e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -6,7 +6,7 @@ * Run validations in the order they were declared. #6657 [obrie] -* MySQL: detect when a NOT NULL column without a default value is misreported as default ''. Can't detect for string, text, and binary columns since '' is a legitimate default. #6156 [simon@redhillconsulting.com.au, obrie, Jeremy Kemper] +* MySQL: detect when a NOT NULL column without a default value is misreported as default ''. Can't detect for string, text, and binary columns since '' is a legitimate default. #6156 [simon@redhillconsulting.com.au, obrie, Jonathan Viney, Jeremy Kemper] * Simplify association proxy implementation by factoring construct_scope out of method_missing. #6643 [martin] diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index 574196e351..d7668140fd 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -88,8 +88,9 @@ module ActiveRecord TYPES_ALLOWING_EMPTY_STRING_DEFAULT = Set.new([:binary, :string, :text]) def initialize(name, default, sql_type = nil, null = true) + @original_default = default super - self.default = nil if missing_default_forged_as_empty_string? + @default = nil if missing_default_forged_as_empty_string? end private @@ -107,7 +108,7 @@ module ActiveRecord # Test whether the column has default '', is not null, and is not # a type allowing default ''. def missing_default_forged_as_empty_string? - !null && default == '' && !TYPES_ALLOWING_EMPTY_STRING_DEFAULT.include?(type) + !null && @original_default == '' && !TYPES_ALLOWING_EMPTY_STRING_DEFAULT.include?(type) end end diff --git a/activerecord/test/defaults_test.rb b/activerecord/test/defaults_test.rb index f15f422dc7..4a910de523 100644 --- a/activerecord/test/defaults_test.rb +++ b/activerecord/test/defaults_test.rb @@ -6,7 +6,7 @@ class DefaultTest < Test::Unit::TestCase def test_nil_defaults_for_not_null_columns column_defaults = if current_adapter?(:MysqlAdapter) - { 'id' => nil, 'name' => '', 'course_id' => 0 } + { 'id' => nil, 'name' => '', 'course_id' => nil } else { 'id' => nil, 'name' => nil, 'course_id' => nil } end |