diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 10:05:35 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-11-23 10:42:32 -0800 |
| commit | 78790e47b8603917e2f2352f973a2de7769cb74b (patch) | |
| tree | 12e6eb6a7c87c7ee85f9c961eefe8b685b69402c /activerecord/test/schema | |
| parent | d0aa0cfbd76a919e536e76d65419930fb7fe31da (diff) | |
| download | rails-78790e47b8603917e2f2352f973a2de7769cb74b.tar.gz rails-78790e47b8603917e2f2352f973a2de7769cb74b.tar.bz2 rails-78790e47b8603917e2f2352f973a2de7769cb74b.zip | |
Revert "Revert "Assert primary key does not exist in habtm when the association is defined, instead of doing that everytime a record is inserted.""
This reverts commit 2b82708b0efb3a3458e8177beab58f0c585788ae.
[#3128 state:resolved]
Conflicts:
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
Diffstat (limited to 'activerecord/test/schema')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 2 |
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 |