diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:11:46 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:13:55 +0100 |
| commit | 0c527026308627652c42ed8a6f26a21d3bbc7a5b (patch) | |
| tree | 8efafdf41c335dfe39a13dcea712711b71b47a44 /activerecord/test/models/company_in_module.rb | |
| parent | 6764b7ba23ff42998f2b61ecc3435382bdbd1aeb (diff) | |
| download | rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.gz rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.bz2 rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.zip | |
Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb.
Conflicts:
activerecord/CHANGELOG.md
We shouldn't introducing deprecations in point releases.
It will be deprecated in 4.0 instead.
Diffstat (limited to 'activerecord/test/models/company_in_module.rb')
| -rw-r--r-- | activerecord/test/models/company_in_module.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activerecord/test/models/company_in_module.rb b/activerecord/test/models/company_in_module.rb index 1a1cffd1f2..2c8c30efb4 100644 --- a/activerecord/test/models/company_in_module.rb +++ b/activerecord/test/models/company_in_module.rb @@ -11,9 +11,7 @@ module MyApplication has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC" has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id" has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id" - ActiveSupport::Deprecation.silence do - has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}' - end + has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}' has_one :account, :class_name => 'MyApplication::Billing::Account', :dependent => :destroy end |