jdbc-helper 0.4.0 → 0.4.1

data/lib/jdbc-helper/sql.rb

@@ -39,7 +39,7 @@ class SQL
 
 	# Generates SQL where cluase with the given conditions.
 	# Parameter can be either Hash of String.
-	def self.where conds
+	def self.where *conds
 		where_clause = where_internal conds
 		where_clause.empty? ? where_clause : check(where_clause)
 	end
@@ -97,6 +97,7 @@ class SQL
 	end
 
 	# FIXME: Naive protection for SQL Injection
+	# TODO: check caching?
 	def self.check expr, is_name = false
 		return nil if expr.nil?
 
@@ -126,43 +127,46 @@ private
 
 	# No check
 	def self.where_internal conds
-		return '' if conds.nil?
-
-		where = 
-			case conds
-			when String
-				conds.strip
-			when Hash
-				conds.map { |k, v|
-					"#{k} " +
-						case v
-						when NilClass
-							"is null"
-						when NotNilClass
-							"is not null"
-						when Fixnum, Bignum, Float, JDBCHelper::SQL
-							"= #{v}"
-						when Range
-							">= #{v.first} and #{k} <#{'=' unless v.exclude_end?} #{v.last}"
-						when Array
-							"in (" + 
-							v.map { |e|
-								case e
-								when String
-									"'#{esc e}'"
-								else
-									e
-								end }.join(', ') + ")"
-						when String
-							"= '#{esc v}'"
-						else
-							raise NotImplementedError.new("Unsupported class: #{v.class}")
-						end
-				}.join(' and ')
-			else
-				raise NotImplementedError.new("Parameter to where must be either Hash or String")
-			end
-		where.empty? ? '' : 'where ' + where
+		conds = [conds] unless conds.is_a? Array
+		where_clause = conds.compact.map { |cond| where_unit cond }.reject(&:empty?).join(' and ')
+		where_clause.empty? ? '' : 'where ' + where_clause
+	end
+
+	def self.where_unit conds
+		case conds
+		when String
+			conds = conds.strip
+			conds.empty? ? '' : "(#{conds})"
+		when Hash
+			conds.map { |k, v|
+				"#{k} " +
+					case v
+					when NilClass
+						"is null"
+					when NotNilClass
+						"is not null"
+					when Fixnum, Bignum, Float, JDBCHelper::SQL
+						"= #{v}"
+					when Range
+						">= #{v.first} and #{k} <#{'=' unless v.exclude_end?} #{v.last}"
+					when Array
+						"in (" + 
+						v.map { |e|
+							case e
+							when String
+								"'#{esc e}'"
+							else
+								e
+							end }.join(', ') + ")"
+					when String
+						"= '#{esc v}'"
+					else
+						raise NotImplementedError.new("Unsupported class: #{v.class}")
+					end
+			}.join(' and ')
+		else
+			raise NotImplementedError.new("Parameter to where must be either Hash or String")
+		end
 	end
 
 	def self.insert_internal cmd, table, data_hash

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

@@ -47,17 +47,17 @@ class TableWrapper < ObjectWrapper
 	alias to_s name
 
 	# Retrieves the count of the table
-	# @param [Hash/String] Filter conditions
+	# @param [List of Hash/String] where Filter conditions
 	# @return [Fixnum] Count of the records.
-	def count where = nil
-		@connection.query(JDBCHelper::SQL.count name, where || @query_where)[0][0].to_i
+	def count *where
+		@connection.query(JDBCHelper::SQL.count name, where.empty? ? @query_where : where)[0][0].to_i
 	end
 
 	# Sees if the table is empty
 	# @param [Hash/String] Filter conditions
 	# @return [boolean]
-	def empty? where = nil
-		count(where) == 0
+	def empty? *where
+		count(*where) == 0
 	end
 
 	# Inserts a record into the table with the given hash
@@ -95,10 +95,10 @@ class TableWrapper < ObjectWrapper
 	end
 
 	# Deletes records matching given condtion
-	# @param [Hash] where Delete filters
+	# @param [List of Hash/String] where Delete filters
 	# @return [Fixnum] Number of affected records
-	def delete where = nil
-		@connection.send @update_method, JDBCHelper::SQL.delete(name, where || @query_where)
+	def delete *where
+		@connection.send @update_method, JDBCHelper::SQL.delete(name, where.empty? ? @query_where : where)
 	end
 
 	# Empties the table.
@@ -136,7 +136,9 @@ class TableWrapper < ObjectWrapper
 	# @param [Hash/String] Filter conditions
 	# @return [JDBCHelper::TableWrapper]
 	# @since 0.4.0
-	def where conditions, &block
+	def where *conditions, &block
+		raise ArgumentError.new("Wrong number of arguments") if conditions.empty?
+
 		obj = self.dup
 		obj.instance_variable_set :@query_where, conditions
 		ret obj, &block

data/test/test_object_wrapper.rb

@@ -249,6 +249,12 @@ class TestObjectWrapper < Test::Unit::TestCase
 						select(:a, :b, 'c cc').
 						order('id desc', 'name asc').sql
 
+			assert_equal "select a, b, c cc from tmp_jdbc_helper " +
+					"where (id != 15) and id >= 11 and id <= 20 order by id desc, name asc",
+					table.where("id != 15", :id => 11..20).
+						select(:a, :b, 'c cc').
+						order('id desc', 'name asc').sql
+
 			assert_raise(ArgumentError) { table.order }
 			assert_raise(ArgumentError) { table.order.where }
 			assert_raise(ArgumentError) { table.where.order }

data/test/test_performance.rb

@@ -54,13 +54,14 @@ class TestPerformance < Test::Unit::TestCase
 				end
 			}.real}"
 
-			puts "Inserts with hash (chunk-transactional): #{Benchmark.measure {
+			puts "Inserts with hash (batch & chunk-transactional): #{Benchmark.measure {
 				table = conn.table(@table)
 				(0...@count).each_slice(50) do |slice|
 					conn.transaction do
 						slice.each do |i|
-							table.insert @range.inject({}) { |hash, key| hash[key] = rand; hash }
+							table.batch.insert @range.inject({}) { |hash, key| hash[key] = rand; hash }
 						end
+						conn.execute_batch
 					end
 				end
 			}.real}"

data/test/test_sql.rb

@@ -47,7 +47,11 @@ class TestSQL < Test::Unit::TestCase
 		assert_equal "where sysdate = sysdate",       SQL.where(JDBCHelper::SQL('sysdate') => JDBCHelper::SQL('sysdate'))
 		assert_equal "where a in ('aa', 'bb', 'cc')", SQL.where(:a => %w[aa bb cc])
 		assert_equal "where a = 1 and b = 'A''s'",    SQL.where(:a => 1, :b => "A's")
-		assert_equal "where a = 1 or b = 1",          SQL.where("a = 1 or b = 1")
+		assert_equal "where (a = 1 or b = 1)",        SQL.where("a = 1 or b = 1")
+		assert_equal "where (a = 1 or b = 1) and c = 2", SQL.where("a = 1 or b = 1", :c => 2)
+		assert_equal "where c = 2 and (a = 1 or b = 1)", SQL.where({:c => 2}, "a = 1 or b = 1")
+		assert_equal "where c = 2 and (a = 1 or b = 1) and (e = 2) and f = 3",
+				SQL.where({:c => 2}, "a = 1 or b = 1", nil, "", "e = 2", nil, {:f => 3}, {})
 		assert_equal '', SQL.where(nil)
 		assert_equal '', SQL.where(" ")
 
@@ -55,6 +59,11 @@ class TestSQL < Test::Unit::TestCase
 		assert_raise(NotImplementedError) { SQL.where(:a => Time.now) }
 
 		# Invalid SQL detection
+		assert_raise(ArgumentError) { SQL.where(" 'a--b' -- cde") }
+		assert_raise(ArgumentError) { SQL.where(" 'a--b' ;") }
+		assert_raise(ArgumentError) { SQL.where(" 'a--b' -- cde", :a => 1) }
+		assert_raise(ArgumentError) { SQL.where(" 'a--b' -- cde", :a => 1) }
+		assert_raise(ArgumentError) { SQL.where({:a => 1}, "/* a") }
 		assert_raise(ArgumentError) { SQL.where(:a => JDBCHelper::SQL(" 'a--b' -- cde")) }
 		assert_raise(ArgumentError) { SQL.where(:a => JDBCHelper::SQL(" 'aabbb''dd")) }
 		assert_raise(ArgumentError) { SQL.where(:a => JDBCHelper::SQL(" 'aabbb''dd' /* aaa */")) }

metadata

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