diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2013-02-03 15:27:42 +0400 |
|---|---|---|
| committer | Alan Daud <olancheg@gmail.com> | 2013-02-03 15:27:42 +0400 |
| commit | 6a0a5f30324571416174430cf41f3355635c3328 (patch) | |
| tree | 5748a3db0e1f3a53faf2290db883a05db435145a /activerecord/test/schema | |
| parent | bf794bb36f3bd06e2e863cd6c6dfb6ceae116af2 (diff) | |
| download | rails-6a0a5f30324571416174430cf41f3355635c3328.tar.gz rails-6a0a5f30324571416174430cf41f3355635c3328.tar.bz2 rails-6a0a5f30324571416174430cf41f3355635c3328.zip | |
Duplicate column_defaults properly
Backport c517602 to fix #6115
Deleted:
activerecord/lib/active_record/core.rb
Conflicts:
activerecord/test/cases/base_test.rb
Diffstat (limited to 'activerecord/test/schema')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 32982e4f82..1ad4d971f4 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -176,6 +176,7 @@ ActiveRecord::Schema.define do t.integer :client_of t.integer :rating, :default => 1 t.integer :account_id + t.string :description, :null => false, :default => "" end add_index :companies, [:firm_id, :type, :rating, :ruby_type], :name => "company_index" |