diff options
author | Dieter Komendera <dieter@komendera.com> | 2015-01-08 10:02:58 +0100 |
---|---|---|
committer | Dieter Komendera <dieter@komendera.com> | 2015-01-08 10:02:58 +0100 |
commit | 99e57a8dccb700375c674c6c7872025f0022f0db (patch) | |
tree | 150f91e7b5d37a853e3a63825996656a30215b12 /activerecord/lib/active_record/railties | |
parent | 9892d445bcff57f0a8bd8eb467cb7bf8c40a285b (diff) | |
download | rails-99e57a8dccb700375c674c6c7872025f0022f0db.tar.gz rails-99e57a8dccb700375c674c6c7872025f0022f0db.tar.bz2 rails-99e57a8dccb700375c674c6c7872025f0022f0db.zip |
Use `SCHEMA` instead of `DB_STRUCTURE` for specifiying structure file.
`rake test:load_structure` already uses `SCHEMA` and there's no
need to maintain two different env vars.
Diffstat (limited to 'activerecord/lib/active_record/railties')
-rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 04c2be045d..dde4dfa83c 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -269,9 +269,9 @@ db_namespace = namespace :db do end namespace :structure do - desc 'Dump the database structure to db/structure.sql. Specify another file with DB_STRUCTURE=db/my_structure.sql' + desc 'Dump the database structure to db/structure.sql. Specify another file with SCHEMA=db/my_structure.sql' task :dump => [:environment, :load_config] do - filename = ENV['DB_STRUCTURE'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure.sql") + filename = ENV['SCHEMA'] || File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure.sql") current_config = ActiveRecord::Tasks::DatabaseTasks.current_config ActiveRecord::Tasks::DatabaseTasks.structure_dump(current_config, filename) @@ -287,7 +287,7 @@ db_namespace = namespace :db do desc "Recreate the databases from the structure.sql file" task :load => [:environment, :load_config] do - ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV['DB_STRUCTURE']) + ActiveRecord::Tasks::DatabaseTasks.load_schema_current(:sql, ENV['SCHEMA']) end task :load_if_sql => ['db:create', :environment] do |