diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2019-03-10 03:29:01 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2019-03-10 03:31:28 +0900 |
commit | 62105f0aed847f0ab4012e1b91e094e218aa9e08 (patch) | |
tree | 9c8fe4fe6762581b0fe38b18bef42a492b6ff62f /activerecord/lib | |
parent | 1cd150d2417ff750d75002e2fe4866cd1c651896 (diff) | |
download | rails-62105f0aed847f0ab4012e1b91e094e218aa9e08.tar.gz rails-62105f0aed847f0ab4012e1b91e094e218aa9e08.tar.bz2 rails-62105f0aed847f0ab4012e1b91e094e218aa9e08.zip |
SQLite3: Set `busy_timeout` in `configure_connection`
It is to work that on `reconnect!` after `disconnect!`
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 5e9b3afae4..3004caf82d 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -36,8 +36,6 @@ module ActiveRecord config.merge(results_as_hash: true) ) - db.busy_timeout(ConnectionAdapters::SQLite3Adapter.type_cast_config_to_integer(config[:timeout])) if config[:timeout] - ConnectionAdapters::SQLite3Adapter.new(db, logger, nil, config) rescue Errno::ENOENT => error if error.message.include?("No such file or directory") @@ -622,6 +620,8 @@ module ActiveRecord end def configure_connection + @connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout])) if @config[:timeout] + execute("PRAGMA foreign_keys = ON", "SCHEMA") end |