diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 12:43:11 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-02 12:43:11 -0700 |
| commit | e4d064c62ffd5693b87bcbb97c72c280e4330109 (patch) | |
| tree | eaf4a6080e62dbec12a4cfce0e5b102c74b1ad4f /activerecord/test/models/company.rb | |
| parent | a95cbabc358a6f221b288f93fd8d48d769f6d23b (diff) | |
| parent | 0e3700364c98fe8f766fea8d711795dfe15e7ff0 (diff) | |
| download | rails-e4d064c62ffd5693b87bcbb97c72c280e4330109.tar.gz rails-e4d064c62ffd5693b87bcbb97c72c280e4330109.tar.bz2 rails-e4d064c62ffd5693b87bcbb97c72c280e4330109.zip | |
Merge pull request #11255 from neerajdotname/restrict-be-gone
Dropped deprecated option `:restrict` for `:dependent` in associations
Diffstat (limited to 'activerecord/test/models/company.rb')
| -rw-r--r-- | activerecord/test/models/company.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/test/models/company.rb b/activerecord/test/models/company.rb index bc50578759..c5d4ec0833 100644 --- a/activerecord/test/models/company.rb +++ b/activerecord/test/models/company.rb @@ -95,13 +95,6 @@ class DependentFirm < Company has_one :company, :foreign_key => 'client_of', :dependent => :nullify end -class RestrictedFirm < Company - ActiveSupport::Deprecation.silence do - has_one :account, -> { order("id") }, :foreign_key => "firm_id", :dependent => :restrict - has_many :companies, -> { order("id") }, :foreign_key => 'client_of', :dependent => :restrict - end -end - class RestrictedWithExceptionFirm < Company has_one :account, -> { order("id") }, :foreign_key => "firm_id", :dependent => :restrict_with_exception has_many :companies, -> { order("id") }, :foreign_key => 'client_of', :dependent => :restrict_with_exception |