diff options
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
| -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 |