summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Rakefile2
-rw-r--r--lib/sqlite3/database.rb2
-rw-r--r--lib/sqlite3/statement.rb3
3 files changed, 4 insertions, 3 deletions
diff --git a/Rakefile b/Rakefile
index bce4524..25cf11a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -52,7 +52,7 @@ task :clean do
rm_rf "api"
rm_f "doc/faq/faq.html"
- native_files = [ "Makefile", "mkmf.log", "sqlite3_api.so",
+ native_files = [ "mkmf.log", "sqlite3_api.so",
"sqlite3_api.bundle", "sqlite3_api_wrap.o" ]
native_files.each { |f| rm_f "ext/sqlite3_api/#{f}" }
end
diff --git a/lib/sqlite3/database.rb b/lib/sqlite3/database.rb
index 3be3109..b4ed21e 100644
--- a/lib/sqlite3/database.rb
+++ b/lib/sqlite3/database.rb
@@ -436,7 +436,7 @@ module SQLite3
# begin
if block
proxy = AggregateDefinitionProxy.new
- proxy.instance_eval &block
+ proxy.instance_eval(&block)
step ||= proxy.step_callback
finalize ||= proxy.finalize_callback
end
diff --git a/lib/sqlite3/statement.rb b/lib/sqlite3/statement.rb
index 20de9ee..54faf15 100644
--- a/lib/sqlite3/statement.rb
+++ b/lib/sqlite3/statement.rb
@@ -66,6 +66,7 @@ module SQLite3
@db = db
@driver = @db.driver
@closed = false
+ @results = @columns = nil
result, @handle, @remainder = @driver.prepare( @db.handle, sql )
Error.check( result, @db )
end
@@ -157,7 +158,7 @@ module SQLite3
must_be_open!
@driver.reset( @handle ) if @results
- bind_params *bind_vars unless bind_vars.empty?
+ bind_params(*bind_vars) unless bind_vars.empty?
@results = ResultSet.new( @db, self )
if block_given?