diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-10-09 02:02:27 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-10-09 02:02:27 +0000 |
| commit | 943be923f0d9a8d7248e5eb04595306cb31bf0da (patch) | |
| tree | b2cee179434fb91fefe410f6bc8b8ba5097c57e9 /railties | |
| parent | 8f93516168f8c4d89ca1cfafcb01ee4f9b1fc491 (diff) | |
| download | rails-943be923f0d9a8d7248e5eb04595306cb31bf0da.tar.gz rails-943be923f0d9a8d7248e5eb04595306cb31bf0da.tar.bz2 rails-943be923f0d9a8d7248e5eb04595306cb31bf0da.zip | |
Added timeout option to SQLite3 configurations to deal more gracefully with SQLite3::BusyException, now the connection can instead retry for x seconds to see if the db clears up before throwing that exception (closes #6126) [wreese@gmail.com] Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5258 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/configs/databases/sqlite3.yml | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 4ef9915ff5..8ea81f7cd2 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added default timeout setting of 5 seconds to SQLite3 database.yml configurations [DHH] + * Added generated attribute options to script/generate model, like the one found in scaffold_resource and resource [DHH]. Examples: ./script/generate model post title:string created_on:date body:text published:boolean diff --git a/railties/configs/databases/sqlite3.yml b/railties/configs/databases/sqlite3.yml index 6f8cbaf18f..60d8563a42 100644 --- a/railties/configs/databases/sqlite3.yml +++ b/railties/configs/databases/sqlite3.yml @@ -3,6 +3,7 @@ development: adapter: sqlite3 database: db/development.sqlite3 + timeout: 5000 # Warning: The database defined as 'test' will be erased and # re-generated from your development database when you run 'rake'. @@ -10,7 +11,9 @@ development: test: adapter: sqlite3 database: db/test.sqlite3 + timeout: 5000 production: adapter: sqlite3 database: db/production.sqlite3 + timeout: 5000 |