jdbc-helper 0.4.3 → 0.4.4

data/lib/jdbc-helper/wrapper/table_wrapper.rb

@@ -50,7 +50,7 @@ class TableWrapper < ObjectWrapper
 	# @param [List of Hash/String] where Filter conditions
 	# @return [Fixnum] Count of the records.
 	def count *where
-		@connection.query(JDBCHelper::SQL.count name, where.empty? ? @query_where : where)[0][0].to_i
+		@connection.query(JDBCHelper::SQL.count name, merge_where(self, where))[0][0].to_i
 	end
 
 	# Sees if the table is empty
@@ -90,7 +90,9 @@ class TableWrapper < ObjectWrapper
 	#   :where element of the given hash can (usually should) point to another Hash representing update filters.
 	# @return [Fixnum] Number of affected records
 	def update data_hash_with_where
-		where = data_hash_with_where.delete(:where) || @query_where
+		where_ext = data_hash_with_where.delete(:where)
+		where_ext = [where_ext] unless where_ext.is_a? Array
+		where = merge_where(self, where_ext.compact)
 		@connection.send @update_method, JDBCHelper::SQL.update(name, data_hash_with_where, where)
 	end
 
@@ -98,7 +100,8 @@ class TableWrapper < ObjectWrapper
 	# @param [List of Hash/String] where Delete filters
 	# @return [Fixnum] Number of affected records
 	def delete *where
-		@connection.send @update_method, JDBCHelper::SQL.delete(name, where.empty? ? @query_where : where)
+		where = merge_where(self, where)
+		@connection.send @update_method, JDBCHelper::SQL.delete(name, where)
 	end
 
 	# Empties the table.
@@ -137,14 +140,14 @@ class TableWrapper < ObjectWrapper
 	# Returns a new TableWrapper object which can be used to execute a select
 	# statement for the table with the specified filter conditions.
 	# If a block is given, executes the select statement and yields each row to the block.
-	# @param [Hash/String] Filter conditions
+	# @param [List of Hash/String] Filter conditions
 	# @return [JDBCHelper::TableWrapper]
 	# @since 0.4.0
 	def where *conditions, &block
 		raise ArgumentError.new("Wrong number of arguments") if conditions.empty?
 
 		obj = self.dup
-		obj.instance_variable_set :@query_where, conditions
+		merge_where(obj, conditions, true)
 		ret obj, &block
 	end
 
@@ -215,6 +218,12 @@ private
 			obj
 		end
 	end
+
+	def merge_where obj, where, apply = false
+		merged = (obj.instance_variable_get(:@query_where) || []) + (where || [])
+		obj.instance_variable_set :@query_where, merged if apply
+		merged
+	end
 end#TableWrapper
 end#JDBCHelper
 

data/test/test_object_wrapper.rb

@@ -174,10 +174,16 @@ class TestObjectWrapper < Test::Unit::TestCase
 			# Count
 			assert_equal 100, table.count
 			assert_equal 100, table.count(:alpha => 100)
+			assert_equal 1, table.where(:alpha => 100).count(:id => 1) # scoped
+			assert_equal 0, table.where(:alpha => 200).count(:id => 1) # scoped
 			assert_equal 0, table.count(:beta => nil)
 
 			assert_equal 100, table.where(:alpha => 100).count
 			assert_equal 0, table.where(:beta => nil).count
+			assert_equal 40, table.where('id >= 11', 'id <= 50').count
+			assert_equal 40, table.where('id >= 11').count('id <= 50')
+			assert_equal 40, table.where('id >= 11').where('id <= 50').count
+			assert_equal 40, table.where('id >= 11').where('id <= 50').where('1 = 1').count
 			assert_equal 0, table.where(:alpha => 100).count(:beta => nil)
 
 			assert_equal true, table.empty?(:beta => nil)
@@ -327,8 +333,9 @@ class TestObjectWrapper < Test::Unit::TestCase
 			insert table
 
 			assert_equal 10, table.update(:beta => 0, :where => { :id => (1..10) })
+			assert_equal 2, table.where(:id => (55..56)).update(:beta => 0, :where => { :id => (51..60) })
 			assert_equal 10, table.where(:id => (11..20)).update(:beta => 0)
-			assert_equal 20, table.count(:beta => 0)
+			assert_equal 22, table.count(:beta => 0)
 			assert_equal 100, table.update(:beta => 1)
 		end
 	end

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 +09:00
+date: 2011-06-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency