aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-03-03 19:52:08 +0100
committerYves Senn <yves.senn@gmail.com>2015-03-03 19:52:08 +0100
commitb0edabf3be07f841781bc0b1743c401e666d2952 (patch)
treec0c7cea01d07491669271c254e235d52eca82c92 /activerecord/lib
parent35db2bcd82ff3b5c51b4a160cd18f27e02afec05 (diff)
parente3a1bd3560128f7594f2131d53a6b8f216220873 (diff)
downloadrails-b0edabf3be07f841781bc0b1743c401e666d2952.tar.gz
rails-b0edabf3be07f841781bc0b1743c401e666d2952.tar.bz2
rails-b0edabf3be07f841781bc0b1743c401e666d2952.zip
Merge pull request #19176 from imajes/master
Fixes reference for schema_format to AR::Base from AS::Base
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/tasks/database_tasks.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb
index 69aceb66b1..683741768b 100644
--- a/activerecord/lib/active_record/tasks/database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/database_tasks.rb
@@ -212,7 +212,7 @@ module ActiveRecord
load_schema(*args)
end
- def schema_file(format = ActiveSupport::Base.schema_format)
+ def schema_file(format = ActiveRecord::Base.schema_format)
case format
when :ruby
File.join(db_dir, "schema.rb")