diff options
author | Jeremy Walker <jeremy@meducation.net> | 2012-08-09 12:44:59 +0100 |
---|---|---|
committer | Jeremy Walker <jeremy@meducation.net> | 2012-08-09 12:44:59 +0100 |
commit | 2a6039a81027a4f0f3f9fc4d95b6bba7323af28d (patch) | |
tree | daba0fa6fd00d60d1f36380880a05dc1e0ad9ef0 /activerecord/test/schema/schema.rb | |
parent | 2e98e0f38607d34a6cca8f9f7c5a4f318d681408 (diff) | |
download | rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.tar.gz rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.tar.bz2 rails-2a6039a81027a4f0f3f9fc4d95b6bba7323af28d.zip |
Ported PR #4856 to 3-2-stable.
Diffstat (limited to 'activerecord/test/schema/schema.rb')
-rw-r--r-- | activerecord/test/schema/schema.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index d6eed1552f..15be4f0954 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -37,7 +37,8 @@ ActiveRecord::Schema.define do create_table :admin_users, :force => true do |t| t.string :name - t.text :settings + t.text :settings, :null => true + t.text :preferences, :null => false, :default => "" t.references :account end |