aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-06-25 19:46:38 -0400
committerGitHub <noreply@github.com>2016-06-25 19:46:38 -0400
commitf4e7167ea613484e5672cf298f2ab775807f5f8f (patch)
tree3d75a4e6b862200e1672ef04dec2ace55ff7c97b
parent8827723d35a0f3a80afc87bee532b992e945ac74 (diff)
parent59c218ea9b41e3ef5cef571f31fb83a7ec72e9a4 (diff)
downloadrails-f4e7167ea613484e5672cf298f2ab775807f5f8f.tar.gz
rails-f4e7167ea613484e5672cf298f2ab775807f5f8f.tar.bz2
rails-f4e7167ea613484e5672cf298f2ab775807f5f8f.zip
Merge pull request #25524 from kamipo/remove_unnecessary_assert_valid_default
Remove unnecessary `assert_valid_default`
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/column.rb7
-rw-r--r--activerecord/test/cases/column_definition_test.rb7
2 files changed, 0 insertions, 14 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/column.rb b/activerecord/lib/active_record/connection_adapters/mysql/column.rb
index 9c45fdd44a..ea554b188c 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/column.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/column.rb
@@ -6,7 +6,6 @@ module ActiveRecord
def initialize(*)
super
- assert_valid_default
extract_default
end
@@ -38,12 +37,6 @@ module ActiveRecord
@default = null || strict ? nil : ''
end
end
-
- def assert_valid_default
- if blob_or_text_column? && default.present?
- raise ArgumentError, "#{type} columns cannot have a default value: #{default.inspect}"
- end
- end
end
end
end
diff --git a/activerecord/test/cases/column_definition_test.rb b/activerecord/test/cases/column_definition_test.rb
index 81162b7e98..78c0853992 100644
--- a/activerecord/test/cases/column_definition_test.rb
+++ b/activerecord/test/cases/column_definition_test.rb
@@ -60,15 +60,8 @@ module ActiveRecord
end
def test_should_not_set_default_for_blob_and_text_data_types
- assert_raise ArgumentError do
- MySQL::Column.new("title", "a", SqlTypeMetadata.new(sql_type: "blob"))
- end
-
text_type = MySQL::TypeMetadata.new(
SqlTypeMetadata.new(type: :text))
- assert_raise ArgumentError do
- MySQL::Column.new("title", "Hello", text_type)
- end
text_column = MySQL::Column.new("title", nil, text_type)
assert_equal nil, text_column.default