diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-28 00:04:45 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2011-09-28 00:04:45 +0530 |
| commit | 33b55cfbdbbab1de171a44c6845a2c236325e229 (patch) | |
| tree | b0df784ed46c1e5fe642bd5ede938a70ab8513b8 /activerecord/lib | |
| parent | 9a7e2b8d44b80e3380fb5ab042a861e84c8fe35c (diff) | |
| parent | a775853d6aabaadcd343b2f61bcbc7c7e2c59363 (diff) | |
| download | rails-33b55cfbdbbab1de171a44c6845a2c236325e229.tar.gz rails-33b55cfbdbbab1de171a44c6845a2c236325e229.tar.bz2 rails-33b55cfbdbbab1de171a44c6845a2c236325e229.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 9e7d609d19..0952ea2829 100644 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1575,7 +1575,7 @@ module ActiveRecord # has_and_belongs_to_many :categories, :join_table => "prods_cats" # has_and_belongs_to_many :categories, :readonly => true # has_and_belongs_to_many :active_projects, :join_table => 'developers_projects', :delete_sql => - # 'DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}' + # "DELETE FROM developers_projects WHERE active=1 AND developer_id = #{id} AND project_id = #{record.id}" def has_and_belongs_to_many(name, options = {}, &extension) Builder::HasAndBelongsToMany.build(self, name, options, &extension) end |