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 /activerecord/lib | |
| 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 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 308a21191d..db9aa2e717 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -19,6 +19,9 @@ module ActiveRecord :results_as_hash => true, :type_translation => false ) + + db.busy_timeout(config[:timeout]) unless config[:timeout].nil? + ConnectionAdapters::SQLiteAdapter.new(db, logger) end |