aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/schema
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:32:41 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-11-23 15:32:41 -0800
commitada895e8cac855a2f248aafdb92457365f062d07 (patch)
treed3981be951783a72551a440b626ecd70cf7a1bf1 /activerecord/test/schema
parent671538cd6ea0bd4c463e7bf7d238a55924a8af53 (diff)
parentf8d06e62a9084e0c862128bd9fcbb053676a007e (diff)
downloadrails-ada895e8cac855a2f248aafdb92457365f062d07.tar.gz
rails-ada895e8cac855a2f248aafdb92457365f062d07.tar.bz2
rails-ada895e8cac855a2f248aafdb92457365f062d07.zip
Merge branch 'master' into mail
Diffstat (limited to 'activerecord/test/schema')
-rw-r--r--activerecord/test/schema/schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 15e5e12d03..0dd9da4c11 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -160,7 +160,7 @@ ActiveRecord::Schema.define do
t.integer :access_level, :default => 1
end
- create_table :edges, :force => true do |t|
+ create_table :edges, :force => true, :id => false do |t|
t.column :source_id, :integer, :null => false
t.column :sink_id, :integer, :null => false
end