diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-04 15:09:22 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-04 15:09:22 -0800 |
| commit | 3f7e0974648ff1bfe28accf44accacfd633bdd07 (patch) | |
| tree | b00ad9b6186be3a54dc09a248c691ff1f36aefca /activerecord/lib/active_record | |
| parent | c08fccf980745d30c60943f1440a81538a997f53 (diff) | |
| parent | 1d758d9086724faa4f46554135f304fa570c507d (diff) | |
| download | rails-3f7e0974648ff1bfe28accf44accacfd633bdd07.tar.gz rails-3f7e0974648ff1bfe28accf44accacfd633bdd07.tar.bz2 rails-3f7e0974648ff1bfe28accf44accacfd633bdd07.zip | |
Merge remote branch 'rsim/require_deprecation'
* rsim/require_deprecation:
require ActiveSupport deprecatation file before using deprecate method in database_statements
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb index 3f15af561b..01e53b46c8 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/deprecation' + module ActiveRecord module ConnectionAdapters # :nodoc: module DatabaseStatements |