activerecord-jdbcas400-adapter 1.3.4.1 → 1.3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17117e85ff715297a6f0eae81bc6396bf42e37f0
-  data.tar.gz: 7ec82609586834ec4a759e751a1c9da610b601fa
+  metadata.gz: db46adedfc6af99ae702410e95165bdc5d4f265f
+  data.tar.gz: cfe0595abb8d7615c931fba9ad6d023bf77afe18
 SHA512:
-  metadata.gz: 10cddd83ee5fc0ce0e5dc03465259726be5d619278c46decd8fd3522d53ea45d419acb55f4355aea01091ccc300e5481a819e875b57bdb7fba9405b58f50acce
-  data.tar.gz: 02982ff31b1d1a7ebe2cc6ce37be72fa72c8a34f26718fad50b63cfe45ed5cc2c54d821eb18ea052f5a877bc7794fd8b71dc66f2152344c2575b49298377697e
+  metadata.gz: 79ee6fd3f690309158c8aa3f8132c1f86517f71eb9187d028005d28f201b9d52c27e4f25105057d3c782b4d9c82870eab86c6facbaddc4dd4d9d0b7e495c5321
+  data.tar.gz: fe1a6897bf5510aa0f99873faf909f00136e784ea046c8da39ff335bc3442c7965f9d242ab91b7f233ab0bd232ca26bc64c386233e05e22f40b8001b19b2d813

data/README.md

@@ -15,13 +15,18 @@ development:
   database: development
   username: user
   password: 1234
+
+  naming: sql
+
+  # This is possible only if naming=system and schema isn't defined
+  libraries: lib1,lib2,lib3
 ```
 
 You cas also use JNDI in production mode:
 ```yml
 production:
   adapter: jndi # jdbc
-  jndi: jdbc/DataSource
+  jndi: jdbc/dataSource
 ```
 
 If your DB isn't correctly discovered you can specify the dialect:

data/lib/arjdbc/as400/adapter.rb

@@ -60,8 +60,8 @@ module ArJdbc
     def execute_and_auto_confirm(sql, name = nil)
 
       begin
-        @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)',0000000031.00000)"
-        @connection.execute_update "call qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')',0000000045.00000)"
+        @connection.execute_update "CALL qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)', 0000000031.00000)"
+        @connection.execute_update "CALL qsys.qcmdexc('ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY(''I'')', 0000000045.00000)"
       rescue Exception => e
         raise "Could not call CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I').\n" +
               "Do you have authority to do this?\n\n#{e.inspect}"
@@ -78,8 +78,8 @@ module ArJdbc
 
         # Ensure default configuration restoration
         begin
-          @connection.execute_update "call qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)',0000000027.00000)"
-          @connection.execute_update "call qsys.qcmdexc('RMVRPYLE SEQNBR(9876)',0000000021.00000)"
+          @connection.execute_update "CALL qsys.qcmdexc('QSYS/CHGJOB INQMSGRPY(*DFT)', 0000000027.00000)"
+          @connection.execute_update "CALL qsys.qcmdexc('RMVRPYLE SEQNBR(9876)', 0000000021.00000)"
         rescue Exception => e
           raise "Could not call CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876).\n" +
                     "Do you have authority to do this?\n\n#{e.inspect}"
@@ -89,46 +89,44 @@ module ArJdbc
     end
     private :execute_and_auto_confirm
 
-    # disable all schemas browsing when default schema is specified
+    # Disable all schemas browsing
     def table_exists?(name)
       return false unless name
-      schema ? @connection.table_exists?(name, schema) : @connection.table_exists?(name)
+      @connection.table_exists?(name, db2_schema)
+    end
+
+    def indexes(table_name, name = nil)
+      @connection.indexes(table_name, name, db2_schema)
     end
 
     DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
 
-    # @private
-    # @deprecated no longer used
-    def as400?
-      true
+    # Do not return *LIBL as schema
+    def schema
+      system_naming? ? nil : db2_schema
     end
 
     private
+    # If naming is really in system mode CURRENT_SCHEMA is *LIBL
+    def system_naming?
+      @db2_schema == '*LIBL'
+    end
+
+    # SET SCHEMA statement put connection in sql naming
+    def set_schema(schema)
+      execute("SET SCHEMA #{schema}") unless system_naming?
+    end
 
     # @override
     def db2_schema
-      @db2_schema = false unless defined? @db2_schema
-      return @db2_schema if @db2_schema != false
+      return @db2_schema if defined? @db2_schema
       @db2_schema =
         if config[:schema].present?
           config[:schema]
-        elsif config[:jndi].present?
+        else
           # Only found method to set db2_schema from jndi
           result = select_one("SELECT CURRENT_SCHEMA FROM SYSIBM.SYSDUMMY1")
-          schema = result['00001']
-          # If the connection uses the library list schema name will be nil
-          if schema == '*LIBL'
-            schema = nil
-          end
-          schema
-        else
-          # AS400 implementation takes schema from library name (last part of URL)
-          # jdbc:as400://localhost/schema;naming=system;libraries=lib1,lib2
-          schema = nil
-          split = config[:url].split('/')
-          # Return nil if schema isn't defined
-          schema = split.last.split(';').first.strip if split.size == 4
-          schema
+          result['00001']
         end
     end
 

data/lib/arjdbc/as400/connection_methods.rb

@@ -8,13 +8,14 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     
     config[:url] ||= begin
-      # jdbc:as400://[host]
+      # jdbc:as400://[host];proxy server=[proxy:port];naming=[naming];libraries=[libraries];prompt=false
       url = 'jdbc:as400://'
       url << config[:host] if config[:host]
-      # jdbc:as400://myiSeries;database name=IASP1
       url << ";database name=#{config[:database]}" if config[:database]
-      # jdbc:as400://[host];proxy server=HODServerName:proxyServerPort
       url << ";proxy server=#{config[:proxy]}" if config[:proxy]
+      url << ";naming=#{config[:naming]}" if config[:naming]
+      url << ";libraries=#{config[:libraries]}" if config[:libraries]
+      url << ';prompt=false'
       url
     end
     require 'arjdbc/as400/adapter'

data/test/config.yml

@@ -0,0 +1,5 @@
+host: 'inc400'
+username: 'pr'
+password: 'princ189'
+schema: 'ARJDBC_TEST'
+libraries: 'QTEMP,ARJDBC_TEST'

data/test/test_connection.rb

@@ -0,0 +1,16 @@
+require 'test_helper'
+
+class TestConnection < Test::Unit::TestCase
+  def test_system_naming
+    assert_false(connection.instance_eval {system_naming?})
+    assert_true(system_connection.instance_eval {system_naming?})
+  end
+
+  def test_schema
+    assert_equal(connection.instance_eval {db2_schema}, config[:schema])
+    assert_equal(connection.schema, config[:schema])
+
+    assert_equal(system_connection.instance_eval {db2_schema}, '*LIBL')
+    assert_nil(system_connection.schema)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,57 @@
+require 'java'
+
+begin
+  require 'bundler'
+rescue LoadError => e
+  require('rubygems') && retry
+  raise e
+end
+Bundler.require(:default, :test)
+
+class Test::Unit::TestCase
+  def config
+    @config ||= YAML::load(File.open('config.yml'))
+    @config.symbolize_keys
+  end
+
+  def data_source_connection
+    return @connection if @connection && @connection_type == 'data_source'
+    # Create a data source to the iSeries database.
+    datasource = com.ibm.as400.access.AS400JDBCDataSource.new
+    datasource.setServerName(config[:host])
+    datasource.setLibraries(config[:libraries])
+    datasource.setUser(config[:username])
+    datasource.setPassword(config[:password])
+
+    ActiveRecord::Base.establish_connection(adapter: 'as400', data_source: datasource)
+    @connection_type = 'data_source'
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def connection
+    return @connection if @connection && @connection_type == 'connection'
+    ActiveRecord::Base.establish_connection(
+        adapter: 'as400',
+        host: config[:host],
+        username: config[:username],
+        password: config[:password],
+        schema: config[:schema]
+    )
+    @connection_type = 'connection'
+    @connection = ActiveRecord::Base.connection
+  end
+
+  def system_connection
+    return @connection if @connection && @connection_type == 'system'
+    ActiveRecord::Base.establish_connection(
+        adapter: 'as400',
+        host: config[:host],
+        username: config[:username],
+        password: config[:password],
+        naming: 'system',
+        libraries: config[:libraries]
+    )
+    @connection_type = 'system'
+    @connection = ActiveRecord::Base.connection
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.4.1
+  version: 1.3.4.2
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-03 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
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
+  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,16 +33,19 @@ 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_helper.rb
 homepage: https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +61,11 @@ 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.11
+signing_key:
 specification_version: 4
 summary: AS/400 JDBC adapter for JRuby on Rails.
-test_files: []
+test_files:
+- test/config.yml
+- test/test_connection.rb
+- test/test_helper.rb