jdbc-helper 0.7.6 → 0.7.7

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

@@ -9,13 +9,13 @@ class CallableStatement < ParameterizedStatement
   # - IN parameter: value
   # - OUT parameter: class
   # - INOUT parameter: [value, class]
-  #   (Although class can be inferred from the value, 
+  #   (Although class can be inferred from the value,
   #   we still need a way to figure out if it's INOUT parameter)
   def call *params
     check_closed
 
     out_params = set_params(params)
-    measure_exec(:call) { @java_obj.execute }
+    @java_obj.execute
 
     result = {}
     out_params.each do |idx, jtype|
@@ -28,7 +28,7 @@ class CallableStatement < ParameterizedStatement
 
 private
   def set_params(params) # :nodoc:
-    hash_params = 
+    hash_params =
       if params.first.kind_of? Hash
         raise ArgumentError.new("More than one Hash given") if params.length > 1
         params.first
@@ -46,17 +46,17 @@ private
       case value
       # OUT parameter
       when Class
-        jtype = JDBCHelper::Connection::RUBY_SQL_TYPE_MAP[value] || java.sql.Types::VARCHAR
+        jtype = JDBCHelper::Connection::RUBY_SQL_TYPE_MAP[value] || Java::java.sql.Types::VARCHAR
         @java_obj.registerOutParameter(idx_, jtype)
         out_params[idx] = jtype
 
       # INOUT parameter
       when Array
         set_param(idx_, value.first)
-        jtype = JDBCHelper::Connection::RUBY_SQL_TYPE_MAP[value.last] || java.sql.Types::VARCHAR
+        jtype = JDBCHelper::Connection::RUBY_SQL_TYPE_MAP[value.last] || Java::java.sql.Types::VARCHAR
         @java_obj.registerOutParameter(idx_, jtype)
         out_params[idx] = jtype
-            
+
       # IN parameter
       else
         set_param(idx_, value)

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

@@ -12,6 +12,7 @@ class ParameterizedStatement
 
   # Underlying Java object
   attr_reader :java_obj
+  alias java java_obj
 
   # @param [JDBCHelper::Connection] conn
   # @param [String] cstmt_str
@@ -36,16 +37,16 @@ class ParameterizedStatement
     when Float
       @java_obj.setDouble idx, param
     when Time
-      @java_obj.setTimestamp idx, java.sql.Timestamp.new((param.to_f * 1000).to_i)
-    when java.sql.Date
+      @java_obj.setTimestamp idx, Java::java.sql.Timestamp.new((param.to_f * 1000).to_i)
+    when Java::java.sql.Date
       @java_obj.setDate idx, param
-    when java.sql.Time
+    when Java::java.sql.Time
       @java_obj.setTime idx, param
-    when java.sql.Timestamp
+    when Java::java.sql.Timestamp
       @java_obj.setTimestamp idx, param
-    when java.sql.Blob
+    when Java::java.sql.Blob
       @java_obj.setBinaryStream idx, param.getBinaryStream#, param.length
-    when java.io.InputStream
+    when Java::java.io.InputStream
       @java_obj.setBinaryStream idx, param
     else
       @java_obj.setString idx, param.to_s
@@ -65,11 +66,7 @@ class ParameterizedStatement
 
 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)
+    @java_obj.setNull idx, Java::java.sql.Types::NULL
   end
 
   def check_closed

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

@@ -32,8 +32,8 @@ class PreparedStatement < ParameterizedStatement
     check_closed
 
     set_params(params)
-    if measure_exec(:p_execute) { @java_obj.execute }
-      ResultSetEnumerator.new(measure_exec(:p_query) { @java_obj.getResultSet })
+    if @java_obj.execute
+      ResultSetEnumerator.new(@java_obj.getResultSet)
     else
       @java_obj.getUpdateCount
     end
@@ -44,7 +44,7 @@ class PreparedStatement < ParameterizedStatement
     check_closed
 
     set_params(params)
-    measure_exec(:p_update) { @java_obj.execute_update }
+    @java_obj.execute_update
   end
 
   # @return [Array] Returns an Array if block is not given
@@ -53,8 +53,7 @@ class PreparedStatement < ParameterizedStatement
 
     set_params(params)
     # sorry, ignoring privacy
-    @conn.send(:process_and_close_rset,
-           measure_exec(:p_query) { @java_obj.execute_query }, &blk)
+    @conn.send(:process_and_close_rset, @java_obj.execute_query, &blk)
   end
 
   # @return [JDBCHelper::Connection::ResultSetEnumerator]
@@ -64,7 +63,7 @@ class PreparedStatement < ParameterizedStatement
     return query(*params, &blk) if block_given?
 
     set_params(params)
-    ResultSetEnumerator.new(measure_exec(:p_query) { @java_obj.execute_query })
+    ResultSetEnumerator.new(@java_obj.execute_query)
   end
 
   # Adds to the batch
@@ -75,14 +74,15 @@ class PreparedStatement < ParameterizedStatement
     set_params(params)
     @java_obj.add_batch
   end
+
   # Executes the batch
+  # @return [Fixnum] Sum of all successful update counts
   def execute_batch
     check_closed
 
-    measure_exec(:p_execute_batch) {
-      @java_obj.executeBatch
-    }
+    @java_obj.executeBatch.select { |e| e > 0 }.inject(:+) || 0
   end
+
   # Clears the batch
   # @return [NilClass]
   def clear_batch
@@ -113,7 +113,7 @@ private
   end
 
   def set_null idx, param
-    @java_obj.setNull idx, @types ? @types[idx - 1] : java.sql.Types::NULL
+    @java_obj.setNull idx, @types ? @types[idx - 1] : Java::java.sql.Types::NULL
   end
 
   def initialize(*args)
@@ -123,7 +123,7 @@ private
       @pmd   = @java_obj.getParameterMetaData
       @types = @pmd.getParameterCount.times.map { |idx|
                     # Oracle does not support getParameterType
-                    @pmd.getParameterType(idx + 1) rescue java.sql.Types::NULL
+                    @pmd.getParameterType(idx + 1) rescue Java::java.sql.Types::NULL
                   }
     rescue Exception => e
       Logger.new($stderr).warn e.to_s

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

@@ -113,8 +113,9 @@ private
           JDBCHelper::Connection::GETTER_MAP.fetch(type, :get_string)
         end
 
-      @col_labels << @rsmd.get_column_label(i)
-      @col_labels_d << @col_labels.last.downcase
+      label = @rsmd.get_column_label(i)
+      @col_labels << label
+      @col_labels_d << label.downcase
 
     end
 

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

@@ -97,6 +97,11 @@ class Row
     @labels.zip(@values).sort.hash
   end
 
+  # @return [Hash]
+  def to_h
+    Hash[ @labels.zip(@values) ]
+  end
+
   alias :== :eql?
 
 private

data/lib/jdbc-helper/connector/mssql.rb

@@ -29,7 +29,7 @@ SqlServer = MSSQL
 module SqlServerConnector
   extend Connector
   def self.connect(host, user, password, db,
-           timeout = Constants::DEFAULT_LOGIN_TIMEOUT, 
+           timeout = Constants::DEFAULT_LOGIN_TIMEOUT,
            extra_params = {}, &block)
     check_params extra_params
     MSSQL.connect(host, user, password, db,

data/lib/jdbc-helper/connector/mysql.rb

@@ -25,7 +25,7 @@ end#MySQLConnector
 module MySQLConnector
   extend Connector
   def self.connect(host, user, password, db,
-           timeout = Constants::DEFAULT_LOGIN_TIMEOUT, 
+           timeout = Constants::DEFAULT_LOGIN_TIMEOUT,
            extra_params = {}, &block)
     check_params extra_params
     MySQL.connect(host, user, password, db,

data/lib/jdbc-helper/connector/oracle.rb

@@ -39,7 +39,7 @@ end#OracleConnector
 module OracleConnector
   extend Connector
   def self.connect(host, user, password, service_name,
-           timeout = Constants::DEFAULT_LOGIN_TIMEOUT, 
+           timeout = Constants::DEFAULT_LOGIN_TIMEOUT,
            extra_params = {}, &block)
     check_params extra_params
     Oracle.connect(host, user, password, service_name,
@@ -47,7 +47,7 @@ module OracleConnector
   end
 
   def self.connect_by_sid(host, user, password, sid,
-           timeout = Constants::DEFAULT_LOGIN_TIMEOUT, 
+           timeout = Constants::DEFAULT_LOGIN_TIMEOUT,
            extra_params = {}, &block)
     check_params extra_params
     Oracle.connect_by_sid(host, user, password, sid,

data/lib/jdbc-helper/connector/postgresql.rb

@@ -29,7 +29,7 @@ Postgres = PostgreSQL
 module PostgresConnector
   extend Connector
   def self.connect(host, user, password, db,
-           timeout = Constants::DEFAULT_LOGIN_TIMEOUT, 
+           timeout = Constants::DEFAULT_LOGIN_TIMEOUT,
            extra_params = {}, &block)
     check_params extra_params
     PostgreSQL.connect(host, user, password, db,

data/lib/jdbc-helper/sql/expression.rb

@@ -82,7 +82,7 @@ module SQL
     def == other
       self.to_s == other.to_s
     end
-    
+
     def eql? other
       self.class == other.class && self.to_s == other.to_s
     end
@@ -112,7 +112,7 @@ module SQL
     def self.singleton
       @@singleton ||= NotNullExpression.new
     end
-    
+
     def initialize
     end
 

data/lib/jdbc-helper/sql/sql.rb

@@ -55,7 +55,7 @@ module SQL
 
   # SQL Helpers
   # ===========
-  
+
   # Generates insert SQL with hash
   def self.insert table, data_hash
     insert_internal 'insert', table, data_hash
@@ -83,7 +83,7 @@ module SQL
   def self.select table, opts = {}
     opts = opts.reject { |k, v| v.nil? }
     check [
-      "select #{opts.fetch(:select, ['*']).join(', ')} from #{table}", 
+      "select #{opts.fetch(:select, ['*']).join(', ')} from #{table}",
       where_internal(opts.fetch(:where, {})),
       order(opts.fetch(:order, []).join(', '))
     ].reject(&:empty?).join(' ')
@@ -162,7 +162,7 @@ protected
         params = conds[1..-1] || []
         '(' +
         base.gsub('?') {
-          param = params.shift 
+          param = params.shift
           param ? value(param) : '?'
         } + ')'
       end

data/lib/jdbc-helper/sql/sql_prepared.rb

@@ -52,7 +52,7 @@ module SQLPrepared
     opts = opts.reject { |k, v| v.nil? }
     w_c, w_b = where_internal(opts.fetch(:where, {}))
     sql = [
-      "select #{opts.fetch(:select, ['*']).join(', ')} from #{table}", 
+      "select #{opts.fetch(:select, ['*']).join(', ')} from #{table}",
       w_c.to_s,
       SQL.order(opts.fetch(:order, []).join(', '))
     ].reject(&:empty?).join(' ')
@@ -80,8 +80,8 @@ module SQLPrepared
     conds   = [conds] unless conds.is_a? Array
     binds   = []
     clauses = []
-    conds.compact.each do |cond| 
-      c, b = where_unit cond 
+    conds.compact.each do |cond|
+      c, b = where_unit cond
       next if c.empty?
 
       binds += b
@@ -129,14 +129,7 @@ module SQLPrepared
                      binds << v.begin << v.end
                      ">= ? and #{k} <#{'=' unless v.exclude_end?} ?"
                    when Array
-                     "in (" + 
-                       v.map { |e|
-                       case e
-                       when String
-                         SQL.value e
-                       else
-                         e.to_s
-                       end }.join(', ') + ")"
+                     "in (" + v.map { |ie| SQL.value ie }.join(', ') + ")"
                    else
                      binds << v
                      "= ?"
@@ -147,7 +140,7 @@ module SQLPrepared
                  ''
                else
                  binds += conds[1..-1] if conds.length > 1
-                 "(#{conds.first})" 
+                 "(#{conds.first})"
                end
              else
                raise NotImplementedError.new("Parameter to where must be either Hash or String")

data/lib/jdbc-helper/version.rb

@@ -1,3 +1,3 @@
 module JDBCHelper
-  VERSION = '0.7.6'
+  VERSION = '0.7.7'
 end

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

@@ -14,7 +14,7 @@ class FunctionWrapper < ObjectWrapper
   def initialize conn, name
     super conn, name
 
-    @suffix = 
+    @suffix =
       case conn.driver
       when /oracle/
         " from dual"

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

@@ -11,6 +11,11 @@ class ProcedureWrapper < ObjectWrapper
   # @return [String]
   alias to_s name
 
+  def initialize conn, name
+    super conn, name
+    @cols = nil
+  end
+
   # Executes the procedure and returns the values of INOUT & OUT parameters in Hash
   # @return [Hash]
   def call(*args)
@@ -41,7 +46,7 @@ private
 
     # Alas, metadata lookup can be case-sensitive. e.g. Oracle
     dbmd = @connection.java_obj.get_meta_data
-    lookups = 
+    lookups =
       if schema
         [ lambda { dbmd.getProcedureColumns(package, schema, procedure, nil) },
           lambda { dbmd.getProcedureColumns(package_u, schema_u, procedure_u, nil) } ]
@@ -124,7 +129,7 @@ private
 
     final = {}
     result.each do |idx, ret|
-      key = input.keys.find { |key| key.to_s.upcase == @cols[idx - 1] }
+      key = input.keys.find { |k| k.to_s.upcase == @cols[idx - 1] }
       final[key] = ret
     end
     final

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

@@ -79,6 +79,7 @@ class TableWrapper < ObjectWrapper
   def insert_ignore data_hash = {}
     sql, binds = JDBCHelper::SQLPrepared.insert_ignore(name, @query_default.merge(data_hash))
     pstmt = prepare :insert, sql
+    pstmt.set_fetch_size @fetch_size if @fetch_size
     pstmt.send @update_method, *binds
   end
 
@@ -124,7 +125,7 @@ class TableWrapper < ObjectWrapper
     self
   end
   alias truncate_table! truncate!
-  
+
   # Drops the table.
   # @note This operation cannot be undone
   # @return [JDBCHelper::TableWrapper] Self.
@@ -181,12 +182,23 @@ class TableWrapper < ObjectWrapper
   # @param [Hash] data_hash Default values
   # @return [JDBCHelper::TableWrapper]
   # @since 0.4.5
-  def default data_hash
+  def default data_hash, &block
     raise ArgumentError.new("Hash required") unless data_hash.kind_of? Hash
 
     obj = self.dup
     obj.instance_variable_set :@query_default, @query_default.merge(data_hash)
-    obj
+    ret obj, &block
+  end
+
+  # Returns a new TableWrapper object with the given fetch size.
+  # If a block is given, executes the select statement and yields each row to the block.
+  # @param [Fixnum] fsz Fetch size
+  # @return [JDBCHelper::TableWrapper]
+  # @since 0.7.7
+  def fetch_size fsz, &block
+    obj = self.dup
+    obj.instance_variable_set :@fetch_size, fsz
+    ret obj, &block
   end
 
   # Executes a select SQL for the table and returns an Enumerable object,
@@ -195,12 +207,12 @@ class TableWrapper < ObjectWrapper
   # @since 0.4.0
   def each &block
     sql, binds = JDBCHelper::SQLPrepared.select(
-        name, 
-        :select => @query_select, 
+        name,
+        :select => @query_select,
         :where => @query_where,
         :order => @query_order)
     pstmt = prepare :select, sql
-    pstmt.enumerate *binds, &block
+    pstmt.enumerate(*binds, &block)
   end
 
   # Returns a new TableWrapper object whose subsequent inserts, updates,
@@ -227,13 +239,46 @@ class TableWrapper < ObjectWrapper
     @update_method == :add_batch
   end
 
+  # Clear batched operations.
+  # @param [*Symbol] types Types of batched operations to clear.
+  #   If not given, :insert, :update and :delete.
+  # @return [nil]
+  def clear_batch *types
+    types = [:insert, :update, :delete] if types.empty?
+    types.each do |type|
+      raise ArgumentError.new("Invalid type: #{type}") unless @pstmts.has_key?(type)
+      @pstmts[type].values.each(&:clear_batch)
+    end
+    nil
+  end
+
+  # Execute batched operations.
+  # TableWrapper uses multiple PreparedStatements and each of them may have its own homogeneous batched commands.
+  # It is thus not possible for TableWrapper to precisely serialize all the commands when interleaved.
+  # What you can do here is to specify the types of commands (:insert, :update, and :delete) in the order of execution.
+  # The default is to execute deletes first, then updates, and finally inserts.
+  # You can also execute a subset of the three types.
+  # @param [*Symbol] types Types of batched operations to execute in order.
+  #   If not given, :delete, :insert and :update.
+  # @return [Hash] Sum of all update counts indexed by operation type
+  def execute_batch *types
+    types = [:delete, :insert, :update] if types.empty?
+
+    Hash.new { 0 }.tap { |cnts|
+      types.each do |type|
+        raise ArgumentError.new("Invalid type: #{type}") unless @pstmts.has_key?(type)
+        cnts[type] += @pstmts[type].values.map(&:execute_batch).select { |e| e > 0 }.inject(:+) || 0
+      end
+    }
+  end
+
   # Returns the select SQL for this wrapper object
   # @return [String] Select SQL
   # @since 0.4.0
   def sql
     JDBCHelper::SQL.select(
-        name, 
-        :select => @query_select, 
+        name,
+        :select => @query_select,
         :where => @query_where,
         :order => @query_order)
   end
@@ -243,6 +288,8 @@ class TableWrapper < ObjectWrapper
     @update_method = :update
     @query_default = {}
     @query_where = []
+    @query_order = nil
+    @query_select = nil
     @pstmts = {
       :select => {},
       :insert => {},
@@ -250,8 +297,9 @@ class TableWrapper < ObjectWrapper
       :count => {},
       :update => {}
     }
+    @fetch_size = nil
   end
-  
+
   # Closes the prepared statements
   # @since 0.5.0
   def close
@@ -291,7 +339,7 @@ private
 
   def ret obj, &block
     if block_given?
-      obj.each &block
+      obj.each(&block)
     else
       obj
     end