jdbc-helper 0.6.2 → 0.6.3

data/README.markdown

@@ -204,6 +204,30 @@ table.truncate!
 table.drop!
 ```
 
+#### Invalid use of dynamic conditions
+
+TableWrapper object internally creates JDBC PreparedStatements.
+If you dynamically build many condition-strings as the following example, 
+it would soon fail because there will be too many open PreparedStatements.
+
+```ruby
+10000.times do |idx|
+  table.count("id = #{idx}")
+end
+```
+
+Correct ways of doing the same would be as follows.
+
+```ruby
+10000.times do |idx|
+  # 1. with Hash
+  table.count('id' => idx)
+
+  # 2. with Array
+  table.count(["id = ?", idx])
+end
+```
+
 ### Using function wrappers (since 0.2.2)
 ```ruby
 conn.function(:mod).call 5, 3

data/lib/jdbc-helper/connection.rb

@@ -1,6 +1,8 @@
 # encoding: UTF-8
 # Junegunn Choi (junegunn.c@gmail.com)
 
+require 'insensitive_hash'
+
 require 'jdbc-helper/connection/type_map'
 require 'jdbc-helper/connection/parameterized_statement'
 require 'jdbc-helper/connection/prepared_statement'
@@ -145,12 +147,7 @@ class Connection
   def initialize(args = {})
     # Subsequent deletes should not affect the input
     @args = Marshal.load(Marshal.dump(args))
-    args = Marshal.load(Marshal.dump(args))
-
-    # String/Symbol
-    %w[driver url user password timeout].each do | strk |
-      args[strk.to_sym] = args.delete strk if args.has_key? strk
-    end
+    args = Marshal.load(Marshal.dump(args)).insensitive
 
     raise ArgumentError.new("driver not given") unless args.has_key? :driver
     raise ArgumentError.new("url not given") unless args.has_key? :url
@@ -170,7 +167,7 @@ class Connection
     end
 
     props = java.util.Properties.new
-    (args.keys - [:url, :driver]).each do | key |
+    args.keys.each do |key|
       props.setProperty(key.to_s, args[key].to_s) if args[key]
     end
     

data/lib/jdbc-helper/constants.rb

@@ -19,7 +19,8 @@ module Constants
     DEFAULT_PARAMETERS = {
       :mysql => {
         'zeroDateTimeBehavior' => 'convertToNull',
-        'rewriteBatchedStatements' => 'true',
+        # Removed from 0.6.3: This can have a performance hit when batch size is large
+        # 'rewriteBatchedStatements' => 'true',
         'useServerPrepStmts' => 'true',
         'useCursorFetch' => 'true'
       }

data/lib/jdbc-helper/sql.rb

@@ -29,10 +29,10 @@ class SQL
     case data
     when NilClass
       'null'
-    when Fixnum, Bignum, Float
-      data
     when BigDecimal
       data.to_s("F")
+    when Numeric
+      data
     when JDBCHelper::SQL
       data.to_s
     when String
@@ -138,7 +138,7 @@ class SQL
   
 protected
   def self.esc str
-    str.gsub("'", "''")
+    str.to_s.gsub("'", "''")
   end
 
   # No check
@@ -161,7 +161,7 @@ protected
             "is null"
           when NotNilClass
             "is not null"
-          when Fixnum, Bignum, Float, JDBCHelper::SQL, String
+          when Numeric, JDBCHelper::SQL, String
             "= #{value v}"
           when Range
             ">= #{v.first} and #{k} <#{'=' unless v.exclude_end?} #{v.last}"
@@ -171,6 +171,18 @@ protected
             raise NotImplementedError.new("Unsupported class: #{v.class}")
           end
       }.join(' and ')
+    when Array
+      if conds.empty?
+        ''
+      else
+        base = conds.first.to_s
+        params = conds[1..-1] || []
+        '(' +
+        base.gsub('?') {
+          param = params.shift 
+          param ? value(param) : '?'
+        } + ')'
+      end
     else
       raise NotImplementedError.new("Parameter to where must be either Hash or String")
     end

data/lib/jdbc-helper/sql_prepared.rb

@@ -134,6 +134,13 @@ class SQLPrepared < JDBCHelper::SQL
                      "= ?"
                    end
                }.join(' and ')
+             when Array
+               if conds.empty?
+                 ''
+               else
+                 binds += conds[1..-1] if conds.length > 1
+                 "(#{conds.first})" 
+               end
              else
                raise NotImplementedError.new("Parameter to where must be either Hash or String")
              end

data/test/database.yml

@@ -6,6 +6,7 @@ mysql:
     user: root
     password:
     timeout: 5
+    useServerPrepStmts: true
 
 oracle:
     driver: oracle.jdbc.driver.OracleDriver

data/test/database.yml.local

@@ -6,6 +6,7 @@ mysql:
     user: root
     password:
     timeout: 5
+    useServerPrepStmts: true
 
 oracle:
     driver: oracle.jdbc.driver.OracleDriver

data/test/test_sql.rb

@@ -38,6 +38,8 @@ class TestSQL < Test::Unit::TestCase
 
   def test_where
     assert_equal "where a = 1",                   SQL.where(:a => 1)
+    assert_equal "where a = 12345678901234567890.1234567890123456789", 
+                                                  SQL.where(:a => BigDecimal.new("12345678901234567890.1234567890123456789"))
     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)
@@ -55,8 +57,9 @@ class TestSQL < Test::Unit::TestCase
     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",
-        SQL.where({:c => 2}, "a = 1 or b = 1", nil, "", "e = 2", nil, {:f => 3}, {})
+    assert_equal "where c = 2 and (a = 1 or b = 1) and (e = 2) and f = 3 and (abc not like % || 'abc???' || % or def != 100 and ghi = '??') and (1 = 1)",
+        SQL.where({:c => 2}, "a = 1 or b = 1", nil, "", "e = 2", nil, {:f => 3}, {},
+                  ["abc not like % || ? || % or def != ? and ghi = '??'", 'abc???', 100], [], ['1 = 1'])
     assert_equal '', SQL.where(nil)
     assert_equal '', SQL.where(" ")
 
@@ -98,6 +101,9 @@ class TestSQL < Test::Unit::TestCase
     assert_equal ["where c = ? and (a = 1 or b = 1)", [2]], SQLPrepared.where({:c => 2}, "a = 1 or b = 1")
     assert_equal ["where c = ? and (a = 1 or b = 1) and (e = 2) and f = ?", [2, 3]],
         SQLPrepared.where({:c => 2}, "a = 1 or b = 1", nil, "", "e = 2", nil, {:f => 3}, {})
+    assert_equal ["where c = ? and (a = 1 or b = 1) and (e = 2) and f = ? and (abc not like % || ? || % or def != ?) and (1 = 1)", [2, 3, 'abc', 100]],
+        SQLPrepared.where({:c => 2}, "a = 1 or b = 1", nil, "", "e = 2", nil, {:f => 3}, {},
+                  ["abc not like % || ? || % or def != ?", 'abc', 100], [], ['1 = 1'])
     assert_equal [nil, []], SQLPrepared.where(nil)
     assert_equal [nil, []], SQLPrepared.where(" ")
   end

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,50 +10,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-27 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
-    name: bundler
+    name: insensitive_hash
     version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.0.3
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.0
-    requirement: *id001
+    requirement: *id002
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: jeweler
-    version_requirements: &id002 !ruby/object:Gem::Requirement 
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.5.2
-    requirement: *id002
+    requirement: *id003
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: rcov
-    version_requirements: &id003 !ruby/object:Gem::Requirement 
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
-    requirement: *id003
+    requirement: *id004
     prerelease: false
     type: :development
   - !ruby/object:Gem::Dependency 
     name: test-unit
-    version_requirements: &id004 !ruby/object:Gem::Requirement 
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: 2.3.0
-    requirement: *id004
+    requirement: *id005
     prerelease: false
     type: :development
 description: A JDBC helper for JRuby/Database developers.