jdbc-helper 0.7.0 → 0.7.1

data/lib/jdbc-helper/connection.rb

@@ -425,7 +425,9 @@ class Connection
   end
 
   def inspect
-    InsensitiveHash[@args].merge({ :closed? => closed? }).delete(:password).inspect
+    InsensitiveHash[@args].merge({ :closed? => closed? }).tap { |c|
+      c.delete(:password)
+    }.inspect
   end
 
   # Statistics
@@ -433,10 +435,10 @@ class Connection
     attr_accessor :type, :elapsed, :success_count, :fail_count
 
     def initialize(t, e, s, f)
-      self.type = t
-      self.elapsed = e
+      self.type          = t
+      self.elapsed       = e
       self.success_count = s
-      self.fail_count = f
+      self.fail_count    = f
     end
   end
 
@@ -494,21 +496,21 @@ private
   end
 
   def update_stat(type, elapsed, success_count, fail_count) # :nodoc:
-    @prev_stat.type = type
-    @prev_stat.elapsed = elapsed
+    @prev_stat.type          = type
+    @prev_stat.elapsed       = elapsed
     @prev_stat.success_count = success_count
-    @prev_stat.fail_count = fail_count
+    @prev_stat.fail_count    = fail_count
 
-    accum = @stats[type]
-    accum.elapsed += elapsed
+    accum                = @stats[type]
+    accum.elapsed       += elapsed
     accum.success_count += success_count
-    accum.fail_count += fail_count
+    accum.fail_count    += fail_count
   end
 
   def measure_exec(type)
     begin
-      st = Time.now
-      ret = yield
+      st      = Time.now
+      ret     = yield
       elapsed = Time.now - st
       update_stat(type, elapsed, 1, 0)
     rescue Exception

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

@@ -19,8 +19,8 @@ class CallableStatement < ParameterizedStatement
 
     result = {}
     out_params.each do |idx, jtype|
-      getter = JDBCHelper::Connection::GETTER_MAP.fetch(jtype, :get_string)
-      value = @java_obj.send(getter, idx.is_a?(Symbol) ? idx.to_s : idx)
+      getter      = JDBCHelper::Connection::GETTER_MAP.fetch(jtype, :get_string)
+      value       = @java_obj.send(getter, idx.is_a?(Symbol) ? idx.to_s : idx)
       result[idx] = @java_obj.was_null ? nil : value
     end
     result

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

@@ -16,8 +16,8 @@ class ParameterizedStatement
   # @param [JDBCHelper::Connection] conn
   # @param [String] cstmt_str
   def initialize(conn, sql, obj)
-    @conn = conn
-    @sql = sql
+    @conn     = conn
+    @sql      = sql
     @java_obj = obj
   end
 

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

@@ -72,12 +72,12 @@ private
     end
 
     @close_callback = close_callback
-    @rset = rset
-    @rsmd = @rset.get_meta_data
-    @num_col = @rsmd.get_column_count
-    @getters = []
-    @col_labels = []
-    @col_labels_d = []
+    @rset           = rset
+    @rsmd           = @rset.get_meta_data
+    @num_col        = @rsmd.get_column_count
+    @getters        = []
+    @col_labels     = []
+    @col_labels_d   = []
     (1..@num_col).each do | i |
       type = @rsmd.get_column_type(i)
 

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

@@ -101,10 +101,10 @@ class Row
 
 private
   def initialize(col_labels, col_labels_d, values, rownum) # :nodoc:
-    @labels = col_labels
+    @labels   = col_labels
     @labels_d = col_labels_d
-    @values = values
-    @rownum = rownum
+    @values   = values
+    @rownum   = rownum
 
     # @labels_d.each do | l |
     #   (class << self; self; end).instance_eval do

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

@@ -8,9 +8,9 @@ class Connection
 # @private
 class StatementPool
   def initialize(conn, max_size = JDBCHelper::Constants::MAX_STATEMENT_NESTING_LEVEL)
-    @conn = conn
+    @conn     = conn
     @max_size = max_size # TODO
-    @free = []
+    @free     = []
     @occupied = []
   end
 
@@ -49,8 +49,8 @@ class StatementPool
     (@free + @occupied).each do | stmt |
       stmt.close
     end
-    @conn = nil
-    @free = []
+    @conn     = nil
+    @free     = []
     @occupied = []
   end
 

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

@@ -13,36 +13,36 @@ class Connection
 
   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::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) => :getString,
 
     # !! MySQL function returns VARBINARY type
-    java.sql.Types::BINARY        => :getBinaryStream,
-    java.sql.Types::VARBINARY     => :getBinaryStream,
-    java.sql.Types::LONGVARBINARY => :getBinaryStream,
+    java.sql.Types::BINARY             => :getBinaryStream,
+    java.sql.Types::VARBINARY          => :getBinaryStream,
+    java.sql.Types::LONGVARBINARY      => :getBinaryStream,
 
-    java.sql.Types::REAL => :getDouble,
-    java.sql.Types::FLOAT => :getFloat,
-    java.sql.Types::DOUBLE => :getDouble,
+    java.sql.Types::REAL               => :getDouble,
+    java.sql.Types::FLOAT              => :getFloat,
+    java.sql.Types::DOUBLE             => :getDouble,
 
-    java.sql.Types::DATE => :getDate,
-    java.sql.Types::TIME => :getTime,
-    java.sql.Types::TIMESTAMP => :getTimestamp,
+    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::BLOB               => :getBlob,
+    java.sql.Types::CLOB               => :getString,
     (java.sql.Types::NCLOB rescue nil) => :getString,
 
-    java.sql.Types::BOOLEAN => :getBoolean
+    java.sql.Types::BOOLEAN            => :getBoolean
   } # :nodoc:
 end#Connection
 end#JDBCHelper

data/lib/jdbc-helper/constants.rb

@@ -12,19 +12,20 @@ module Constants
   # Constants only for Connectors
   module Connector
     JDBC_DRIVER = {
-      :oracle => 'oracle.jdbc.driver.OracleDriver',
-      :mysql  => 'com.mysql.jdbc.Driver',
-      :postgres => 'org.postgresql.Driver',
+      :oracle    => 'oracle.jdbc.driver.OracleDriver',
+      :mysql     => 'com.mysql.jdbc.Driver',
+      :postgres  => 'org.postgresql.Driver',
       :sqlserver => 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     }
 
     DEFAULT_PARAMETERS = {
       :mysql => {
         'zeroDateTimeBehavior' => 'convertToNull',
-        # Removed from 0.6.3: This can have a performance hit when batch size is large
+        # Removed from 0.6.3: 
+        #  This can have a performance hit when batch size is large
         # 'rewriteBatchedStatements' => 'true',
-        'useServerPrepStmts' => 'true',
-        'useCursorFetch' => 'true'
+        'useServerPrepStmts'   => 'true',
+        'useCursorFetch'       => 'true'
       },
       :postgres => {
         'stringtype' => 'unspecified'

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

@@ -77,9 +77,8 @@ class SQLPrepared < JDBCHelper::SQL
 
   private
   def self.where_internal conds
-    conds = [conds] unless conds.is_a? Array
-
-    binds = []
+    conds   = [conds] unless conds.is_a? Array
+    binds   = []
     clauses = []
     conds.compact.each do |cond| 
       c, b = where_unit cond 
@@ -157,7 +156,7 @@ class SQLPrepared < JDBCHelper::SQL
   end
 
   def self.insert_internal cmd, table, data_hash
-    binds = []
+    binds  = []
     values = data_hash.values.map { |v|
       case v
       when JDBCHelper::SQL::ScalarExpression

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

@@ -19,12 +19,12 @@ class SequenceWrapper < ObjectWrapper
     super conn, name
 
     case conn.driver
-    when /oracle/
-      @nextval_sql = "select #{name}.nextval from dual"
-      @currval_sql = "select #{name}.currval from dual"
-    else
+    when /postgres/
       @nextval_sql = "select nextval('#{name}')"
       @currval_sql = "select currval('#{name}')"
+    else
+      @nextval_sql = "select #{name}.nextval from dual"
+      @currval_sql = "select #{name}.currval from dual"
     end
   end
 

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

@@ -98,9 +98,9 @@ class TableWrapper < ObjectWrapper
   #   :where element of the given hash can (usually should) point to another Hash representing update filters.
   # @return [Fixnum] Number of affected records
   def update data_hash_with_where = {}
-    where_ext = data_hash_with_where.delete(:where)
-    where_ext = [where_ext] unless where_ext.is_a? Array
-    sql, binds = JDBCHelper::SQLPrepared.update(name, 
+    where_ext  = data_hash_with_where.delete(:where)
+    where_ext  = [where_ext] unless where_ext.is_a? Array
+    sql, binds = JDBCHelper::SQLPrepared.update(name,
                     @query_default.merge(data_hash_with_where),
                     @query_where + where_ext.compact)
     pstmt = prepare :update, sql

data/test/database.yml

@@ -1,28 +1,28 @@
 ---
 mysql:
-    driver: com.mysql.jdbc.Driver
-    url: jdbc:mysql://localhost/test
-    database: test
-    user: root
-    password:
-    timeout: 5
-    useServerPrepStmts: true
+  driver:    com.mysql.jdbc.Driver
+  url:       jdbc:mysql://localhost/test
+  database:  test
+  user:      root
+  password:
+  timeout:   5
+  useServerPrepStmts: true
 
 postgres:
-    driver: org.postgresql.Driver
-    url: jdbc:postgresql://localhost/test?stringtype=unspecified
-    database: test
-    timeout: 5
+  driver:    org.postgresql.Driver
+  url:       jdbc:postgresql://localhost/test?stringtype=unspecified
+  database:  test
+  timeout:   5
 
 oracle:
-    driver: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@localhost/svc
-    database: test
-    user: testuser
-    password: testpassword
+  driver:    oracle.jdbc.driver.OracleDriver
+  url:       jdbc:oracle:thin:@localhost/svc
+  database:  test
+  user:      testuser
+  password:  testpassword
 
 sqlserver:
-  driver: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  url: jdbc:sqlserver://localhost;databaseName=test;
-  user: test
-  password: test
+  driver:    com.microsoft.sqlserver.jdbc.SQLServerDriver
+  url:       jdbc:sqlserver://localhost;databaseName=test;
+  user:      test
+  password:  test

data/test/database.yml.local

@@ -1,31 +1,31 @@
 ---
 mysql:
-  driver: com.mysql.jdbc.Driver
-  url: jdbc:mysql://localhost/test
-  database: test
-  user: root
+  driver:              com.mysql.jdbc.Driver
+  url:                 jdbc:mysql://localhost/test
+  database:            test
+  user:                root
   password:
-  timeout: 5
-  useServerPrepStmts: true
+  timeout:             5
+  useServerPrepStmts:  true
 
 oracle:
-  driver: oracle.jdbc.driver.OracleDriver
-  url: jdbc:oracle:thin:@10.20.253.105/didev
-  database: wisefn
-  user: wisefn
-  password: wisefndb
-  timeout: 5
+  driver:              oracle.jdbc.driver.OracleDriver
+  url:                 jdbc:oracle:thin:@10.20.253.105/didev
+  database:            wisefn
+  user:                wisefn
+  password:            wisefndb
+  timeout:             5
 
 postgres:
-  driver: org.postgresql.Driver
-  url: jdbc:postgresql://localhost/test
-  database: test
-  timeout: 5
-  stringtype: unspecified
+  driver:              org.postgresql.Driver
+  url:                 jdbc:postgresql://localhost/test
+  database:            test
+  timeout:             5
+  stringtype:          unspecified
 
 sqlserver:
-  driver: com.microsoft.sqlserver.jdbc.SQLServerDriver
-  url: jdbc:sqlserver://192.168.60.69;databaseName=gunn_db;
-  user: gunn
-  password: gunn
+  driver:              com.microsoft.sqlserver.jdbc.SQLServerDriver
+  url:                 jdbc:sqlserver://192.168.62.26;databaseName=gunn_db;
+  user:                gunn
+  password:            gunn
 

data/test/test_connection.rb

@@ -72,6 +72,22 @@ class TestConnection < Test::Unit::TestCase
     }
   end
 
+  def test_inspect
+    config.each do | db, conn_info_org |
+      conn_info = conn_info_org.reject { |k,v| k == 'database' }
+      conn = JDBCHelper::Connection.new(conn_info)
+      insp = InsensitiveHash[ eval( conn.inspect.gsub('=>', ' => ') ) ]
+
+      conn_info.each do |k, v|
+        if k == 'password'
+          assert_nil insp[k]
+        else
+          assert_equal v, insp[k]
+        end
+      end
+    end
+  end
+
   def test_connect_clone_and_close
     config.each do | db, conn_info_org |
       4.times do | i |

metadata

@@ -2,7 +2,7 @@
 name: jdbc-helper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
   - Junegunn Choi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-01 00:00:00 Z
+date: 2012-02-28 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: insensitive_hash
@@ -19,7 +19,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "0.2"
+            version: 0.2.3
     requirement: *id001
     prerelease: false
     type: :runtime