jdbc-helper 0.5.1 → 0.6.0

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

@@ -24,123 +24,114 @@ class Connection
 #       puts row.rownum
 #   end
 class Row
-	# @return [Array] Labels of the columns
-	attr_reader :labels
-	# @return [Array] Values in Array
-	attr_reader :values
-	# @return [Fixnum] Sequential row number assigned within the scope of the query
-	attr_reader :rownum
-	alias_method :keys, :labels
-
-	include Enumerable
-
-	# @overload [](idx)
-	#   @param [Fixnum/String/Symbol/Range] idx Access index
-	#   @return [Object]
-	# @overload [](offset, len)
-	#   @param [Fixnum] offset Start offset
-	#   @param [Fixnum] len Length of Array
-	#   @return [Array]
-	def [](*idx)
-		return @values[*idx] if idx.length > 1
-
-		idx = idx.first
-		case idx
-		when Fixnum
-			raise RangeError.new("Index out of bound") if idx >= @values.length
-			@values[idx]
-		when String, Symbol
-			# case-insensitive, assuming no duplicate labels
-			vidx = @labels_d.index(idx.to_s.downcase) or
-				raise NameError.new("Unknown column label: #{idx}")
-			@values[vidx]
-		else
-			# See how it goes...
-			@values[idx]
-		end
-	end
-
-	# @yield [Object]
-	def each(&blk)
-		@values.each { | v | yield v }
-
-		# @labels.each_with_index do | label, idx |
-		# 	yield label, @values[idx]
-		# end
-	end
-
-	# @return [String]
-	def inspect
-		strs = []
-		@labels.each do | col |
-			strs << "#{col}: #{self[col] || '(null)'}"
-		end
-		'[' + strs.join(', ') + ']'
-	end
-
-	# @return [String]
-	def to_s
-		@values.to_s
-	end
-
-	# @return [Array]
-	def to_a
-		@values
-	end
-
-	# @return [String]
-	def join(sep = $,)
-		to_a.join(sep)
-	end
-
-	# @return [Boolean]
-	def eql?(other)
-		self.hash == other.hash
-	end
-
-	def hash # :nodoc:
-		@labels.zip(@values).sort.hash
-	end
-
-	alias :== :eql?
+  # @return [Array] Labels of the columns
+  attr_reader :labels
+  # @return [Array] Values in Array
+  attr_reader :values
+  # @return [Fixnum] Sequential row number assigned within the scope of the query
+  attr_reader :rownum
+  alias_method :keys, :labels
+
+  include Enumerable
+
+  # @overload [](idx)
+  #   @param [Fixnum/String/Symbol/Range] idx Access index
+  #   @return [Object]
+  # @overload [](offset, len)
+  #   @param [Fixnum] offset Start offset
+  #   @param [Fixnum] len Length of Array
+  #   @return [Array]
+  def [](*idx)
+    return @values[*idx] if idx.length > 1
+
+    idx = idx.first
+    case idx
+    when Fixnum
+      raise RangeError.new("Index out of bound") if idx >= @values.length
+      @values[idx]
+    when String, Symbol
+      # case-insensitive, assuming no duplicate labels
+      vidx = @labels_d.index(idx.to_s.downcase) or
+        raise NameError.new("Unknown column label: #{idx}")
+      @values[vidx]
+    else
+      # See how it goes...
+      @values[idx]
+    end
+  end
+
+  # @yield [Object]
+  def each(&blk)
+    @values.each { | v | yield v }
+
+    # @labels.each_with_index do | label, idx |
+    #   yield label, @values[idx]
+    # end
+  end
+
+  # @return [String]
+  def inspect
+    strs = []
+    @labels.each do | col |
+      strs << "#{col}: #{self[col] || '(null)'}"
+    end
+    '[' + strs.join(', ') + ']'
+  end
+
+  # @return [Array]
+  def to_a
+    @values
+  end
+
+  # @return [String]
+  def join(sep = $,)
+    to_a.join(sep)
+  end
+
+  # @return [Boolean]
+  def eql?(other)
+    self.hash == other.hash
+  end
+
+  def hash # :nodoc:
+    @labels.zip(@values).sort.hash
+  end
+
+  alias :== :eql?
 
 private
-	def initialize(col_labels, col_labels_d, values, rownum) # :nodoc:
-		@labels = col_labels
-		@labels_d = col_labels_d
-		@values = values
-		@rownum = rownum
-
-		# @labels_d.each do | l |
-		# 	(class << self; self; end).instance_eval do
-		# 		define_method l do
-		# 			self[l]
-		# 		end
-		# 	end
-		# end
-	end
-
-	# Performs better than defining methods
-	def method_missing(symb, *args)
-		if vidx = @labels_d.index(symb.to_s.downcase)
-			begin
-				@values[vidx]
-			rescue NameError
-				raise NoMethodError.new("undefined method or attribute `#{symb}'")
-			end
-		elsif @values.respond_to?(symb)
-			@values.send(symb, *args)
-		else
-			raise NoMethodError.new("undefined method or attribute `#{symb}'")
-		end
-	end
-
-	# Remove dangerous default methods
-	# excluding :object_id, :hash
-	[:id, :tap, :gem, :display, :class, :method, :methods, :trust].
-	select { | s | method_defined? s }.each do | m |
-		undef_method m
-	end
+  def initialize(col_labels, col_labels_d, values, rownum) # :nodoc:
+    @labels = col_labels
+    @labels_d = col_labels_d
+    @values = values
+    @rownum = rownum
+
+    # @labels_d.each do | l |
+    #   (class << self; self; end).instance_eval do
+    #     define_method l do
+    #       self[l]
+    #     end
+    #   end
+    # end
+  end
+
+  # Performs better than defining methods
+  def method_missing(symb, *args)
+    if vidx = @labels_d.index(symb.to_s.downcase)
+      @values[vidx]
+    elsif @values.respond_to?(symb)
+      @values.send(symb, *args)
+    else
+      raise NoMethodError.new("undefined method or attribute `#{symb}'")
+    end
+  end
+
+  # Remove dangerous default methods
+  # excluding :object_id, :hash
+  [:id, :tap, :gem, :display, :class, :method, :methods, :trust].
+  select { | s | method_defined? s }.each do | m |
+    undef_method m
+  end
 end#Row
 end#Connection
 end#JDBCHelper

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

@@ -7,56 +7,56 @@ class Connection
 # Not thread-safe. (Sharing a JDBC connection between threads is not the best idea anyway.)
 # @private
 class StatementPool
-	def initialize(conn, max_size = 20)
-		@conn = conn
-		@max_size = max_size # TODO
-		@free = []
-		@occupied = []
-	end
+  def initialize(conn, max_size = JDBCHelper::Constants::MAX_STATEMENT_NESTING_LEVEL)
+    @conn = conn
+    @max_size = max_size # TODO
+    @free = []
+    @occupied = []
+  end
 
-	def with
-		begin
-			yield stmt = take
-		ensure
-			give stmt
-		end
-	end
+  def with
+    begin
+      yield stmt = take
+    ensure
+      give stmt
+    end
+  end
 
-	def take
-		if @free.empty?
-			raise Exception.new("Statement nesting level is too deep (likely a bug)") if
-					@occupied.length >= @max_size
-			@occupied << nstmt = @conn.send(:create_statement)
-			nstmt
-		else
-			stmt = @free.pop
-			@occupied << stmt
-			stmt
-		end
-	end
+  def take
+    if @free.empty?
+      raise RuntimeError.new("Statement nesting level is too deep (likely a bug)") if
+          @occupied.length >= @max_size
+      @occupied << nstmt = @conn.send(:create_statement)
+      nstmt
+    else
+      stmt = @free.pop
+      @occupied << stmt
+      stmt
+    end
+  end
 
-	def give(stmt)
-		raise Exception.new("Not my statement") unless
-				@occupied.include? stmt
+  def give(stmt)
+    return if stmt.nil?
+    raise Exception.new("Not my statement") unless @occupied.include? stmt
 
-		@occupied.delete stmt
-		@free << stmt
-	end
+    @occupied.delete stmt
+    @free << stmt
+  end
 
-	def close
-		(@free + @occupied).each do | stmt |
-			stmt.close
-		end
-		@conn = nil
-		@free = []
-		@occupied = []
-	end
+  def close
+    (@free + @occupied).each do | stmt |
+      stmt.close
+    end
+    @conn = nil
+    @free = []
+    @occupied = []
+  end
 
-	def each
-		(@free + @occupied).each do | stmt |
-			yield stmt
-		end
-	end
+  def each
+    (@free + @occupied).each do | stmt |
+      yield stmt
+    end
+  end
 end#StatementPool
 end#Connection
 end#JDBCHelper

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

@@ -3,72 +3,47 @@
 
 module JDBCHelper
 class Connection
-	RUBY_SQL_TYPE_MAP = {
-		Fixnum => java.sql.Types::INTEGER,
-		Bignum => java.sql.Types::BIGINT,
-		String => java.sql.Types::VARCHAR,
-		Float  => java.sql.Types::DOUBLE,
-		Time   => java.sql.Types::TIMESTAMP
-	}
-
-	SETTER_MAP =
-	{
-		Fixnum => :setInt,
-		String => :setString,
-		NilClass => :setNull,
-		Float => :setDouble,
-
-		# See there's a caveat. Check out ParameterizedStatement#set_param
-		Time => :setTimestamp,
-
-		Java::JavaSql::Date => :setDate,
-		Java::JavaSql::Time => :setTime,
-		Java::JavaSql::Timestamp => :setTimestamp,
-		Java::JavaSql::Blob => :setBinaryStream,
-
-		#########
-		# MySQL #
-		#########
-		# Only available when MySQL JDBC driver is loaded.
-		# So we use the string representation of the class.
-		'Java::ComMysqlJdbc::Blob' => :setBinaryStream
-
-		# FIXME-MORE
-	} # :nodoc:
-
-	GETTER_MAP =
-	{
-		java.sql.Types::TINYINT => :getInt,
-		java.sql.Types::SMALLINT => :getInt,
-		java.sql.Types::INTEGER => :getInt,
-		java.sql.Types::BIGINT => :getLong,
-
-		java.sql.Types::CHAR => :getString,
-		java.sql.Types::VARCHAR => :getString,
-		java.sql.Types::LONGVARCHAR => :getString,
-		(java.sql.Types::NCHAR        rescue nil) => :getString,
-		(java.sql.Types::NVARCHAR     rescue nil) => :getString,
-		(java.sql.Types::LONGNVARCHAR rescue nil) => :getBlob, # FIXME: MySQL
-		java.sql.Types::BINARY => :getString,
-		java.sql.Types::VARBINARY => :getString,
-		java.sql.Types::LONGVARBINARY => :getBlob,	# FIXME: MySQL
-
-		java.sql.Types::REAL => :getDouble,
-		java.sql.Types::FLOAT => :getFloat,
-		java.sql.Types::DOUBLE => :getDouble,
-		java.sql.Types::NUMERIC => :getString, # FIXME: get_big_decimal=no inherent jruby support
-		java.sql.Types::DECIMAL => :getString, # FIXME: get_big_decimal
-
-		java.sql.Types::DATE => :getDate,
-		java.sql.Types::TIME => :getTime,
-		java.sql.Types::TIMESTAMP => :getTimestamp,
-
-		java.sql.Types::BLOB => :getBlob,
-		java.sql.Types::CLOB => :getString,
-		(java.sql.Types::NCLOB rescue nil) => :getString,
-
-		java.sql.Types::BOOLEAN => :getBoolean
-	} # :nodoc:
+  RUBY_SQL_TYPE_MAP = {
+    Fixnum => java.sql.Types::INTEGER,
+    Bignum => java.sql.Types::BIGINT,
+    String => java.sql.Types::VARCHAR,
+    Float  => java.sql.Types::DOUBLE,
+    Time   => java.sql.Types::TIMESTAMP
+  }
+
+  GETTER_MAP =
+  {
+    java.sql.Types::TINYINT => :getInt,
+    java.sql.Types::SMALLINT => :getInt,
+    java.sql.Types::INTEGER => :getInt,
+    java.sql.Types::BIGINT => :getLong,
+
+    java.sql.Types::CHAR => :getString,
+    java.sql.Types::VARCHAR => :getString,
+    java.sql.Types::LONGVARCHAR => :getString,
+    (java.sql.Types::NCHAR        rescue nil) => :getString,
+    (java.sql.Types::NVARCHAR     rescue nil) => :getString,
+    (java.sql.Types::LONGNVARCHAR rescue nil) => :getBlob, # FIXME: MySQL
+    java.sql.Types::BINARY => :getString,
+    java.sql.Types::VARBINARY => :getString,
+    java.sql.Types::LONGVARBINARY => :getBlob,  # FIXME: MySQL
+
+    java.sql.Types::REAL => :getDouble,
+    java.sql.Types::FLOAT => :getFloat,
+    java.sql.Types::DOUBLE => :getDouble,
+    #java.sql.Types::NUMERIC => :getBigDecimal,
+    #java.sql.Types::DECIMAL => :getBigDecimal,
+
+    java.sql.Types::DATE => :getDate,
+    java.sql.Types::TIME => :getTime,
+    java.sql.Types::TIMESTAMP => :getTimestamp,
+
+    java.sql.Types::BLOB => :getBlob,
+    java.sql.Types::CLOB => :getString,
+    (java.sql.Types::NCLOB rescue nil) => :getString,
+
+    java.sql.Types::BOOLEAN => :getBoolean
+  } # :nodoc:
 end#Connection
 end#JDBCHelper
 

data/lib/jdbc-helper/connector.rb

@@ -2,16 +2,16 @@
 # Junegunn Choi (junegunn.c@gmail.com)
 
 module JDBCHelper
-	class Connector
-	private
-		def self.ensure_close conn
-			begin
-				yield conn
-			ensure
-				conn.close rescue nil
-			end
-		end
-	end#Connector
+  class Connector
+  private
+    def self.ensure_close conn
+      begin
+        yield conn
+      ensure
+        conn.close rescue nil
+      end
+    end
+  end#Connector
 end#JDBCHelper
 
 require 'jdbc-helper/connector/oracle_connector'