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 /guides | |
| 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 'guides')
| -rw-r--r-- | guides/source/configuring.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 460fd3c301..f8f9e9cbd9 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -580,13 +580,13 @@ The only way to explicitly not use the connection information in `ENV['DATABASE_ ``` $ cat config/database.yml development: - url: sqlite3://localhost/NOT_my_database + url: sqlite3:NOT_my_database $ echo $DATABASE_URL postgresql://localhost/my_database $ rails runner 'puts ActiveRecord::Base.connections' -{"development"=>{"adapter"=>"sqlite3", "host"=>"localhost", "database"=>"NOT_my_database"}} +{"development"=>{"adapter"=>"sqlite3", "database"=>"NOT_my_database"}} ``` Here the connection information in `ENV['DATABASE_URL']` is ignored, note the different adapter and database name. |