diff options
| author | Matthew Draper <matthew@trebex.net> | 2018-01-23 00:47:11 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 00:47:11 +1030 |
| commit | 7bb0b397ea51b0e41b5ebdf4fe5edcfc7345b600 (patch) | |
| tree | 3b1e3f03daf9988d0e900d75b51c5af336b30529 /activerecord | |
| parent | 109505843ff74585c2c30e3b187bced56ff3a08a (diff) | |
| parent | 408c6e5b3845569844c02c6af73953433745b807 (diff) | |
| download | rails-7bb0b397ea51b0e41b5ebdf4fe5edcfc7345b600.tar.gz rails-7bb0b397ea51b0e41b5ebdf4fe5edcfc7345b600.tar.bz2 rails-7bb0b397ea51b0e41b5ebdf4fe5edcfc7345b600.zip | |
Merge pull request #24964 from vipulnsward/true-false
Don't perform unnecessary check with false, just use true/false values
Diffstat (limited to 'activerecord')
| -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 d4f5bd16ac..9c69d8f13b 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -101,7 +101,7 @@ module ActiveRecord def initialize(connection, logger, connection_options, config) super(connection, logger, config) - @active = nil + @active = true @statements = StatementPool.new(self.class.type_cast_config_to_integer(config[:statement_limit])) configure_connection @@ -144,7 +144,7 @@ module ActiveRecord end def active? - @active != false + @active end # Disconnects from the database if already connected. Otherwise, this |