aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 02:02:27 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-10-09 02:02:27 +0000
commit943be923f0d9a8d7248e5eb04595306cb31bf0da (patch)
treeb2cee179434fb91fefe410f6bc8b8ba5097c57e9 /railties/CHANGELOG
parent8f93516168f8c4d89ca1cfafcb01ee4f9b1fc491 (diff)
downloadrails-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/CHANGELOG')
-rw-r--r--railties/CHANGELOG2
1 files changed, 2 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