activerecord-jdbcas400-adapter 1.3.4.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a2f589bbef0c6ebf994f087073259370f60d94c
-  data.tar.gz: ea1385770076b6e7da580fd2baf2726ac4f5913d
+  metadata.gz: a2398fc7c8bad7ce1d3253f2e0f6a4a7b20d0ead
+  data.tar.gz: 413c9f4b32caf45437b3acb22a5352159af1c152
 SHA512:
-  metadata.gz: 43a5eb147ee4b0030cd020eb2fee2fb405d60272f6fcc830fd878b95ceca1d8d976f042165ddc28c52a78e4163ec926024873e7f1cb0068be4e6da153225bbe2
-  data.tar.gz: 6d123bdf7d6c49dddb2aa9b7e8f991f2fd669c6800f4e924e42ebbc7f1c87a33acb8c2f54abe8cde8a6888bf24075e8725a418ab4ff933c17ebba3915debac25
+  metadata.gz: 6cacc8de3cf7d3b33e607007d5cbdd5d9b55dd6bb9cb358be734637076852d75ffb95bf2cea112bc7ee46817580ee4ce00261ed097073cb6674f5109028665f5
+  data.tar.gz: b57c5cb53826fa1d07a54576b9eae158e08f40fd348b58dd75f80814d9aad8c1718fb0d81a75a942779dd57e0d53c5c658295e8b885f8d7e8dbc0bf24b1e7c09

data/README.md

@@ -39,12 +39,37 @@ If your DB isn't correctly discovered you can specify the dialect:
 To allow migrations with system naming, a configuration is added to adapter:
 
 ```yml
-current_library: lib
+  current_library: lib
 ```
 
 The specified library will be used to define a schema during create_table migration.
 It prevents creation of a table in QGPL.
 
+If you want to use it with JNDI you can create a JNDI string and use erb in yaml to do something like this:
+
+```yml
+<%
+require 'java'
+current_library = Java::JavaxNaming::InitialContext.new.lookup('java:comp/env/currentLibrary').to_s if Rails.env.production?
+%>
+
+production:
+  adapter: as400
+  jndi: jdbc/dataSource
+  current_library: <%=current_library%>
+```
+
+## Connection pool
+Websphere Application Server for i provides data sources with connection pool.
+Rails has it's own connection pool management. To make them compatible you should define:
+
+  * Connection timeout: 0
+  * Maximum connections: 5 (default) or same as rails configuration
+  * Minimum connections: 0 to Maximum connections
+  * Reap time: 0
+  * Unused timeout: 0
+  * Aged timeout: 0
+
 ## Compatibility
 
 Actually activerecord-jdbcas400-adapter is only compatible with IBM i V6R1 and later versions.

data/test/test_helper.rb

@@ -1,11 +1,7 @@
 require 'java'
 
-begin
-  require 'bundler'
-rescue LoadError => e
-  require('rubygems') && retry
-  raise e
-end
+require 'rubygems'
+require 'bundler/setup'
 Bundler.require(:default, :test)
 
 class Test::Unit::TestCase
@@ -16,6 +12,13 @@ class Test::Unit::TestCase
 
   def data_source_connection
     return @connection if @connection && @connection_type == 'data_source'
+
+    begin
+      require 'jdbc/as400'
+      ::Jdbc::AS400.load_driver(:require) if defined?(::Jdbc::AS400.load_driver)
+    rescue LoadError # assuming driver.jar is on the class-path
+    end
+
     # Create a data source to the iSeries database.
     datasource = com.ibm.as400.access.AS400JDBCDataSource.new
     datasource.setServerName(config[:host])

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.4.3
+  version: 1.3.5
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: 1.3.5
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.5
+  prerelease: false
+  type: :runtime
 description: Install this gem to use AS/400 with JRuby on Rails.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
@@ -33,12 +33,12 @@ files:
 - Rakefile
 - README.md
 - LICENSE.txt
-- lib/active_record/connection_adapters/as400_adapter.rb
 - lib/activerecord-jdbcas400-adapter.rb
-- lib/arjdbc/as400/adapter.rb
-- lib/arjdbc/as400/connection_methods.rb
+- lib/active_record/connection_adapters/as400_adapter.rb
 - lib/arjdbc/as400.rb
 - lib/arjdbc/discover.rb
+- lib/arjdbc/as400/adapter.rb
+- lib/arjdbc/as400/connection_methods.rb
 - test/config.yml
 - test/test_connection.rb
 - test/test_database_tasks.rb
@@ -47,7 +47,7 @@ homepage: https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jruby-extras
-rubygems_version: 2.0.14
-signing_key: 
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: AS/400 JDBC adapter for JRuby on Rails.
 test_files: