diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:15:23 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:46:31 +0100 |
commit | 7f3b475608d7c0b7faadd7c1430797e91b644a35 (patch) | |
tree | dc5b9dad935693f059284fcc1f1e39f9928113a6 /activerecord/test/models/project.rb | |
parent | fb08039cb21134ae51739255486c2f08bd0c3028 (diff) | |
download | rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.tar.gz rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.tar.bz2 rails-7f3b475608d7c0b7faadd7c1430797e91b644a35.zip |
Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit 3803fcce26b837c0117f7d278b83c366dc4ed370.
Conflicts:
activerecord/CHANGELOG.md
It will be deprecated only in 4.0, and removed properly in 4.1.
Diffstat (limited to 'activerecord/test/models/project.rb')
-rw-r--r-- | activerecord/test/models/project.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/test/models/project.rb b/activerecord/test/models/project.rb index 6b53ead34d..afe06f4a4c 100644 --- a/activerecord/test/models/project.rb +++ b/activerecord/test/models/project.rb @@ -7,6 +7,15 @@ class Project < ActiveRecord::Base has_and_belongs_to_many :developers_named_david, -> { where("name = 'David'").uniq }, :class_name => "Developer" has_and_belongs_to_many :developers_named_david_with_hash_conditions, -> { where(:name => 'David').uniq }, :class_name => "Developer" has_and_belongs_to_many :salaried_developers, -> { where "salary > 0" }, :class_name => "Developer" + has_and_belongs_to_many :developers_with_finder_sql, :class_name => "Developer", :finder_sql => proc { "SELECT t.*, j.* FROM developers_projects j, developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id" } + has_and_belongs_to_many :developers_with_multiline_finder_sql, :class_name => "Developer", :finder_sql => proc { + "SELECT + t.*, j.* + FROM + developers_projects j, + developers t WHERE t.id = j.developer_id AND j.project_id = #{id} ORDER BY t.id" + } + has_and_belongs_to_many :developers_by_sql, :class_name => "Developer", :delete_sql => proc { |record| "DELETE FROM developers_projects WHERE project_id = #{id} AND developer_id = #{record.id}" } has_and_belongs_to_many :developers_with_callbacks, :class_name => "Developer", :before_add => Proc.new {|o, r| o.developers_log << "before_adding#{r.id || '<new>'}"}, :after_add => Proc.new {|o, r| o.developers_log << "after_adding#{r.id || '<new>'}"}, :before_remove => Proc.new {|o, r| o.developers_log << "before_removing#{r.id}"}, |