jdbc-helper 0.2.1 → 0.3.0

data/test/test_object_wrapper.rb

@@ -5,11 +5,13 @@ class TestObjectWrapper < Test::Unit::TestCase
 
 	def setup
 		@table_name = "tmp_jdbc_helper"
+		@procedure_name = "tmp_jdbc_helper_test_proc"
 	end
 
 	def teardown
 		each_connection do |conn|
 			drop_table conn
+			conn.update "drop procedure #{@procedure_name}" rescue nil
 		end
 	end
 
@@ -39,19 +41,29 @@ class TestObjectWrapper < Test::Unit::TestCase
 			# With symbol
 			assert_kind_of     JDBCHelper::ObjectWrapper, conn.table(:some_table)
 			assert_instance_of JDBCHelper::TableWrapper, conn.table(:some_table)
+			assert_kind_of     JDBCHelper::ObjectWrapper, conn.function(:some_func)
+			assert_instance_of JDBCHelper::FunctionWrapper, conn.function(:some_func)
+			assert_kind_of     JDBCHelper::ObjectWrapper, conn.procedure(:some_proc)
+			assert_instance_of JDBCHelper::ProcedureWrapper, conn.procedure(:some_proc)
 			assert_equal       'some_table', conn.table(:some_table).name
 
 			# With string
-			assert_kind_of     JDBCHelper::ObjectWrapper, conn.table('db.table')
+			assert_kind_of     JDBCHelper::ObjectWrapper, conn.table('table')
 			assert_instance_of JDBCHelper::TableWrapper, conn.table('db.table')
+			assert_kind_of     JDBCHelper::ObjectWrapper, conn.function('db.some_func')
+			assert_instance_of JDBCHelper::FunctionWrapper, conn.function('some_func')
+			assert_kind_of     JDBCHelper::ObjectWrapper, conn.procedure('some_proc')
+			assert_instance_of JDBCHelper::ProcedureWrapper, conn.procedure('db.some_proc')
 			assert_equal       'db.table', conn.table('db.table').name
 
-			# Invalid table name
-			assert_raise(ArgumentError) { conn.table('table;') }
-			assert_raise(ArgumentError) { conn.table('table -- ') }
-			assert_raise(ArgumentError) { conn.table("tab'le") }
-			assert_raise(ArgumentError) { conn.table('tab"le') }
-			assert_raise(ArgumentError) { conn.table("tab`le") }
+			# Invalid object name
+			[ '  ', 'object;', 'object -- ', "obj'ect",
+				'obj"ect', 'obj`ect', 'obje(t', 'ob)ect' ].each do |inv|
+				assert_raise(ArgumentError) { conn.table(inv) }
+				assert_raise(ArgumentError) { conn.function(inv) }
+				assert_raise(ArgumentError) { conn.table(inv.to_sym) }
+				assert_raise(ArgumentError) { conn.function(inv.to_sym) }
+			end
 
 			# Abstract class
 			assert_raise(Exception) { JDBCHelper::ObjectWrapper.new(conn, 'table') }
@@ -79,6 +91,36 @@ class TestObjectWrapper < Test::Unit::TestCase
 		end
 	end
 
+	def test_function_wrapper
+		each_connection do |conn|
+			assert_equal 2.to_i, conn.function(:mod).call(5, 3).to_i
+			assert_equal 'yeah', conn.function(:coalesce).call(nil, nil, 'yeah', 'no')
+		end
+	end
+
+	def test_procedure_wrapper
+		each_connection do |conn|
+			create_test_procedure conn, @procedure_name
+
+			pr = conn.procedure(@procedure_name)
+
+			result = pr.call 'hello', 10, [100, Fixnum], [Time.now, Time], Float, String
+			assert_instance_of Hash, result
+			assert_equal 1000, result[3]
+			assert_equal 'hello', result[6]
+
+			if @type != :oracle
+				result = pr.call(
+					:i1 => 'hello', :i2 => 10,
+					:io1 => [100, Fixnum], 'io2' => [Time.now, Time], 
+					:o1 => Float, 'o2' => String)
+				assert_instance_of Hash, result
+				assert_equal 1000, result[:io1]
+				assert_equal 'hello', result['o2']
+			end
+		end
+	end
+
 	def test_insert_count
 		each_connection do |conn|
 			create_table conn
@@ -98,9 +140,10 @@ class TestObjectWrapper < Test::Unit::TestCase
 		end
 	end
 
-	# This will fail if the database doesn't support insert ignore syntax
 	def test_insert_ignore
 		each_connection do |conn|
+			next unless @type == :mysql
+
 			create_table conn
 			table = conn.table(@table_name)
 			params = {
@@ -117,9 +160,10 @@ class TestObjectWrapper < Test::Unit::TestCase
 		end
 	end
 
-	# This will fail if the database doesn't support replace syntax
 	def test_replace
 		each_connection do |conn|
+			next unless @type == :mysql
+
 			create_table conn
 			table = conn.table(@table_name)
 			params = {

data/test/test_performance.rb

@@ -7,7 +7,7 @@ class TestPerformance < Test::Unit::TestCase
 	def setup
 		@table = 'tmp_jdbc_helper'
 		@range = 'aaa'..'aaz'
-		@count = 10000
+		@count = 10000 # Increase this for performance measurement
 	end
 
 	def teardown
@@ -86,6 +86,26 @@ class TestPerformance < Test::Unit::TestCase
 					end
 				end
 			}.real}"
+
+			puts "Chaining enumerators with query: #{Benchmark.measure {
+				conn.query("select * from #{@table}").each_slice(50) do |slice|
+					slice.each do |row|
+						@range.each_with_index do |r,i|
+							row[i]
+						end
+					end
+				end
+			}.real}"
+
+			puts "Chaining enumerators with enumerate: #{Benchmark.measure {
+				conn.enumerate("select * from #{@table}").each_slice(50) do |slice|
+					slice.each do |row|
+						@range.each_with_index do |r,i|
+							row[i]
+						end
+					end
+				end
+			}.real}"
 		end
 	end
 

data/test/test_sql.rb

@@ -18,22 +18,36 @@ class TestSQL < Test::Unit::TestCase
 
 	end
 
+	def test_order_by
+		assert_equal "", SQL.order_by()
+		assert_equal "", SQL.order_by(nil)
+		assert_equal "", SQL.order_by(nil, nil)
+		assert_equal "order by a", SQL.order_by(:a)
+		assert_equal "order by a", SQL.order_by('a')
+		assert_equal "order by a desc", SQL.order_by('a desc')
+		assert_equal "order by a asc", SQL.order_by('a asc')
+		assert_equal "order by a, b asc, c desc", SQL.order_by(:a, 'b asc', 'c desc')
+
+		assert_raise(ArgumentError) { SQL.order_by(" -- ") }
+		assert_raise(ArgumentError) { SQL.order_by(:a, :b, "c 'd") }
+	end
+
 	def test_where
-		assert_equal "a = 1",                   SQL.where(:a => 1)
-		assert_equal "a = 1.2",                 SQL.where(:a => 1.2)
-		assert_equal "a = 9999999999999999999", SQL.where(:a => 9999999999999999999)
-		assert_equal "a >= 1 and a <= 2",       SQL.where(:a => 1..2)
-		assert_equal "a >= 1 and a < 2",        SQL.where(:a => 1...2)
-		assert_equal "a = 'A''s'",              SQL.where(:a => "A's")
-		assert_equal "a is null",               SQL.where(:a => nil)
-		assert_equal "a is not null",           SQL.where(:a => SQL.not_nil)
-		assert_equal "a = sysdate",             SQL.where(:a => SQL.expr('sysdate'))
-		assert_equal "sysdate = sysdate",       SQL.where(SQL.expr('sysdate') => SQL.expr('sysdate'))
-		assert_equal "a in ('aa', 'bb', 'cc')", SQL.where(:a => %w[aa bb cc])
-		assert_equal "a = 1 and b = 'A''s'",    SQL.where(:a => 1, :b => "A's")
-		assert_equal "a = 1 or b = 1",          SQL.where("a = 1 or b = 1")
-		assert_equal nil, SQL.where(nil)
-		assert_equal nil, SQL.where(" ")
+		assert_equal "where a = 1",                   SQL.where(:a => 1)
+		assert_equal "where a = 1.2",                 SQL.where(:a => 1.2)
+		assert_equal "where a = 9999999999999999999", SQL.where(:a => 9999999999999999999)
+		assert_equal "where a >= 1 and a <= 2",       SQL.where(:a => 1..2)
+		assert_equal "where a >= 1 and a < 2",        SQL.where(:a => 1...2)
+		assert_equal "where a = 'A''s'",              SQL.where(:a => "A's")
+		assert_equal "where a is null",               SQL.where(:a => nil)
+		assert_equal "where a is not null",           SQL.where(:a => SQL.not_nil)
+		assert_equal "where a = sysdate",             SQL.where(:a => SQL.expr('sysdate'))
+		assert_equal "where sysdate = sysdate",       SQL.where(SQL.expr('sysdate') => SQL.expr('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 '', SQL.where(nil)
+		assert_equal '', SQL.where(" ")
 
 		# Non-primitive datatypes not implemented (TODO?)
 		assert_raise(NotImplementedError) { SQL.where(:a => Time.now) }

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +09:00
+date: 2011-05-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -46,6 +46,17 @@ dependencies:
     requirement: *id003
     prerelease: false
     type: :development
+  - !ruby/object:Gem::Dependency 
+    name: test-unit
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.0
+    requirement: *id004
+    prerelease: false
+    type: :development
 description: A JDBC helper for JRuby/Database developers.
 email: junegunn.c@gmail.com
 executables: []
@@ -58,16 +69,22 @@ extra_rdoc_files:
 files: 
   - lib/jdbc-helper.rb
   - lib/jdbc-helper/connection.rb
+  - lib/jdbc-helper/connection/callable_statement.rb
+  - lib/jdbc-helper/connection/parameterized_statement.rb
   - lib/jdbc-helper/connection/prepared_statement.rb
   - lib/jdbc-helper/connection/result_set_enumerator.rb
   - lib/jdbc-helper/connection/row.rb
   - lib/jdbc-helper/connection/statement_pool.rb
+  - lib/jdbc-helper/connection/type_map.rb
   - lib/jdbc-helper/connector.rb
   - lib/jdbc-helper/connector/mysql_connector.rb
   - lib/jdbc-helper/connector/oracle_connector.rb
   - lib/jdbc-helper/constants.rb
-  - lib/jdbc-helper/object_wrapper.rb
   - lib/jdbc-helper/sql.rb
+  - lib/jdbc-helper/wrapper/function_wrapper.rb
+  - lib/jdbc-helper/wrapper/object_wrapper.rb
+  - lib/jdbc-helper/wrapper/procedure_wrapper.rb
+  - lib/jdbc-helper/wrapper/table_wrapper.rb
   - LICENSE.txt
   - README.rdoc
   - test/database.yml