From 2a6039a81027a4f0f3f9fc4d95b6bba7323af28d Mon Sep 17 00:00:00 2001
From: Jeremy Walker <jeremy@meducation.net>
Date: Thu, 9 Aug 2012 12:44:59 +0100
Subject: Ported PR #4856 to 3-2-stable.

---
 activerecord/test/schema/schema.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'activerecord/test/schema/schema.rb')

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
 
-- 
cgit v1.2.3