Merge pull request #13640 from maginatics/fix_sqlite3_ensure_master

SQLite3: Always close statements.

Conflicts:
	activerecord/CHANGELOG.md

3 files changed, 27 insertions, 3 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7568773aad..4bbe32f948 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Ensure SQLite3 statements are closed on errors.
+
+    Fixes: #13631
+
+    *Timur Alperovich*
+
 *   Give ActiveRecord::PredicateBuilder private methods the privacy they deserve
 
     *Hector Satre*
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
index dd4261cec7..2c6186774f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
@@ -296,9 +296,12 @@ module ActiveRecord
           # Don't cache statements if they are not prepared
           if without_prepared_statement?(binds)
             stmt    = @connection.prepare(sql)
-            cols    = stmt.columns
-            records = stmt.to_a
-            stmt.close
+            begin
+              cols    = stmt.columns
+              records = stmt.to_a
+            ensure
+              stmt.close
+            end
             stmt = records
           else
             cache = @statements[sql] ||= {
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 2630a0f3a4..e55525177f 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -416,6 +416,21 @@ module ActiveRecord
         assert @conn.respond_to?(:disable_extension)
       end
 
+      def test_statement_closed
+        db = SQLite3::Database.new(ActiveRecord::Base.
+                                   configurations['arunit']['database'])
+        statement = SQLite3::Statement.new(db,
+                                           'CREATE TABLE statement_test (number integer not null)')
+        statement.stubs(:step).raises(SQLite3::BusyException, 'busy')
+        statement.stubs(:columns).once.returns([])
+        statement.expects(:close).once
+        SQLite3::Statement.stubs(:new).returns(statement)
+
+        assert_raises ActiveRecord::StatementInvalid do
+          @conn.exec_query 'select * from statement_test'
+        end
+      end
+
       private
 
       def assert_logged logs