jdbc-helper 0.7.6 → 0.7.7

data/test/helper.rb

@@ -1,4 +1,9 @@
+$VERBOSE = true
+
 require 'rubygems'
+require 'test-unit'
+require 'simplecov'
+SimpleCov.start
 require 'bundler'
 require 'insensitive_hash'
 #require 'pry'

data/test/test_connection.rb

@@ -8,14 +8,21 @@ class TestConnection < Test::Unit::TestCase
 
   def get_one_two
     "
-    select 1 one, 'two' two from dual
+    select 1 One, 'two' tWo from dual
     union all
-    select 1 one, 'two' two from dual
+    select 1 One, 'two' tWo from dual
     "
   end
 
   def check_one_two(rec)
     assert_equal 2, rec.length
+    assert_equal %w[one two], rec.labels.map(&:downcase)
+    assert_equal %w[one two], rec.keys.map(&:downcase)
+    assert_equal [1, 'two'], rec.values
+
+    assert_equal 2,     rec.to_h.length
+    assert_equal 1,     rec.to_h.insensitive[:one]
+    assert_equal 'two', rec.to_h.insensitive[:two]
 
     assert_equal 1, rec.one
     assert_equal 1, rec[0]
@@ -65,7 +72,7 @@ class TestConnection < Test::Unit::TestCase
   end
 
   # ---------------------------------------------------------------
-  
+
   def test_invalid_driver
     assert_raise(NameError) {
       JDBCHelper::Connection.new(:driver => 'xxx', :url => 'localhost')
@@ -251,7 +258,6 @@ class TestConnection < Test::Unit::TestCase
 
       # update
       assert_equal 1, conn.update(iq.call 0)
-      assert_equal 1, conn.prev_stat.success_count
 
       # add_batch execute_batch
       reset_test_table conn
@@ -262,6 +268,7 @@ class TestConnection < Test::Unit::TestCase
         ins2.add_batch p, 'C'
       end
       conn.execute_batch
+      conn.execute_batch # Subsequent call has no effect
       assert_equal count * 3, conn.table(TEST_TABLE).count
       assert conn.table(TEST_TABLE).where("a >= #{count}", "a < #{count * 2}").map(&:b).all? { |e| e == 'B' }
       assert conn.table(TEST_TABLE).where("a >= #{count * 2}").map(&:b).all? { |e| e == 'C' }
@@ -279,6 +286,14 @@ class TestConnection < Test::Unit::TestCase
       ins1.execute_batch
       ins2.execute_batch
       assert_equal 0, conn.table(TEST_TABLE).count
+
+      # Return values
+      count.times do | p |
+        conn.update iq.call(p)
+      end
+      conn.add_batch("delete from #{TEST_TABLE} where a < 5")
+      conn.add_batch("delete from #{TEST_TABLE} where a < 7")
+      assert_equal 7, conn.execute_batch
     end
   end
 
@@ -290,14 +305,18 @@ class TestConnection < Test::Unit::TestCase
         assert_equal conn.prepared_statements.first, sel
 
         # Fetch size
-        if iter == 0
-          assert_nil conn.fetch_size
-          assert_nil sel.fetch_size
-        end
+        assert_nil conn.fetch_size if iter == 0
+        assert_nil sel.fetch_size if iter == 0
+
+        fsz = conn.fetch_size
         conn.fetch_size = 100
+        assert_equal 100, conn.fetch_size
+        assert_equal fsz, sel.fetch_size
+
         sel.fetch_size  = 10
         assert_equal 100, conn.fetch_size
         assert_equal 10,  sel.fetch_size
+
         sel.set_fetch_size 20
         assert_equal 100, conn.fetch_size
         assert_equal 20,  sel.fetch_size
@@ -352,7 +371,6 @@ class TestConnection < Test::Unit::TestCase
       # update
       assert ins.closed? == false
       assert_equal 1, ins.update(0, 'A')
-      assert_equal 1, conn.prev_stat.success_count
       ins.close
       assert_equal 0, conn.prepared_statements.length
 
@@ -405,7 +423,7 @@ class TestConnection < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_transaction
     each_connection do | conn |
       reset_test_table conn
@@ -482,7 +500,7 @@ class TestConnection < Test::Unit::TestCase
       conn.prepare("insert into #{TEST_TABLE} (a) values (?)").update(ts)
       got = conn.query("select a from #{TEST_TABLE}")[0][0]
       arr = [
-              ts.to_i * 1000, 
+              ts.to_i * 1000,
               (ts.to_f * 1000).to_i,
               # SQL Server seems to round up the millisecond precision
               (ts.to_f * 1000).to_i / 10 * 10
@@ -516,7 +534,7 @@ class TestConnection < Test::Unit::TestCase
             end)
       result = cstmt_name.call(
         :i1 => 'hello', :i2 => 10,
-        :io1 => [100, Fixnum], 'io2' => [Time.now, Time], 
+        :io1 => [100, Fixnum], 'io2' => [Time.now, Time],
         :n1 => nil,
         :o1 => Float, 'o2' => String)
       assert_instance_of Hash, result
@@ -526,7 +544,7 @@ class TestConnection < Test::Unit::TestCase
       # Invalid parameters
       #assert_raise(NativeException) { cstmt_ord.call 1 }
       assert_raise(ArgumentError)   { cstmt_ord.call({}, {}) }
-      assert_raise(NativeException) { cstmt_name.call 1 }
+      assert_raise                  { cstmt_name.call 1 }
       assert_raise(ArgumentError)   { cstmt_name.call({}, {}) }
 
       # Close
@@ -551,7 +569,7 @@ class TestConnection < Test::Unit::TestCase
         result = cstmt_name.call(
           #:i1 => 'hello',
           :i2 => 10,
-          :io1 => [100, Fixnum], 'io2' => [Time.now, Time], 
+          :io1 => [100, Fixnum], 'io2' => [Time.now, Time],
           :n1 => nil,
           :o1 => Float, 'o2' => String)
         assert_instance_of Hash, result
@@ -578,12 +596,12 @@ class TestConnection < Test::Unit::TestCase
   def test_invalid_sql
     each_connection do | conn |
       reset_test_table conn
-      assert_raise(NativeException) do
+      assert_raise do
         conn.query("delete from #{TEST_TABLE}")
       end
       omit "Oracle does not throw Exception when " +
            "select statement given to executeUpdate" if conn.driver =~ /oracle/
-      assert_raise(NativeException) do
+      assert_raise do
         conn.update("select * from #{TEST_TABLE}")
       end
     end
@@ -593,7 +611,7 @@ class TestConnection < Test::Unit::TestCase
     each_connection do | conn |
       reset_test_table conn
 
-      rse_class = JDBCHelper::Connection::ResultSetEnumerator 
+      rse_class = JDBCHelper::Connection::ResultSetEnumerator
 
       # Connection#execute
       assert_equal 1, conn.execute("insert into #{TEST_TABLE} values (0, 'A')")
@@ -631,7 +649,7 @@ class TestConnection < Test::Unit::TestCase
       end
     end
   end
-    
+
   def test_statement_pool_leakage
     q = "select * from #{TEST_TABLE}"
     u = "update #{TEST_TABLE} set a = 1"

data/test/test_object_wrapper.rb

@@ -89,6 +89,7 @@ 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_instance_of JDBCHelper::TableWrapper, conn[: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)
@@ -132,18 +133,18 @@ class TestObjectWrapper < Test::Unit::TestCase
     }
   end
 
-  def insert table, cnt = 100
+  def insert table, cnt = 100, offset = 1
     require 'java'
 
     params = insert_params.dup
     params.delete(:num_wtf) unless @type == :oracle
 
-    (1..cnt).each do |pk|
+    cnt.times do |pk|
       icnt = table.
           default(:gamma => 'hello world').
           default(:alpha => 200).
           insert(params.merge(
-             :id => pk,
+             :id => pk + offset,
              :delta => blob_data)
           )
       assert_equal 1, icnt unless table.batch?
@@ -171,7 +172,7 @@ class TestObjectWrapper < Test::Unit::TestCase
     each_connection do |conn, conn_info|
       next unless [:mysql, :oracle].include?(@type) # TODO: postgres / sqlserver
 
-      { 
+      {
         :proc => @procedure_name,
         :db_proc => [conn_info['database'], @procedure_name].join('.')
       }.each do |mode, prname|
@@ -191,7 +192,7 @@ class TestObjectWrapper < Test::Unit::TestCase
 
         result = pr.call(
           :io1 => [100, Fixnum],
-          'io2' => [Time.now, Time], 
+          'io2' => [Time.now, Time],
           :i2 => 10,
           :i1 => 'hello',
           :o1 => Float, 'o2' => String)
@@ -207,7 +208,7 @@ class TestObjectWrapper < Test::Unit::TestCase
           pend("Not tested") do
             result = pr.call(
               :io1 => [100, Fixnum],
-              'io2' => [Time.now, Time], 
+              'io2' => [Time.now, Time],
               #:i2 => 10,
               :i1 => 'hello',
               :o1 => Float, 'o2' => String)
@@ -270,8 +271,8 @@ class TestObjectWrapper < Test::Unit::TestCase
       table = conn.table(@table_name)
       params = {
         :id => 1,
-        :alpha => 100, 
-        :beta => JDBCHelper::SQL('0.1 + 0.2'), 
+        :alpha => 100,
+        :beta => JDBCHelper::SQL('0.1 + 0.2'),
         :gamma => 'hello world' }
 
       100.times do
@@ -290,7 +291,7 @@ class TestObjectWrapper < Test::Unit::TestCase
       table = conn.table(@table_name)
       params = {
         :id => 1,
-        :beta => JDBCHelper::SQL('0.1 + 0.2'), 
+        :beta => JDBCHelper::SQL('0.1 + 0.2'),
         :gamma => 'hello world' }
 
       100.times do |i|
@@ -338,7 +339,7 @@ class TestObjectWrapper < Test::Unit::TestCase
 
       # Alias
       cnt = 0
-      table.select('alpha omega') do |row|
+      table.select('alpha OMega') do |row|
         cnt += 1
         assert_equal 100, row.omega
         assert_equal ['omega'], row.labels.map(&:downcase)
@@ -483,7 +484,19 @@ class TestObjectWrapper < Test::Unit::TestCase
 
       insert table.batch, 50
       assert_equal 0, table.count
-      conn.execute_batch
+      table.execute_batch :delete
+      assert_equal 0, table.count
+      table.execute_batch :update
+      assert_equal 0, table.count
+
+      table.batch.delete
+      table.execute_batch :update, :insert
+      assert_equal 50, table.count
+      table.clear_batch
+
+      insert table.batch, 50
+      assert_equal 50, table.count
+      table.clear_batch
       assert_equal 50, table.count
 
       table.batch.update(:alpha => JDBCHelper::SQL('alpha * 2'))
@@ -493,10 +506,29 @@ class TestObjectWrapper < Test::Unit::TestCase
       table.delete(:id => 1..10)
       assert_equal 40, table.count
 
-      # Finally
-      conn.execute_batch
+      # Finally with TableWrapper#execute_batch
+      insert table.batch, 60, 1000
+      assert_equal 40, table.count
+      table.execute_batch :delete, :update
+      assert_equal 40, table.count
+      table.execute_batch :insert
+      assert_equal 100, table.count
 
       assert_equal 200, table.select(:alpha).to_a.first.alpha.to_i
+
+      # Order of execution
+      table.batch.update(:alpha => JDBCHelper::SQL('alpha * 4'))
+      insert table.batch, 50, 2000
+      table.batch.delete
+      ret = table.execute_batch :delete, :insert, :update
+      omit_if(conn.driver =~ /oracle/) do
+        # https://forums.oracle.com/forums/thread.jspa?threadID=532945
+        assert_equal 100, ret[:delete]
+        assert_equal 50, ret[:insert]
+        assert_equal 50, ret[:update]
+      end
+      assert_equal 50, table.count
+      assert_equal 400, table.select(:alpha).to_a.first.alpha.to_i
     end
   end
 
@@ -685,5 +717,21 @@ class TestObjectWrapper < Test::Unit::TestCase
       assert_equal 100, t.count
     end
   end
+
+  def test_fetch_size
+    each_connection do |conn|
+      create_table conn
+
+      fsz = 100
+      conn.fetch_size = fsz
+      cnt = cnt2 = 0
+      conn.table(@table_name).fetch_size(fsz) { |row| cnt += 1 }
+      conn.table(@table_name).fetch_size(fsz).each { |row| cnt2 += 1 }
+      assert_equal cnt,  conn.table(@table_name).count
+      assert_equal cnt2, conn.table(@table_name).count
+
+      conn.table(@table_name).fetch_size("No").count
+    end
+  end
 end
 

metadata

@@ -2,14 +2,14 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-26 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
@@ -18,18 +18,12 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.4
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.4.0
     none: false
   prerelease: false
   type: :runtime
@@ -37,31 +31,35 @@ dependencies:
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -71,13 +69,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: !binary |-
+          MA==
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: !binary |-
+          MA==
     none: false
   prerelease: false
   type: :development
@@ -141,13 +141,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project:
@@ -164,4 +166,3 @@ test_files:
 - test/test_object_wrapper.rb
 - test/test_sql.rb
 - test/testrb
-...