jdbc-helper 0.6.0 → 0.6.1

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

@@ -36,7 +36,7 @@ class ResultSetEnumerator
               case gt
               when :getBigNum
                 v = @rset.getBigDecimal idx+=1
-                @rset.was_null ? nil : BigDecimal.new(v.toPlainString).to_i
+                @rset.was_null ? nil : v.toPlainString.to_i
               when :getBigDecimal
                 v = @rset.getBigDecimal idx+=1
                 @rset.was_null ? nil : BigDecimal.new(v.toPlainString)
@@ -44,8 +44,7 @@ class ResultSetEnumerator
                 v = @rset.send gt, idx+=1
                 @rset.was_null ? nil : v
               end
-            },
-            count += 1)
+            }, count += 1)
       end
     ensure
       close

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

@@ -24,8 +24,10 @@ class StatementPool
 
   def take
     if @free.empty?
-      raise RuntimeError.new("Statement nesting level is too deep (likely a bug)") if
-          @occupied.length >= @max_size
+      if @occupied.length >= @max_size
+        raise RuntimeError.new("Statement nesting level is too deep (likely a bug)")
+      end
+
       @occupied << nstmt = @conn.send(:create_statement)
       nstmt
     else

data/lib/jdbc-helper/connection.rb

@@ -162,7 +162,12 @@ class Connection
     Java::JavaClass.for_name @driver
 
     timeout = args.has_key?(:timeout) ? args.delete(:timeout) : Constants::DEFAULT_LOGIN_TIMEOUT
-    java.sql.DriverManager.setLoginTimeout timeout if timeout
+    if timeout
+      if timeout.is_a?(Fixnum) == false || timeout <= 0
+        raise ArgumentError.new("Timeout must be a positive integer")
+      end
+      java.sql.DriverManager.setLoginTimeout timeout
+    end
 
     props = java.util.Properties.new
     (args.keys - [:url, :driver]).each do | key |

data/lib/jdbc-helper/sql.rb

@@ -150,8 +150,8 @@ protected
 
   def self.where_unit conds
     case conds
-    when String
-      conds = conds.strip
+    when String, JDBCHelper::SQL
+      conds = conds.to_s.strip
       conds.empty? ? '' : "(#{conds})"
     when Hash
       conds.map { |k, v|

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

@@ -19,8 +19,7 @@ class ObjectWrapper
   # @param [String/Symbol] name Name of the object to be wrapped
   def initialize(conn, name)
     raise NotImplementedError.new(
-      "JDBCHelper::ObjectWrapper is an abstract class") if 
-          self.instance_of? ObjectWrapper
+      "JDBCHelper::ObjectWrapper is an abstract class") if self.instance_of? ObjectWrapper
 
     @connection = conn
     @name = name.to_s

data/test/test_connection.rb

@@ -65,7 +65,9 @@ class TestConnection < Test::Unit::TestCase
     conn.update "drop table #{TEST_TABLE}" rescue nil
     cnt = conn.update "
       create table #{TEST_TABLE} (
-        a timestamp
+        a timestamp,
+        b date
+        #{", c time" if @type == :mysql}
       )"
     assert_equal 0, cnt
   end
@@ -143,6 +145,21 @@ class TestConnection < Test::Unit::TestCase
       assert_equal 20, conn.fetch_size
 
       # No way to confirm whether if this is really working as it's supposed to be.
+
+      conn.query('select 1 from dual') do |r1|
+        assert_equal 20, conn.fetch_size
+        conn.query('select 1 from dual') do |r2|
+          assert_equal 20, conn.fetch_size
+          conn.query('select 1 from dual') do |r3|
+            assert_equal 20, conn.fetch_size
+            conn.set_fetch_size 30
+            assert_equal 30, conn.fetch_size
+          end
+          assert_equal 30, conn.fetch_size
+        end
+        assert_equal 30, conn.fetch_size
+      end
+      assert_equal 30, conn.fetch_size
     end
   end
 
@@ -214,8 +231,8 @@ class TestConnection < Test::Unit::TestCase
       iq = lambda do | i |
         "insert into #{TEST_TABLE} values (#{i}, 'A')"
       end
-      ins1 = conn.prepare "insert into #{TEST_TABLE} values (? + #{count}, 'B')"
-      ins2 = conn.prepare "insert into #{TEST_TABLE} values (? + #{count * 2}, 'C')"
+      ins1 = conn.prepare "insert into #{TEST_TABLE} values (? + #{count}, ?)"
+      ins2 = conn.prepare "insert into #{TEST_TABLE} values (? + #{count * 2}, ?)"
 
       # update
       assert_equal 1, conn.update(iq.call 0)
@@ -226,19 +243,21 @@ class TestConnection < Test::Unit::TestCase
 
       count.times do | p |
         conn.add_batch iq.call(p)
-        ins1.add_batch p
-        ins2.add_batch p
+        ins1.add_batch p, 'B'.to_java
+        ins2.add_batch p, 'C'
       end
       conn.execute_batch
       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' }
 
       # add_batch clear_batch
       reset_test_table conn
 
       count.times do | p |
         conn.add_batch iq.call(p)
-        ins1.add_batch p
-        ins2.add_batch p
+        ins1.add_batch p, 'B'.to_java
+        ins2.add_batch p, 'C'
       end
       conn.clear_batch
       # Already cleared, no effect
@@ -409,18 +428,43 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_setter_timestamp
+    require 'date'
     each_connection do | conn |
       # Java timestamp
       reset_test_table_ts conn
-      ts = java.sql.Timestamp.new(Time.now.to_i * 1000)
-      conn.prepare("insert into #{TEST_TABLE} values (?)").update(ts)
-      assert_equal ts, conn.query("select * from #{TEST_TABLE}")[0][0]
+      now = Time.now
+      lt = (now.to_f * 1000).to_i
+      ts = java.sql.Timestamp.new(lt)
+      d = java.sql.Date.new( Time.mktime(Date.today.year, Date.today.month, Date.today.day).to_i * 1000 )
+      t = java.sql.Time.new lt
+
+      if @type == :mysql
+        conn.prepare("insert into #{TEST_TABLE} (a, b, c) values (?, ?, ?)").update(ts, d, t)
+        # MySQL doesn't have subsecond precision
+        assert [lt, lt / 1000 * 1000].include?(conn.query("select a from #{TEST_TABLE}")[0][0].getTime)
+        # The JDBC spec states that java.sql.Dates have _no_ time component
+        # http://bugs.mysql.com/bug.php?id=2876
+        assert_equal d.getTime, conn.query("select b from #{TEST_TABLE}")[0][0].getTime
+
+        # http://stackoverflow.com/questions/907170/java-getminutes-and-gethours
+        t2 = conn.query("select c from #{TEST_TABLE}")[0][0]
+        cal = java.util.Calendar.getInstance
+        cal.setTime(t)
+        cal2 = java.util.Calendar.getInstance
+        cal2.setTime(t2)
+        assert_equal now.hour, cal2.get(java.util.Calendar::HOUR_OF_DAY)
+        assert_equal now.min, cal2.get(java.util.Calendar::MINUTE)
+        assert_equal now.sec, cal2.get(java.util.Calendar::SECOND)
+        assert_equal cal.get(java.util.Calendar::HOUR_OF_DAY), cal2.get(java.util.Calendar::HOUR_OF_DAY)
+        assert_equal cal.get(java.util.Calendar::MINUTE), cal2.get(java.util.Calendar::MINUTE)
+        assert_equal cal.get(java.util.Calendar::SECOND), cal2.get(java.util.Calendar::SECOND)
+      end
 
       # Ruby time
       reset_test_table_ts conn
       ts = Time.now
-      conn.prepare("insert into #{TEST_TABLE} values (?)").update(ts)
-      got = conn.query("select * from #{TEST_TABLE}")[0][0]
+      conn.prepare("insert into #{TEST_TABLE} (a) values (?)").update(ts)
+      got = conn.query("select a from #{TEST_TABLE}")[0][0]
       assert [ts.to_i * 1000, (ts.to_f * 1000).to_i].include?(got.getTime)
     end
   end

data/test/test_connectors.rb

@@ -14,6 +14,20 @@ class TestConnectors < Test::Unit::TestCase
       if conn_info['driver'] =~ /mysql/
         host = conn_info['url'].match(%r{//(.*?)/})[1]
         db = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
+
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db, 0)
+        }
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db, -1)
+        }
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db, "timeout")
+        }
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db, 60, "extra")
+        }
+
         conn = JDBCHelper::MySQLConnector.connect(host, conn_info['user'], conn_info['password'], db)
 
         assert conn.closed? == false
@@ -32,10 +46,13 @@ class TestConnectors < Test::Unit::TestCase
         host = conn_info['url'].match(%r{@(.*?)/})[1]
         svc = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
         conn = JDBCHelper::OracleConnector.connect(host, conn_info['user'], conn_info['password'], svc)
+        conn2 = JDBCHelper::OracleConnector.connect_by_sid(host + ':1521', conn_info['user'], conn_info['password'], svc)
 
-        assert conn.closed? == false
-        conn.close
-        assert conn.closed?
+        [conn, conn2].each do |c|
+          assert c.closed? == false
+          c.close
+          assert c.closed?
+        end
 
         @conn = nil
         ret = JDBCHelper::OracleConnector.connect(host, conn_info['user'], conn_info['password'], svc) do |conn|

data/test/test_sql.rb

@@ -52,6 +52,7 @@ class TestSQL < Test::Unit::TestCase
     assert_equal "where a in ('aa', 'bb', 'cc', 4)", SQL.where(:a => %w[aa bb cc] + [4])
     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(JDBCHelper::SQL("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",
@@ -61,6 +62,8 @@ class TestSQL < Test::Unit::TestCase
 
     # Non-primitive datatypes not implemented (TODO?)
     assert_raise(NotImplementedError) { SQL.where(:a => Time.now) }
+    assert_raise(NotImplementedError) { SQL.where(5) }
+    assert_raise(NotImplementedError) { SQL.where(Time.now) }
 
     # Invalid SQL detection
     assert_raise(ArgumentError) { SQL.where(" 'a--b' -- cde") }

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
   - Junegunn Choi