diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index ef2263a855ce00cefeefd2a1f870be84b2f4d8c9..de3a7779201f552286c9c20f4e2fc51f3b529e42 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make sure sqlite3 driver closes open connections on disconnect [Rob Rasmussen] + * [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name. #7072 [jeremymcanally] * change_column accepts :default => nil. Skip column options for primary keys. #6956, #7048 [dcmanges, Jeremy Kemper] diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 57520ea24953b3f5c85f740f84b2a1bdd0faaf67..199f53b8a70adc1f3c5738087ed762e5977a9a1c 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -105,6 +105,11 @@ def supports_migrations? #:nodoc: def requires_reloading? true end + + def disconnect! + super + @connection.close rescue nil + end def supports_count_distinct? #:nodoc: sqlite_version >= '3.2.6'