aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-07-19 13:21:17 -0700
committerYehuda Katz <wycats@gmail.com>2009-07-19 13:21:17 -0700
commit37658f15bb88e054635a496327a4a82bb50fd5d5 (patch)
tree78f3d350394910270d1eca3537857111e8f14fe8 /activerecord/test/schema
parentf2f5cdc8bcd9df3a297ea02b80dbdb21790de732 (diff)
parent17d5cc12b9f8d0d78a081d231e7e0c5ec9df1104 (diff)
downloadrails-37658f15bb88e054635a496327a4a82bb50fd5d5.tar.gz
rails-37658f15bb88e054635a496327a4a82bb50fd5d5.tar.bz2
rails-37658f15bb88e054635a496327a4a82bb50fd5d5.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index d2d6d1f4b3..2b7d3856b7 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -161,6 +161,12 @@ ActiveRecord::Schema.define do
t.integer :course_id, :null => false
end
+ create_table :essays, :force => true do |t|
+ t.string :name
+ t.string :writer_id
+ t.string :writer_type
+ end
+
create_table :events, :force => true do |t|
t.string :title, :limit => 5
end
@@ -421,6 +427,7 @@ ActiveRecord::Schema.define do
t.boolean :approved, :default => true
t.integer :replies_count, :default => 0
t.integer :parent_id
+ t.string :parent_title
t.string :type
end