diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-18 14:49:02 -0800 |
| commit | 248391a7e11e9fa5ffe312cb380034691430acc5 (patch) | |
| tree | 0d151f54139732c417f3d4242e13f1aac64ac858 /activerecord/test/schema/schema.rb | |
| parent | 86abd6887dac9ee233740399f9e5758309af512e (diff) | |
| parent | a9422cc1db9501a80ecf2c25a5d3b0c4f4f32763 (diff) | |
| download | rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.gz rails-248391a7e11e9fa5ffe312cb380034691430acc5.tar.bz2 rails-248391a7e11e9fa5ffe312cb380034691430acc5.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/schema/schema.rb')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index 6217e3bc1c..fbacc692b4 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -195,6 +195,7 @@ ActiveRecord::Schema.define do create_table :members, :force => true do |t| t.string :name + t.integer :member_type_id end create_table :member_details, :force => true do |t| @@ -210,6 +211,10 @@ ActiveRecord::Schema.define do t.string :type end + create_table :member_types, :force => true do |t| + t.string :name + end + create_table :references, :force => true do |t| t.integer :person_id t.integer :job_id |