aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-02-01 17:54:45 +0000
committerPratik Naik <pratiknaik@gmail.com>2009-02-01 17:54:45 +0000
commita390b2629a7de7cb8a8a5370aa493283c4a3f066 (patch)
tree95450d80d313e13c6a235c722761ea70aca54555 /activerecord/test/schema
parenta4ff4fd2c38175b38af928da2b5cae2b6bb19da7 (diff)
parent3be0ad60e4fcdafd4817508a21340dbf1bda6cb4 (diff)
downloadrails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.tar.gz
rails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.tar.bz2
rails-a390b2629a7de7cb8a8a5370aa493283c4a3f066.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index d44faf04cc..74a893983f 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -55,6 +55,11 @@ ActiveRecord::Schema.define do
t.binary :data
end
+ create_table :birds, :force => true do |t|
+ t.string :name
+ t.integer :pirate_id
+ end
+
create_table :books, :force => true do |t|
t.column :name, :string
end
@@ -356,12 +361,18 @@ ActiveRecord::Schema.define do
create_table :ships, :force => true do |t|
t.string :name
+ t.integer :pirate_id
t.datetime :created_at
t.datetime :created_on
t.datetime :updated_at
t.datetime :updated_on
end
+ create_table :ship_parts, :force => true do |t|
+ t.string :name
+ t.integer :ship_id
+ end
+
create_table :sponsors, :force => true do |t|
t.integer :club_id
t.integer :sponsorable_id