aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-09-29 09:45:05 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-09-29 10:36:32 -0700
commit995ad3b3781c7a310daa11f728f2c5585c45c05d (patch)
tree617018ba59604b047bfde6270c4de2d82a2f3326 /activerecord/lib/active_record
parentb3c7766df71938ca05e026d1cb78b12158fd49dc (diff)
downloadrails-995ad3b3781c7a310daa11f728f2c5585c45c05d.tar.gz
rails-995ad3b3781c7a310daa11f728f2c5585c45c05d.tar.bz2
rails-995ad3b3781c7a310daa11f728f2c5585c45c05d.zip
just use if rather than nil?
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index 2b08fdae57..5ca1923d89 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -26,7 +26,7 @@ module ActiveRecord
:results_as_hash => true
)
- db.busy_timeout(config[:timeout]) unless config[:timeout].nil?
+ db.busy_timeout(config[:timeout]) if config[:timeout]
ConnectionAdapters::SQLite3Adapter.new(db, logger, config)
end