jdbc-helper 0.7.1 → 0.7.2

data/README.markdown

@@ -112,6 +112,16 @@ end
 del_count = conn.update("DELETE FROM T")
 ```
 
+### Executing any SQL
+```ruby
+rset = conn.execute("SELECT * FROM T")
+rset.each do |row|
+  # Returned result must be used or closed
+end
+
+del_count = conn.execute("DELETE FROM T")
+```
+
 ### Transaction
 ```ruby
 committed = conn.transaction do |tx|

data/lib/jdbc-helper/connection/parameterized_statement.rb

@@ -24,7 +24,7 @@ class ParameterizedStatement
   def set_param(idx, param)
     case param
     when NilClass
-      @java_obj.setNull idx, java.sql.Types::NULL
+      set_null idx, param
     when Fixnum
       @java_obj.setLong idx, param
     when Bignum
@@ -64,6 +64,10 @@ class ParameterizedStatement
   end
 
 private
+  def set_null idx, param
+    @java_obj.setNull idx, java.sql.Types::NULL
+  end
+
   def measure_exec(type, &blk)  # :nodoc:
     @conn.send(:measure_exec, type, &blk)
   end

data/lib/jdbc-helper/connection/prepared_statement.rb

@@ -1,6 +1,8 @@
 # encoding: UTF-8
 # Junegunn Choi (junegunn.c@gmail.com)
 
+require 'logger'
+
 module JDBCHelper
 class Connection
 # An encapsulation of Java PreparedStatment object.
@@ -15,8 +17,7 @@ class PreparedStatement < ParameterizedStatement
   # Returns the number of parameters required
   # @return [Fixnum]
   def parameter_count
-    @pmd ||= @java_obj.get_parameter_meta_data
-    @pmd.get_parameter_count
+    @pmd.getParameterCount
   end
 
   # @return [NilClass]
@@ -26,6 +27,18 @@ class PreparedStatement < ParameterizedStatement
     @java_obj = nil
   end
 
+  # @return [Fixnum|ResultSetEnumerator]
+  def execute(*params)
+    check_closed
+
+    set_params(params)
+    if measure_exec(:p_execute) { @java_obj.execute }
+      ResultSetEnumerator.new(measure_exec(:p_query) { @java_obj.getResultSet })
+    else
+      @java_obj.getUpdateCount
+    end
+  end
+
   # @return [Fixnum]
   def update(*params)
     check_closed
@@ -99,8 +112,23 @@ private
     end
   end
 
+  def set_null idx, param
+    @java_obj.setNull idx, @types ? @types[idx - 1] : java.sql.Types::NULL
+  end
+
   def initialize(*args)
     super(*args)
+
+    begin
+      @pmd   = @java_obj.getParameterMetaData
+      @types = @pmd.getParameterCount.times.map { |idx|
+                    # Oracle does not support getParameterType
+                    @pmd.getParameterType(idx + 1) rescue java.sql.Types::NULL
+                  }
+    rescue Exception => e
+      Logger.new($stderr).warn e.to_s
+      @types = nil
+    end
   end
 end#PreparedStatment
 end#Connection

data/lib/jdbc-helper/connection.rb

@@ -252,6 +252,29 @@ class Connection
     status == :committed
   end
 
+  # Executes an SQL and returns the count of the update rows or a ResultSetEnumerator object 
+  # depending on the type of the given statement.
+  # If a ResultSetEnumerator is returned, it must be enumerated or closed.
+  # @param [String] qstr SQL string
+  # @return [Fixnum|ResultSetEnumerator]
+  def execute(qstr)
+    check_closed
+
+    stmt = @spool.take
+    begin
+      if measure_exec(:execute) { stmt.execute(qstr) }
+        ResultSetEnumerator.send(:new, stmt.getResultSet) { @spool.give stmt }
+      else
+        rset = stmt.getUpdateCount
+        @spool.give stmt
+        rset
+      end
+    rescue Exception => e
+      @spool.give stmt
+      raise
+    end
+  end
+
   # Executes an update and returns the count of the updated rows.
   # @param [String] qstr SQL string
   # @return [Fixnum] Count of affected records
@@ -283,8 +306,8 @@ class Connection
     check_closed
 
     @spool.with do | stmt |
-      measure_exec(:query) { stmt.execute(qstr) }
-      process_and_close_rset(stmt.get_result_set, &blk)
+      rset = measure_exec(:query) { stmt.execute_query(qstr) }
+      process_and_close_rset(rset, &blk)
     end
   end
 
@@ -309,13 +332,12 @@ class Connection
 
     stmt = @spool.take
     begin
-      measure_exec(:query) { stmt.execute(qstr) }
+      rset = measure_exec(:query) { stmt.execute_query(qstr) }
+      return ResultSetEnumerator.send(:new, rset) { @spool.give stmt }
     rescue Exception
       @spool.give stmt
       raise
     end
-
-    ResultSetEnumerator.send(:new, stmt.get_result_set) { @spool.give stmt }
   end
 
   # Adds a statement to be executed in batch

data/test/test_connection.rb

@@ -572,5 +572,102 @@ class TestConnection < Test::Unit::TestCase
       end
     end
   end
+
+  def test_invalid_sql
+    each_connection do | conn |
+      reset_test_table conn
+      assert_raise(NativeException) 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
+        conn.update("select * from #{TEST_TABLE}")
+      end
+    end
+  end
+
+  def test_execute
+    each_connection do | conn |
+      reset_test_table conn
+
+      rse_class = JDBCHelper::Connection::ResultSetEnumerator 
+
+      # Connection#execute
+      assert_equal 1, conn.execute("insert into #{TEST_TABLE} values (0, 'A')")
+      assert_equal 1, conn.execute("insert into #{TEST_TABLE} values (1, 'A')")
+      assert_equal rse_class, (ret = conn.execute("select * from #{TEST_TABLE}")).class
+      cnt = 0
+      ret.each do |row|
+        assert_equal 'A', row.b
+        cnt += 1
+      end
+      assert_equal 2, cnt
+      assert_equal 2, conn.execute("delete from #{TEST_TABLE}")
+
+      # PreparedStatment#execute
+      begin
+        pstmt_ins = conn.prepare "insert into #{TEST_TABLE} values (?, 'A')"
+        pstmt_sel = conn.prepare "select * from #{TEST_TABLE}"
+        pstmt_del = conn.prepare "delete from #{TEST_TABLE}"
+
+        assert_equal 1, pstmt_ins.execute(0)
+        assert_equal 1, pstmt_ins.execute(1)
+        assert_equal rse_class, (ret = pstmt_sel.execute).class
+        cnt = 0
+        ret.each do |row|
+          assert_equal 'A', row.b
+          cnt += 1
+        end
+        assert_equal 2, cnt
+        assert_equal 2, pstmt_del.execute
+        assert_equal rse_class, (ret = pstmt_sel.execute).class
+      ensure
+        [pstmt_ins, pstmt_sel, pstmt_del].each do |ps|
+          ps.close rescue nil
+        end
+      end
+    end
+  end
+    
+  def test_statement_pool_leakage
+    q = "select * from #{TEST_TABLE}"
+    u = "update #{TEST_TABLE} set a = 1"
+    each_connection do |conn|
+      reset_test_table conn
+      conn.update "insert into #{TEST_TABLE} values (0, 'A')"
+
+      assert_equal 20, 20.times.select {
+        conn.execute(q).close
+        conn.enumerate(q).close
+        conn.query q
+        conn.update u
+
+        conn.execute(q).count == 1
+      }.count
+    end
+  end
+
+  def test_prepared_statement_set_null
+    each_connection do |conn|
+      conn.update "drop table #{TEST_TABLE}" rescue nil
+
+      begin
+        conn.update(
+          case conn.driver
+          when /sqlserver/
+            "create table #{TEST_TABLE} (a int, b varchar(100), c datetime2, d decimal(10, 2))"
+          else
+            "create table #{TEST_TABLE} (a int, b varchar(100), c timestamp, d decimal(10, 2))"
+          end
+        )
+        pstmt = conn.prepare "insert into #{TEST_TABLE} (a, b, c, d) values (?, ?, ?, ?)"
+        pstmt.update nil, nil, nil, nil
+      ensure
+        pstmt.close rescue nil
+        conn.update "drop table #{TEST_TABLE}"
+      end
+    end
+  end
 end
 

data/test/testrb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+# 2012/03/07-
+
+require 'rubygems'
+ENV['BUNDLE_GEMFILE'] = File.join(File.dirname(__FILE__), '..', 'Gemfile')
+require 'bundler/setup'
+require 'test-unit'
+exit Test::Unit::AutoRunner.run(true)

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-28 00:00:00 Z
+date: 2012-03-13 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: insensitive_hash
@@ -110,6 +110,7 @@ files:
   - test/test_connectors.rb
   - test/test_object_wrapper.rb
   - test/test_sql.rb
+  - test/testrb
 homepage: http://github.com/junegunn/jdbc-helper
 licenses: 
   - MIT
@@ -149,3 +150,4 @@ test_files:
   - test/test_connectors.rb
   - test/test_object_wrapper.rb
   - test/test_sql.rb
+  - test/testrb