Skip to content

Call close in ensure #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2016
+15 −2
Merged

Call close in ensure #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ext/sqlite3/database.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ utf16_string_value_ptr(VALUE str)
return RSTRING_PTR(str);
}

static VALUE sqlite3_rb_close(VALUE self);

/* call-seq: SQLite3::Database.new(file, options = {})
*
* Create a new Database object that opens the given file. If utf16
Expand Down Expand Up @@ -120,8 +122,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
#endif

if(rb_block_given_p()) {
rb_yield(self);
rb_funcall(self, rb_intern("close"), 0);
rb_ensure(rb_yield, self, sqlite3_rb_close, self);
}

return self;
Expand Down
12 changes: 12 additions & 0 deletions test/test_database.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ def test_block_closes_self
assert thing.closed?
end

def test_block_closes_self_even_raised
thing = nil
begin
SQLite3::Database.new(':memory:') do |db|
thing = db
raise
end
rescue
end
assert thing.closed?
end

def test_prepare
db = SQLite3::Database.new(':memory:')
stmt = db.prepare('select "hello world"')
Expand Down