activerecord-jdbcas400-adapter 1.3.6.1 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fb163c69c0eeb68c3858a28d84c9597efb2968c
-  data.tar.gz: 2f667ccd270bba1fcb3f1604060eb8e111f36116
+  metadata.gz: 6199e97dfd1e313557b52d4e660110f7700fa4b4
+  data.tar.gz: 886e6efe31d46508b42218613f0635233138a27e
 SHA512:
-  metadata.gz: c3f77a9c49b012e0323904c2d1f99d4a44514740587c6df1d51f1c812208713679b274fe3a139894eee5ad3dc1ed1cb38f9e8a1d936b4cc9c3d5a5c4550cd726
-  data.tar.gz: af3d5a03ce0583ed3327a81f155301048aa812de34c1e45605a5f4913922d6beb2bc897f80b4adfe4f52976bb5b46daa02ac4b720106d70a7c2298aa842c4787
+  metadata.gz: 4b703180d160b4b3672010cd040befe3853d2812c6cc9d0af9e135a8b5a84480e0e275171efc6025fafcdda951bb0a5d86c990c41d72f91aaef891b2fd226ca8
+  data.tar.gz: 74ba90d96b88d3b7a421ecb0dc4dc3ab4debdc9dc33a84bc0fcd3954870068c13023e55d3a0e11925c7edc228f829e9acf40f3f01e8d18bbeb32771dafd791d6

data/lib/arjdbc/as400.rb

@@ -1,6 +1,7 @@
 require 'arjdbc'
 require 'arjdbc/db2/adapter'
 require 'arjdbc/as400/connection_methods'
+require 'arjdbc/as400/system'
 require 'arjdbc/as400/adapter'
 
 # Register AS400 to database tasks

data/lib/arjdbc/as400/adapter.rb

@@ -1,8 +1,7 @@
-require 'arjdbc/db2/adapter'
-
 module ArJdbc
   module AS400
     include DB2
+    include System
 
     # @private
     def self.extended(adapter); DB2.extended(adapter); end
@@ -31,15 +30,28 @@ module ArJdbc
     def self.emulate_booleans=(emulate); DB2.emulate_booleans = emulate; end
 
     ADAPTER_NAME = 'AS400'.freeze
+    DRIVER_NAME = 'com.ibm.as400.access.AS400JDBCDriver'.freeze
+    NATIVE_DRIVER_NAME = 'com.ibm.db2.jdbc.app.DB2Driver'.freeze
 
     def adapter_name
       ADAPTER_NAME
     end
 
+    # 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
+    def schema
+      db2_schema
+    end
+
     # Return only migrated tables
     def tables
-      if config[:current_library]
-        @connection.tables(nil, config[:current_library])
+      if current_library
+        @connection.tables(nil, current_library)
       else
         @connection.tables(nil, schema)
       end
@@ -47,7 +59,7 @@ module ArJdbc
 
     # Prevent migration in QGPL
     def supports_migrations?
-      !(system_naming? && config[:current_library].nil?)
+      !(system_naming? && !current_library?)
     end
 
     # @override
@@ -70,37 +82,6 @@ module ArJdbc
       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
-        execute_system_command('CHGJOB INQMSGRPY(*SYSRPYL)')
-        execute_system_command("ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I')")
-      rescue Exception => e
-        raise unauthorized_error_message("CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I')", e)
-      end
-
-      begin
-        result = execute(sql, name)
-      rescue Exception
-        raise
-      else
-        # Return if all work fine
-        result
-      ensure
-
-        # Ensure default configuration restoration
-        begin
-          execute_system_command('CHGJOB INQMSGRPY(*DFT)')
-          execute_system_command('RMVRPYLE SEQNBR(9876)')
-        rescue Exception => e
-          raise unauthorized_error_message('CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876)', e)
-        end
-
-      end
-    end
-    private :execute_and_auto_confirm
-
     # Disable all schemas browsing
     def table_exists?(name)
       return false unless name
@@ -111,39 +92,6 @@ module ArJdbc
       @connection.indexes(table_name, name, schema)
     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
-    def schema
-      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
-
-    # Change libraries
-    def change_libraries(libraries)
-      libraries = libraries.nil? || libraries.size < 1 ? '*NONE' :libraries.join(' ')
-      execute_system_command("CHGLIBL LIBL(#{libraries})")
-    end
-
-    def execute_system_command(command)
-      length = command.length
-      command = quote(command)
-      execute("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'
@@ -189,6 +137,36 @@ module ArJdbc
         end
     end
 
+    # Holy moly batman! all this to tell AS400 "yes i am sure"
+    def execute_and_auto_confirm(sql, name = nil)
+
+      begin
+        execute_system_command('CHGJOB INQMSGRPY(*SYSRPYL)')
+        execute_system_command("ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I')")
+      rescue Exception => e
+        raise unauthorized_error_message("CHGJOB INQMSGRPY(*SYSRPYL) and ADDRPYLE SEQNBR(9876) MSGID(CPA32B2) RPY('I')", e)
+      end
+
+      begin
+        result = execute(sql, name)
+      rescue Exception
+        raise
+      else
+        # Return if all work fine
+        result
+      ensure
+
+        # Ensure default configuration restoration
+        begin
+          execute_system_command('CHGJOB INQMSGRPY(*DFT)')
+          execute_system_command('RMVRPYLE SEQNBR(9876)')
+        rescue Exception => e
+          raise unauthorized_error_message('CHGJOB INQMSGRPY(*DFT) and RMVRPYLE SEQNBR(9876)', e)
+        end
+
+      end
+    end
+
     def unauthorized_error_message(command, exception)
       "Could not call #{command}.\nDo you have authority to do this?\n\n#{exception.inspect}"
     end

data/lib/arjdbc/as400/system.rb

@@ -0,0 +1,38 @@
+module ArJdbc
+  module AS400
+    module System
+
+      # Execute system command with QSYS.QCMDEXC
+      def execute_system_command(command)
+        length = command.length
+        command = quote(command)
+        execute("CALL QSYS.QCMDEXC(#{command}, CAST(#{length} AS DECIMAL(15, 5)))")
+      end
+
+      # Change current library
+      def change_current_library(current_library)
+        @current_library = current_library
+        # *CRTDFT is the nil equivalent for current library
+        current_library ||= '*CRTDFT'
+        execute_system_command("CHGCURLIB CURLIB(#{current_library})")
+      end
+
+      # Change libraries
+      def change_libraries(libraries)
+        libraries = libraries.nil? || libraries.size < 1 ? '*NONE' :libraries.join(' ')
+        execute_system_command("CHGLIBL LIBL(#{libraries})")
+      end
+
+      # Returns true if current library is configured
+      def current_library?
+        !current_library.nil?
+      end
+
+      # Returns the name current library
+      def current_library
+        @current_library
+      end
+
+    end
+  end
+end

data/test/test_adapter.rb

@@ -1,6 +1,27 @@
 require 'test_helper'
 
 class TestAdapter < Test::Unit::TestCase
+
+  def test_schema
+    assert_equal(connection.schema, config[:schema])
+    assert_equal(system_connection.schema, '*LIBL')
+  end
+
+  def test_system_naming?
+    assert_false(connection.instance_eval {system_naming?})
+    assert_true(system_connection.instance_eval {system_naming?})
+  end
+
+  def test_supports_migrations?
+    assert_true(connection.supports_migrations?)
+
+    system_connection.change_current_library('QGPL')
+    assert_true(system_connection.supports_migrations?)
+
+    system_connection.change_current_library(nil)
+    assert_false(system_connection.supports_migrations?)
+  end
+
   def test_prefetch_primary_key?
     begin
       connection.execute('CREATE TABLE test_table (test_column INTEGER)')
@@ -30,23 +51,4 @@ class TestAdapter < Test::Unit::TestCase
     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
-
-  def test_change_libraries
-    assert_nothing_raised do
-      connection.change_libraries(%w(QGPL QTEMP))
-      connection.change_libraries(nil)
-    end
-  end
 end

data/test/test_helper.rb

@@ -5,8 +5,13 @@ require 'activerecord-jdbc-adapter'
 
 class Test::Unit::TestCase
   def config
-    @config ||= YAML::load(File.open('config.yml'))
-    @config.symbolize_keys
+    @config ||= {
+      host: ENV['AS400_HOST'],
+      username: ENV['AS400_USERNAME'],
+      password: ENV['AS400_PASSWORD'],
+      schema: ENV['AS400_SCHEMA'],
+      libraries: ENV['AS400_LIBRARIES']
+    }
   end
 
   def data_source_connection

data/test/test_system.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class TestAdapter < Test::Unit::TestCase
+  def test_execute_system_command
+    assert_nothing_raised do
+      connection.execute_system_command('DSPJOBLOG')
+    end
+  end
+
+  def test_change_current_library
+    connection = system_connection
+    assert_nothing_raised do
+      connection.change_current_library('QGPL')
+      connection.change_current_library(nil)
+    end
+  end
+
+  def test_current_library
+    connection = system_connection
+    connection.change_current_library('QSYS')
+    assert_equal(connection.current_library, 'QSYS')
+    assert_true(connection.current_library?)
+
+    connection.change_current_library(nil)
+    assert_nil(connection.current_library)
+    assert_false(connection.current_library?)
+  end
+
+  def test_change_libraries
+    connection = system_connection
+    assert_nothing_raised do
+      connection.change_libraries(%w(QGPL QTEMP))
+      connection.change_libraries(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.6.1
+  version: 1.3.7
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
@@ -16,12 +16,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.3.7
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -95,11 +95,11 @@ files:
 - lib/arjdbc/discover.rb
 - lib/arjdbc/as400/adapter.rb
 - lib/arjdbc/as400/connection_methods.rb
-- test/config.yml
+- lib/arjdbc/as400/system.rb
 - test/test_adapter.rb
-- test/test_connection.rb
 - test/test_database_tasks.rb
 - test/test_helper.rb
+- test/test_system.rb
 homepage: https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter
 licenses:
 - ''
@@ -125,8 +125,7 @@ signing_key:
 specification_version: 4
 summary: AS/400 JDBC adapter for JRuby on Rails.
 test_files:
-- test/config.yml
 - test/test_adapter.rb
-- test/test_connection.rb
 - test/test_database_tasks.rb
 - test/test_helper.rb
+- test/test_system.rb

data/test/config.yml

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

data/test/test_connection.rb

@@ -1,25 +0,0 @@
-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.schema, config[:schema])
-
-    assert_equal(system_connection.schema, '*LIBL')
-  end
-
-  def test_migration_support
-    assert_true(connection.supports_migrations?)
-
-    connection = system_connection
-    connection.config[:current_library] = 'QTEMP'
-    assert_true(connection.supports_migrations?)
-
-    connection.config[:current_library] = nil
-    assert_false(connection.supports_migrations?)
-  end
-end