From f642b18c0e05359fe2b0098108741963e6b04328 Mon Sep 17 00:00:00 2001 From: schneems Date: Thu, 2 Jan 2014 15:00:30 -0600 Subject: Use DATABASE_URL by default See https://github.com/rails/rails/pull/13463#issuecomment-31480799 for full conversation. --- .../rails/generators/rails/app/templates/config/databases/frontbase.yml | 2 +- .../rails/generators/rails/app/templates/config/databases/ibm_db.yml | 2 +- .../lib/rails/generators/rails/app/templates/config/databases/jdbc.yml | 2 +- .../rails/generators/rails/app/templates/config/databases/jdbcmysql.yml | 2 +- .../generators/rails/app/templates/config/databases/jdbcpostgresql.yml | 2 +- .../generators/rails/app/templates/config/databases/jdbcsqlite3.yml | 2 +- .../lib/rails/generators/rails/app/templates/config/databases/mysql.yml | 2 +- .../rails/generators/rails/app/templates/config/databases/oracle.yml | 2 +- .../generators/rails/app/templates/config/databases/postgresql.yml | 2 +- .../rails/generators/rails/app/templates/config/databases/sqlite3.yml | 2 +- .../rails/generators/rails/app/templates/config/databases/sqlserver.yml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'railties/lib/rails/generators') diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml index e654dda695..138e3a8664 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml @@ -26,4 +26,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml index fb9f74c2b3..2cdb592eeb 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml @@ -64,4 +64,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml index 262b6110d2..cefd30d519 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml @@ -56,4 +56,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml index b316b3ade1..d31761349c 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml @@ -28,4 +28,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. -production: <%%= ENV["RAILS_DATABASE_URL"] %> +production: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml index a6d029ba81..0d248dc197 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml @@ -45,4 +45,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml index dec6f16830..66eba3bf0d 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml @@ -21,4 +21,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml index 413389d226..95a8201437 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml @@ -39,4 +39,4 @@ test: # mysql2://myuser:mypass@localhost/somedatabase # production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml index ac70332bd7..d469ec0f99 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml @@ -35,4 +35,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml index 0ce64ed33d..93f48656b2 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml @@ -66,4 +66,4 @@ test: # postgres://myuser:mypass@localhost/somedatabase # production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml index 6be4443b5b..7312ddb6cd 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml @@ -27,4 +27,4 @@ test: # sqlite3://myuser:mypass@localhost/full/path/to/somedatabase # production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml index 68b5cde269..aa960e493e 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml +++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml @@ -45,4 +45,4 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. production: - url: <%%= ENV["RAILS_DATABASE_URL"] %> + url: <%%= ENV["DATABASE_URL"] %> -- cgit v1.2.3