diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 11:12:06 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-04-03 11:12:54 -0300 |
| commit | 7e6630329ec071d921b831f379364329ff6916e0 (patch) | |
| tree | c6bcd9e6d752017e5ad99fd4da665e0937fc42c6 /railties/lib | |
| parent | 3fafc1cc425b6e372cb372acf16d3d5bc8e1422d (diff) | |
| parent | 0a99fddc140d8aa54a8922e745624a250877658b (diff) | |
| download | rails-7e6630329ec071d921b831f379364329ff6916e0.tar.gz rails-7e6630329ec071d921b831f379364329ff6916e0.tar.bz2 rails-7e6630329ec071d921b831f379364329ff6916e0.zip | |
Merge pull request #14569 from matthewd/sqlite_relative_deprecated
Revise 'sqlite3:' URL handling for smoother upgrades
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml | 6 |
1 files changed, 4 insertions, 2 deletions
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 7312ddb6cd..71934bb48c 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 @@ -23,8 +23,10 @@ test: # Do not keep production credentials in the repository, # instead read the configuration from the environment. # -# Example: -# sqlite3://myuser:mypass@localhost/full/path/to/somedatabase +# Examples: +# sqlite3::memory: +# sqlite3:db/production.sqlite3 +# sqlite3:/full/path/to/database.sqlite3 # production: url: <%%= ENV["DATABASE_URL"] %> |