diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-04-02 23:06:16 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-04-03 01:30:27 +1030 |
| commit | f846828dae77696daea3bafd91a25a62977be481 (patch) | |
| tree | fb0deb3d4916990c214ee05d51311386c9ab4250 /railties/lib | |
| parent | c82483a10abd30310f3360f6ebb6a4dddafdb2ba (diff) | |
| download | rails-f846828dae77696daea3bafd91a25a62977be481.tar.gz rails-f846828dae77696daea3bafd91a25a62977be481.tar.bz2 rails-f846828dae77696daea3bafd91a25a62977be481.zip | |
Revise 'sqlite3:' URL handling for smoother upgrades
Restore the 4.0 behaviour for 'sqlite3:///', but deprecate it. We'll
change to the absolute-path interpretation in 4.2.
The current "correct" spellings for in-memory, relative, and absolute
URLs, respectively, are:
sqlite3::memory:
sqlite3:relative/path
sqlite3:/full/path
Substantially reverses/defers fbb79b517f3127ba620fedd01849f9628b78d6ce.
Uncovered by @guilleiguaran while investigating #14495, though that
sounds like a different issue.
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"] %> |