activerecord-jdbcas400-adapter 1.3.4 → 1.3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1e2fed6165b5884b66e6b376a11fad559a66d3c
-  data.tar.gz: 5c871953b8c322d88ecb46957298b357165d5a62
+  metadata.gz: 17117e85ff715297a6f0eae81bc6396bf42e37f0
+  data.tar.gz: 7ec82609586834ec4a759e751a1c9da610b601fa
 SHA512:
-  metadata.gz: ebab63a04a39b6d6e5374a279c3ff83d2e331b27f48a0d7689386c48ec26da983009f06d0212651ed07e61c15c947b558c200f31a32e07559c972a7eba1e2aae
-  data.tar.gz: b58433253e0d40024d9e6b699494e5a5f9c4e84aa3ed6572642cb7e9b9624871f872025f0ec4a6edf206a2ffdca2c372088ffe2826e0561aa1b6379362625f33
+  metadata.gz: 10cddd83ee5fc0ce0e5dc03465259726be5d619278c46decd8fd3522d53ea45d419acb55f4355aea01091ccc300e5481a819e875b57bdb7fba9405b58f50acce
+  data.tar.gz: 02982ff31b1d1a7ebe2cc6ce37be72fa72c8a34f26718fad50b63cfe45ed5cc2c54d821eb18ea052f5a877bc7794fd8b71dc66f2152344c2575b49298377697e

data/README.md

@@ -5,3 +5,30 @@ https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter/
 ## Description
 
 This is an ActiveRecord driver for AS/400 using JDBC running under JRuby.
+
+## Usage
+
+Configure your database.yml in the normal Rails style:
+```yml
+development:
+  adapter: as400
+  database: development
+  username: user
+  password: 1234
+```
+
+You cas also use JNDI in production mode:
+```yml
+production:
+  adapter: jndi # jdbc
+  jndi: jdbc/DataSource
+```
+
+If your DB isn't correctly discovered you can specify the dialect:
+```yml
+  dialect: as400
+```
+
+## Dependency
+
+You can embed the JTOpen driver in your application. It is distributed in a separate gem : 'as400-jdbc'

data/lib/active_record/connection_adapters/as400_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/as400'

data/lib/activerecord-jdbcas400-adapter.rb

@@ -1,3 +1,2 @@
 # NOTE: here for Bundler to auto-load the gem unless :require => false
-require 'arjdbc/db2'
-require 'arjdbc/db2/as400'
+require 'arjdbc/as400'

data/lib/arjdbc/as400.rb

@@ -0,0 +1,4 @@
+require 'arjdbc'
+require 'arjdbc/db2/adapter'
+require 'arjdbc/as400/connection_methods'
+require 'arjdbc/as400/adapter'

data/lib/arjdbc/as400/adapter.rb

@@ -0,0 +1,136 @@
+require 'arjdbc/db2/adapter'
+
+module ArJdbc
+  module AS400
+    include DB2
+
+    # @private
+    def self.extended(adapter); DB2.extended(adapter); end
+
+    # @private
+    def self.initialize!; DB2.initialize!; end
+
+    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
+    def self.jdbc_connection_class; DB2.jdbc_connection_class; end
+
+    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
+    def self.arel_visitor_type(config = nil); DB2.arel_visitor_type(config); end
+
+    def self.column_selector
+      [ /as400/i, lambda { |config, column| column.extend(Column) } ]
+    end
+
+    # @private
+    Column = DB2::Column
+
+    # Boolean emulation can be disabled using :
+    #
+    #   ArJdbc::AS400.emulate_booleans = false
+    #
+    def self.emulate_booleans; DB2.emulate_booleans; end
+    def self.emulate_booleans=(emulate); DB2.emulate_booleans = emulate; end
+
+    ADAPTER_NAME = 'AS400'.freeze
+
+    def adapter_name
+      ADAPTER_NAME
+    end
+
+    # @override
+    def prefetch_primary_key?(table_name = nil)
+      # TRUE if the table has no identity column
+      names = table_name.upcase.split(".")
+      sql = "SELECT 1 FROM SYSIBM.SQLPRIMARYKEYS WHERE "
+      sql << "TABLE_SCHEM = '#{names.first}' AND " if names.size == 2
+      sql << "TABLE_NAME = '#{names.last}'"
+      select_one(sql).nil?
+    end
+
+    # @override
+    def rename_column(table_name, column_name, new_column_name)
+      raise NotImplementedError, "rename_column is not supported on IBM iSeries"
+    end
+
+    # @override
+    def execute_table_change(sql, table_name, name = nil)
+      execute_and_auto_confirm(sql, name)
+    end
+
+    # holy moly batman! all this to tell AS400 "yes i am sure"
+    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)"
+      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}"
+      end
+
+      begin
+        result = execute(sql, name)
+      rescue Exception
+        raise
+      else
+        # Return if all work fine
+        result
+      ensure
+
+        # 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)"
+        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}"
+        end
+
+      end
+    end
+    private :execute_and_auto_confirm
+
+    # disable all schemas browsing when default schema is specified
+    def table_exists?(name)
+      return false unless name
+      schema ? @connection.table_exists?(name, schema) : @connection.table_exists?(name)
+    end
+
+    DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
+
+    # @private
+    # @deprecated no longer used
+    def as400?
+      true
+    end
+
+    private
+
+    # @override
+    def db2_schema
+      @db2_schema = false unless defined? @db2_schema
+      return @db2_schema if @db2_schema != false
+      @db2_schema =
+        if config[:schema].present?
+          config[:schema]
+        elsif config[:jndi].present?
+          # 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
+        end
+    end
+
+  end
+end

data/lib/arjdbc/as400/connection_methods.rb

@@ -0,0 +1,26 @@
+ArJdbc::ConnectionMethods.module_eval do
+  # @note Assumes AS400 driver (*jt400.jar*) is on class-path.
+  def as400_connection(config)
+    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
+    
+    config[:url] ||= begin
+      # jdbc:as400://[host]
+      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
+    end
+    require 'arjdbc/as400/adapter'
+    config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
+    config[:adapter_spec] ||= ::ArJdbc::AS400
+    config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
+    jdbc_connection(config)
+  end
+end

data/lib/arjdbc/discover.rb

@@ -0,0 +1,9 @@
+module ::ArJdbc
+  extension :AS400 do |name, config|
+    # The native JDBC driver always returns "DB2 UDB for AS/400"
+    if name =~ /as\/?400/i
+      require 'arjdbc/as400'
+      true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.4.1
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
@@ -24,20 +24,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
-- !ruby/object:Gem::Dependency
-  name: jdbc-as400
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '7.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '7.10'
 description: Install this gem to use AS/400 with JRuby on Rails.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
@@ -47,8 +33,12 @@ files:
 - Rakefile
 - README.md
 - LICENSE.txt
-- lib/active_record/connection_adapters/jdbcas400_adapter.rb
+- 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/arjdbc/as400.rb
+- lib/arjdbc/discover.rb
 homepage: https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter
 licenses: []
 metadata: {}

data/lib/active_record/connection_adapters/jdbcas400_adapter.rb

@@ -1,6 +0,0 @@
-# NOTE: required by AR resolver with 'jdbcas400' adapter configuration :
-# we should make sure a jdbcas400db2_connection is setup on ActiveRecord::Base
-require 'arjdbc/db2'
-require 'arjdbc/db2/as400'
-# all setup should be performed in arjdbc/db2 to avoid circular requires
-# this should not be required from any loads perormed by arjdbc/db2 code