Permalink
Browse files

make amalgalite 1.9 -w clean

remove shadowing variables
  • Loading branch information...
1 parent 2ddfa10 commit 7cae1fb6275120fcdb75a3ffec4cb59a1d10606f @copiousfreetime committed Oct 3, 2012
Showing with 8 additions and 8 deletions.
  1. +6 −6 lib/amalgalite/database.rb
  2. +2 −2 spec/progress_handler_spec.rb
View
@@ -749,9 +749,9 @@ def remove_function( name, callable_or_arity = nil )
to_remove = possibles
end
- to_remove.each do |db_function|
- @api.remove_function( db_function.name, db_function)
- @functions.delete( db_function.signature )
+ to_remove.each do |db_func|
+ @api.remove_function( db_func.name, db_func)
+ @functions.delete( db_func.signature )
end
end
@@ -810,9 +810,9 @@ def remove_aggregate( name, klass_or_arity = nil )
to_remove = possibles
end
- to_remove.each do |db_aggregate|
- i = db_aggregate.new
- @api.remove_aggregate( i.name, i.arity, db_aggregate )
+ to_remove.each do |db_agg|
+ i = db_agg.new
+ @api.remove_aggregate( i.name, i.arity, db_agg)
@aggregates.delete( i.signature )
end
end
@@ -16,8 +16,8 @@ def call
end
end
-def query_thread( db )
- Thread.new( db ) do |db|
+def query_thread( database )
+ Thread.new( database ) do |db|
begin
db.execute("select count(id) from country")
rescue => e

0 comments on commit 7cae1fb

Please sign in to comment.