jdbc-helper 0.7.3 → 0.7.4

data/test/test_connection.rb

@@ -74,7 +74,7 @@ class TestConnection < Test::Unit::TestCase
 
   def test_inspect
     config.each do | db, conn_info_org |
-      conn_info = conn_info_org.reject { |k,v| k == 'database' }
+      conn_info = conn_info_org.reject { |k,v| k == 'database' }.insensitive
       conn = JDBCHelper::Connection.new(conn_info)
       insp = InsensitiveHash[ eval( conn.inspect.gsub('=>', ' => ') ) ]
 
@@ -91,10 +91,10 @@ class TestConnection < Test::Unit::TestCase
   def test_connect_clone_and_close
     config.each do | db, conn_info_org |
       4.times do | i |
-        conn_info = conn_info_org.reject { |k,v| k == 'database' }
+        conn_info = conn_info_org.reject { |k,v| k == 'database' }.insensitive
 
         # With or without timeout parameter
-        conn_info['timeout'] = 60 if i % 2 == 1
+        conn_info[:timeout] = 60 if i % 2 == 1
 
         # Can connect with hash with symbol keys?
         conn_info.keys.each do | str_key |
@@ -107,8 +107,8 @@ class TestConnection < Test::Unit::TestCase
         conn_info.freeze # Non-modifiable!
         conn = JDBCHelper::Connection.new(conn_info)
         assert_equal(conn.closed?, false)
-        assert_equal(conn.driver, conn_info[:driver] || conn_info['driver'])
-        assert_equal(conn.url, conn_info[:url] || conn_info['url'])
+        assert_equal(conn.driver, conn_info[:driver])
+        assert_equal(conn.url, conn_info[:url])
 
         conn.fetch_size = 100
         assert_equal 100, conn.fetch_size
@@ -135,9 +135,11 @@ class TestConnection < Test::Unit::TestCase
           c2 = c.clone
           assert c2.java_obj != c.java_obj
 
-          c.query('select 1 from dual')
-          c2.query('select 1 from dual')
-          drop_dual! c
+          unless conn_info[:driver] =~ /cassandra/
+            c.query('select 1 from dual')
+            c2.query('select 1 from dual')
+            drop_dual! c
+          end
 
           assert_equal c.closed?, false
 

data/test/test_connectors.rb

@@ -9,8 +9,104 @@ class TestConnectors < Test::Unit::TestCase
   def teardown
   end
 
+  def test_new_connectors
+    config.each do |db, conn_info|
+      case conn_info['driver']
+      when /cassandra/
+        conn = JDBCHelper::Cassandra.connect(conn_info[:host], conn_info['keyspace'])
+        assert conn.closed? == false
+        conn.close
+        assert conn.closed?
+      when /mysql/
+        host = conn_info['url'].match(%r{//(.*?)/?})[1]
+        db = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
+
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQL.connect(host, conn_info['user'], conn_info['password'], db, 0)
+        }
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQL.connect(host, conn_info['user'], conn_info['password'], db, -1)
+        }
+        assert_raise(ArgumentError) {
+          JDBCHelper::MySQL.connect(host, conn_info['user'], conn_info['password'], db, "hash")
+        }
+
+        conn = JDBCHelper::MySQL.connect(host, conn_info['user'], conn_info['password'], db, { :timeout => 60 })
+
+        assert conn.closed? == false
+        conn.close
+        assert conn.closed?
+
+        @conn = nil
+        ret = JDBCHelper::MySQL.connect(host, conn_info['user'], conn_info['password'], db) do |conn|
+          assert conn.closed? == false
+          @conn = conn
+          1
+        end
+        assert @conn.closed?
+        assert_equal 1, ret
+      when /postgres/
+        host = conn_info['url'].match(%r{//([^/?]+)})[1]
+        db = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
+
+        conn = JDBCHelper::Postgres.connect(host, conn_info['user'], conn_info['password'], db)
+
+        assert conn.closed? == false
+        conn.close
+        assert conn.closed?
+
+        @conn = nil
+        ret = JDBCHelper::PostgreSQL.connect(host, conn_info['user'], conn_info['password'], db) do |conn|
+          assert conn.closed? == false
+          @conn = conn
+          1
+        end
+        assert @conn.closed?
+        assert_equal 1, ret
+      when /sqlserver/
+        host = conn_info['url'].match(%r{//([^;]+)})[1]
+        db = conn_info['url'].match(%r{databaseName=([^;]+)})[1]
+
+        conn = JDBCHelper::SqlServer.connect(host, conn_info['user'], conn_info['password'], db)
+
+        assert conn.closed? == false
+        conn.close
+        assert conn.closed?
+
+        @conn = nil
+        ret = JDBCHelper::MSSQL.connect(host, conn_info['user'], conn_info['password'], db) do |conn|
+          assert conn.closed? == false
+          @conn = conn
+          1
+        end
+        assert @conn.closed?
+        assert_equal 1, ret
+      when /oracle/
+        host = conn_info['url'].match(%r{@(.*?)/})[1]
+        svc = conn_info['url'].match(%r{/([^/?]*?)(\?.*)?$})[1]
+        conn = JDBCHelper::Oracle.connect(host, conn_info['user'], conn_info['password'], svc)
+        conn2 = JDBCHelper::Oracle.connect_by_sid(host + ':1521', conn_info['user'], conn_info['password'], svc)
+
+        [conn, conn2].each do |c|
+          assert c.closed? == false
+          c.close
+          assert c.closed?
+        end
+
+        @conn = nil
+        ret = JDBCHelper::Oracle.connect(host, conn_info['user'], conn_info['password'], svc) do |conn|
+          assert conn.closed? == false
+          @conn = conn
+          1
+        end
+        assert @conn.closed?
+        assert_equal 1, ret
+      end
+    end
+  end
+
   def test_connectors
-    config.each do | db, conn_info |
+    config.each do |db, conn_info|
       case conn_info['driver']
       when /mysql/
         host = conn_info['url'].match(%r{//(.*?)/?})[1]

metadata

@@ -1,174 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jdbc-helper
-version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.7.3
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.7.4
 platform: ruby
-authors:
-- Junegunn Choi
-autorequire:
+authors: 
+  - Junegunn Choi
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: insensitive_hash
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.3
-    none: false
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.2
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: rcov
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-    none: false
-  prerelease: false
-  type: :development
+
+date: 2012-07-09 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: insensitive_hash
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.2.4
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bundler
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.1.4
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: rcov
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "0.9"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: test-unit
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.3.0
+    type: :development
+    version_requirements: *id004
 description: A JDBC helper for JRuby/Database developers.
-email: junegunn.c@gmail.com
+email: 
+  - junegunn.c@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.markdown
-files:
-- lib/jdbc-helper.rb
-- lib/jdbc-helper/connection.rb
-- lib/jdbc-helper/connection/callable_statement.rb
-- lib/jdbc-helper/connection/parameterized_statement.rb
-- lib/jdbc-helper/connection/prepared_statement.rb
-- lib/jdbc-helper/connection/result_set_enumerator.rb
-- lib/jdbc-helper/connection/row.rb
-- lib/jdbc-helper/connection/statement_pool.rb
-- lib/jdbc-helper/connection/type_map.rb
-- lib/jdbc-helper/connector.rb
-- lib/jdbc-helper/connector/mysql_connector.rb
-- lib/jdbc-helper/connector/oracle_connector.rb
-- lib/jdbc-helper/connector/postgres_connector.rb
-- lib/jdbc-helper/connector/sql_server_connector.rb
-- lib/jdbc-helper/constants.rb
-- lib/jdbc-helper/sql/expression.rb
-- lib/jdbc-helper/sql/sql.rb
-- lib/jdbc-helper/sql/sql_prepared.rb
-- lib/jdbc-helper/wrapper/function_wrapper.rb
-- lib/jdbc-helper/wrapper/object_wrapper.rb
-- lib/jdbc-helper/wrapper/procedure_wrapper.rb
-- lib/jdbc-helper/wrapper/sequence_wrapper.rb
-- lib/jdbc-helper/wrapper/table_wrapper.rb
-- LICENSE.txt
-- README.markdown
-- test/database.yml
-- test/database.yml.local
-- test/helper.rb
-- test/performance.rb
-- test/test_connection.rb
-- test/test_connectors.rb
-- test/test_object_wrapper.rb
-- test/test_sql.rb
-- test/testrb
-homepage: http://github.com/junegunn/jdbc-helper
-licenses:
-- MIT
-post_install_message:
+
+extra_rdoc_files: []
+
+files: 
+  - .gitignore
+  - CHANGELOG.markdown
+  - Gemfile
+  - LICENSE.txt
+  - README.markdown
+  - Rakefile
+  - VERSION
+  - jdbc-helper.gemspec
+  - lib/jdbc-helper.rb
+  - lib/jdbc-helper/connection.rb
+  - lib/jdbc-helper/connection/callable_statement.rb
+  - lib/jdbc-helper/connection/parameterized_statement.rb
+  - lib/jdbc-helper/connection/prepared_statement.rb
+  - lib/jdbc-helper/connection/result_set_enumerator.rb
+  - lib/jdbc-helper/connection/row.rb
+  - lib/jdbc-helper/connection/statement_pool.rb
+  - lib/jdbc-helper/connection/type_map.rb
+  - lib/jdbc-helper/connector.rb
+  - lib/jdbc-helper/connector/cassandra.rb
+  - lib/jdbc-helper/connector/mssql.rb
+  - lib/jdbc-helper/connector/mysql.rb
+  - lib/jdbc-helper/connector/oracle.rb
+  - lib/jdbc-helper/connector/postgresql.rb
+  - lib/jdbc-helper/constants.rb
+  - lib/jdbc-helper/sql/expression.rb
+  - lib/jdbc-helper/sql/sql.rb
+  - lib/jdbc-helper/sql/sql_prepared.rb
+  - lib/jdbc-helper/version.rb
+  - lib/jdbc-helper/wrapper/function_wrapper.rb
+  - lib/jdbc-helper/wrapper/object_wrapper.rb
+  - lib/jdbc-helper/wrapper/procedure_wrapper.rb
+  - lib/jdbc-helper/wrapper/sequence_wrapper.rb
+  - lib/jdbc-helper/wrapper/table_wrapper.rb
+  - test/database.yml
+  - test/helper.rb
+  - test/performance.rb
+  - test/test_connection.rb
+  - test/test_connectors.rb
+  - test/test_object_wrapper.rb
+  - test/test_sql.rb
+  - test/testrb
+homepage: https://github.com/junegunn/jdbc-helper
+licenses: []
+
+post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
-      version: '0'
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.21
-signing_key:
+
+rubyforge_project: 
+rubygems_version: 1.8.24
+signing_key: 
 specification_version: 3
 summary: A JDBC helper for JRuby/Database developers.
-test_files:
-- test/database.yml
-- test/database.yml.local
-- test/helper.rb
-- test/performance.rb
-- test/test_connection.rb
-- test/test_connectors.rb
-- test/test_object_wrapper.rb
-- test/test_sql.rb
-- test/testrb
-...
+test_files: 
+  - test/database.yml
+  - test/helper.rb
+  - test/performance.rb
+  - test/test_connection.rb
+  - test/test_connectors.rb
+  - test/test_object_wrapper.rb
+  - test/test_sql.rb
+  - test/testrb

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

@@ -1,37 +0,0 @@
-# encoding: UTF-8
-# Junegunn Choi (junegunn.c@gmail.com)
-
-module JDBCHelper
-# Shortcut connector for MySQL
-class MySQLConnector < Connector
-  include Constants
-  include Constants::Connector
-
-  # @param [String] host
-  # @param [String] user
-  # @param [String] password
-  # @param [String] db
-  # @param [Fixnum] timeout
-  # @param [Hash] extra_params
-  # @return [JDBCHelper::Connection]
-  def self.connect(host, user, password, db,
-           timeout = DEFAULT_LOGIN_TIMEOUT, 
-           extra_params = DEFAULT_PARAMETERS[:mysql], &block)
-
-    if extra_params && extra_params.is_a?(Hash) == false
-      raise ArgumentError.new('extra_params must be a hash')
-    end
-
-    conn = Connection.new(
-      (extra_params || {}).merge(
-        :driver   => JDBC_DRIVER[:mysql],
-        :url      => "jdbc:mysql://#{host}/#{db}",
-        :user     => user,
-        :password => password,
-        :timeout  => timeout))
-
-    block_given? ? ensure_close(conn, &block) : conn
-  end
-end#MySQLConnector
-end#JDBCHelper
-

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

@@ -1,46 +0,0 @@
-# encoding: UTF-8
-# Junegunn Choi (junegunn.c@gmail.com)
-
-module JDBCHelper
-# Shortcut connector for Oracle
-class OracleConnector < Connector
-  include Constants
-  include Constants::Connector
-
-  # @param [String] host
-  # @param [String] user
-  # @param [String] password
-  # @param [String] service_name
-  # @param [Fixnum] timeout
-  # @return [JDBCHelper::Connection]
-  def self.connect(host, user, password, service_name, timeout = DEFAULT_LOGIN_TIMEOUT, &block)
-    conn = Connection.new(
-      :driver   => JDBC_DRIVER[:oracle],
-      :url      => "jdbc:oracle:thin:@#{host}/#{service_name}",
-      :user     => user,
-      :password => password,
-      :timeout  => timeout)
-
-    block_given? ? ensure_close(conn, &block) : conn
-  end
-
-  # @param [String] host
-  # @param [String] user
-  # @param [String] password
-  # @param [String] sid
-  # @param [Fixnum] timeout
-  # @return [JDBCHelper::Connection]
-  # @deprecated
-  def self.connect_by_sid(host, user, password, sid, timeout = DEFAULT_LOGIN_TIMEOUT, &block)
-    conn = Connection.new(
-      :driver   => JDBC_DRIVER[:oracle],
-      :url      => "jdbc:oracle:thin:@#{host}:#{sid}",
-      :user     => user,
-      :password => password,
-      :timeout  => timeout)
-
-    block_given? ? ensure_close(conn, &block) : conn
-  end
-end#OracleConnector
-end#JDBCHelper
-

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

@@ -1,37 +0,0 @@
-# encoding: UTF-8
-# Junegunn Choi (junegunn.c@gmail.com)
-
-module JDBCHelper
-# Shortcut connector for PostgreSQL
-class PostgresConnector < Connector
-  include Constants
-  include Constants::Connector
-
-  # @param [String] host
-  # @param [String] user
-  # @param [String] password
-  # @param [String] db
-  # @param [Fixnum] timeout
-  # @param [Hash] extra_params
-  # @return [JDBCHelper::Connection]
-  def self.connect(host, user, password, db,
-           timeout = DEFAULT_LOGIN_TIMEOUT, 
-           extra_params = DEFAULT_PARAMETERS[:postgres], &block)
-
-    if extra_params && extra_params.is_a?(Hash) == false
-      raise ArgumentError.new('extra_params must be a hash')
-    end
-
-    conn = Connection.new(
-      (extra_params || {}).merge(
-        :driver   => JDBC_DRIVER[:postgres],
-        :url      => "jdbc:postgresql://#{host}/#{db}",
-        :user     => user,
-        :password => password,
-        :timeout  => timeout))
-
-    block_given? ? ensure_close(conn, &block) : conn
-  end
-end#PostgresConnector
-end#JDBCHelper
-

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

@@ -1,37 +0,0 @@
-# encoding: UTF-8
-# Junegunn Choi (junegunn.c@gmail.com)
-
-module JDBCHelper
-# Shortcut connector for MS SQL Server
-class SqlServerConnector < Connector
-  include Constants
-  include Constants::Connector
-
-  # @param [String] host
-  # @param [String] user
-  # @param [String] password
-  # @param [String] db
-  # @param [Fixnum] timeout
-  # @param [Hash] extra_params
-  # @return [JDBCHelper::Connection]
-  def self.connect(host, user, password, db,
-           timeout = DEFAULT_LOGIN_TIMEOUT, 
-           extra_params = DEFAULT_PARAMETERS[:sqlserver], &block)
-
-    if extra_params && extra_params.is_a?(Hash) == false
-      raise ArgumentError.new('extra_params must be a hash')
-    end
-
-    conn = Connection.new(
-      (extra_params || {}).merge(
-        :driver   => JDBC_DRIVER[:sqlserver],
-        :url      => "jdbc:sqlserver://#{host};databaseName=#{db};",
-        :user     => user,
-        :password => password,
-        :timeout  => timeout))
-
-    block_given? ? ensure_close(conn, &block) : conn
-  end
-end#SqlServerConnector
-end#JDBCHelper
-

data/test/database.yml.local

@@ -1,31 +0,0 @@
----
-mysql:
-  driver:              com.mysql.jdbc.Driver
-  url:                 jdbc:mysql://localhost/test
-  database:            test
-  user:                root
-  password:
-  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
-
-postgres:
-  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.62.26;databaseName=gunn_db;
-  user:                gunn
-  password:            gunn
-