activerecord-jdbcas400-adapter 1.3.5.3 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f428070876558bc7762beff5cd5af5c9c1445d
-  data.tar.gz: ca0b644022949d4a5bad49ad89d5077a623b13a9
+  metadata.gz: bb2bfb276ecfc1dee2de1f0439823043a1d5771a
+  data.tar.gz: 89efd8b8716e600fa7e8bc7186049c1b24e7ec57
 SHA512:
-  metadata.gz: a539b53a3302c3fbed64b5609d589037f921c61b8fe9929f0e7f0805fb05c8ddde4369e94874b872348515ed8c84ff887ab59b40ad91a6689d28928b17017cb5
-  data.tar.gz: bbf0d9bee1d58120f3c10fb9a3004bbf4ed8b3dae7f4e0971b1c5556604cb4589427d5568e8485150780e4344f91c52135ab0df2af5e2e658d89702a3280911d
+  metadata.gz: d7ba6ba952a06a01b6826e56d145801881f4abb864c2033bff68bbc94b6b26feace32c84598bcac99790ed1568e9f0717ec14116dd879963b4b6e17e2c5cd3d8
+  data.tar.gz: 2435e51ab693e89482173cbf24db5d14de3f7090c3a0000a006a411c5c346d9c95d01455dd6717f6775824daec1b2d04f6c7dddb6c09bddad9750ea61c1a4512

data/README.md

@@ -1,5 +1,9 @@
 # activerecord-jdbcas400-adapter
 
+[![Gem Version](http://img.shields.io/gem/v/activerecord-jdbcas400-adapter.svg)][gem]
+[![Dependency Status](http://img.shields.io/gemnasium/pierrickrouxel/activerecord-jdbcas400-adapter.svg)][gemnasium]
+[![Code Climate](http://img.shields.io/codeclimate/github/pierrickrouxel/activerecord-jdbcas400-adapter.svg)][codeclimate]
+
 https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter/
 
 ## Description
@@ -48,8 +52,14 @@ If your DB isn't correctly discovered you can specify the dialect:
   dialect: as400
 ```
 
-## Experimental feature
+To use native DB2 connection (directly on IBM i JVM only), you can add this to database.yml:
+```yml
+  native: true
+```
+This connection doesn't require credentials.
 
+## Experimental features
+### Current library
 To allow migrations with system naming, a configuration is added to adapter:
 
 ```yml

data/lib/arjdbc/as400/adapter.rb

@@ -45,13 +45,6 @@ module ArJdbc
       end
     end
 
-    # Force migration in current library
-    def create_table(name, options = {})
-      execute("SET SCHEMA #{config[:current_library]}") if config[:current_library]
-      super
-      execute('SET SCHEMA DEFAULT') if config[:current_library]
-    end
-
     # Prevent migration in QGPL
     def supports_migrations?
       !(system_naming? && config[:current_library].nil?)
@@ -67,8 +60,8 @@ module ArJdbc
     # @override
     def rename_column(table_name, column_name, new_column_name)
       column = columns(table_name, column_name).find { |column| column.name == column_name.to_s}
-      add_column(table_name, new_column_name, column.type)
-      execute("UPDATE #{table_name} SET #{new_column_name} = #{column_name}")
+      add_column(table_name, new_column_name, column.type, column.instance_values)
+      execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(new_column_name)} = #{quote_column_name(column_name)}")
       remove_column(table_name, column_name)
     end
 
@@ -81,8 +74,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)"
+        execute_system_command('QSYS/CHGJOB INQMSGRPY(*SYSRPYL)')
+        execute_system_command("ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I')")
       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}"
@@ -99,8 +92,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)"
+          execute_system_command('QSYS/CHGJOB INQMSGRPY(*DFT)')
+          execute_system_command('RMVRPYLE SEQNBR(9876)')
         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}"
@@ -121,10 +114,12 @@ module ArJdbc
     end
 
     DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
+    NATIVE_DRIVER_NAME = 'com.ibm.db2.jdbc.app.DB2Driver'.freeze
 
     # Set schema is it specified
     def configure_connection
       set_schema(config[:schema]) if config[:schema]
+      change_current_library(config[:current_library]) if config[:current_library]
     end
 
     # Do not return *LIBL as schema
@@ -132,6 +127,40 @@ module ArJdbc
       db2_schema
     end
 
+    # Change current library
+    def change_current_library(current_library)
+      # *CRTDFT is the nil equivalent for current library
+      current_library ||= '*CRTDFT'
+      execute_system_command("CHGCURLIB CURLIB(#{current_library})")
+    end
+
+    def execute_system_command(command)
+      length = command.length
+      command = ::ActiveRecord::Base.sanitize(command)
+      @connection.execute_update("CALL qsys.qcmdexc(#{command}, CAST(#{length} AS DECIMAL(15, 5)))")
+    end
+
+    # Disable transactions when they are not supported
+    def begin_db_transaction
+      super unless config[:transaction_isolation] == 'none'
+    end
+
+    def commit_db_transaction
+      super unless config[:transaction_isolation] == 'none'
+    end
+
+    def rollback_db_transaction
+      super unless config[:transaction_isolation] == 'none'
+    end
+
+    def begin_isolated_db_transaction(isolation)
+      super unless config[:transaction_isolation] == 'none'
+    end
+
+    def create_savepoint(name = current_savepoint_name(true))
+      super unless config[:transaction_isolation] == 'none'
+    end
+
     private
     # If naming is really in system mode CURRENT_SCHEMA is *LIBL
     def system_naming?
@@ -151,10 +180,9 @@ module ArJdbc
           config[:schema]
         else
           # Only found method to set db2_schema from jndi
-          result = select_one("SELECT CURRENT_SCHEMA FROM SYSIBM.SYSDUMMY1")
+          result = select_one('VALUES CURRENT_SCHEMA')
           result['00001']
         end
     end
-
   end
 end

data/lib/arjdbc/as400/connection_methods.rb

@@ -1,25 +1,44 @@
 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
+    
+    if config[:native]
+      config[:transaction_isolation] ||= 'none'
+    else
+      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
     end
     
     config[:url] ||= begin
-      # jdbc:as400://[host];proxy server=[proxy:port];naming=[naming];libraries=[libraries];prompt=false
-      url = 'jdbc:as400://'
-      url << config[:host] if config[:host]
-      url << ";database name=#{config[:database]}" if config[:database]
-      url << ";proxy server=#{config[:proxy]}" if config[:proxy]
+      url = 'jdbc:'
+      if config[:native]
+        # jdbc:db2:*local;naming=[naming];libraries=[libraries]
+        url << 'db2:*local'
+      else
+        # jdbc:as400://[host];proxy server=[proxy:port];naming=[naming];libraries=[libraries];prompt=false
+        url << 'as400://'
+        url << config[:host] if config[:host]
+        url << ";database name=#{config[:database]}" if config[:database]
+        url << ";proxy server=#{config[:proxy]}" if config[:proxy]
+        url << ';prompt=false'
+      end
       url << ";naming=#{config[:naming]}" if config[:naming]
       url << ";libraries=#{config[:libraries]}" if config[:libraries]
-      url << ';prompt=false'
+      url << ";auto commit=#{config[:auto_commit]}" if config[:auto_commit]
+      url << ";transaction isolation=#{config[:transaction_isolation]}" if config[:transaction_isolation]
       url
     end
     require 'arjdbc/as400/adapter'
-    config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
+    config[:driver] ||= if defined?(::Jdbc::AS400.driver_name)
+      ::Jdbc::AS400.driver_name
+    elsif config[:native]
+      ::ArJdbc::AS400::NATIVE_DRIVER_NAME
+    else
+      ::ArJdbc::AS400::DRIVER_NAME
+    end
     config[:adapter_spec] ||= ::ArJdbc::AS400
     config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
     jdbc_connection(config)

data/test/config.yml

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

data/test/test_adapter.rb

@@ -29,4 +29,17 @@ class TestAdapter < Test::Unit::TestCase
       connection.execute('DROP TABLE test_table')
     end
   end
+
+  def test_execute_system_command
+    assert_nothing_raised do
+      connection.execute_system_command('DSPJOBLOG')
+    end
+  end
+
+  def test_change_current_library
+    assert_nothing_raised do
+      connection.change_current_library('QGPL')
+      connection.change_current_library(nil)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.5.3
+  version: 1.3.6
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter