activerecord-jdbcas400-adapter 1.3.19 → 1.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7c9181a3a661ce9e1b9264e06b22c26ac9cbf40
-  data.tar.gz: 3885e230dfcd4a88ab88ed44c6be08d8d45064a9
+  metadata.gz: 3a626eafcb49f65572a0b225f6c06881350d5113
+  data.tar.gz: 21d49dbbf66be37b547df5317c7e60d583e3df47
 SHA512:
-  metadata.gz: fdb11030d59143c8069ab0da0c7aade664d35d88372d1990927779407728af9ad8d111931a95f0600521d07d984dbfdffe3db141e494c362511ad838742ffc3c
-  data.tar.gz: 55c30fb2e15856e5a60e70dce44afe077c0f9165402e7bac272c6f1a92714f85be0dd96681eaae2a5cffedef6a0785b95d09a0af3eefd46cf3517deca803ae11
+  metadata.gz: 5756b10272558e6c2c0927f019546bc76c5ea3def1fc18ca34fd2d0875852a3f8eb695c6f318b03681ff5619bdacd46d48370b1f2ddd1eb77ed28aa91ee595bd
+  data.tar.gz: a023e55ac0d04531767a3322e5cb2bf3059287359d818bccae2ffa34aa6cf9c7c7e374247ba90f98f09bad4787444265f48365b7dab966fff1f396746dd9bc15

data/README.md

@@ -63,7 +63,7 @@ To use native DB2 connection (directly on IBM i JVM only), you can add this to d
 ```
 This connection doesn't require credentials.
 
-### Transaction isolation : no commit
+### Transaction isolation: no commit
 If your database supports setting the isolation level for a transaction, you can set it like so:
 
 ```ruby
@@ -89,7 +89,7 @@ To allow migrations with system naming, a configuration is added to adapter:
   current_library: lib
 ```
 
-The specified library will be used to define a schema during create_table migration.
+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:

data/lib/arjdbc/as400.rb

@@ -1,7 +1,6 @@
 require 'arjdbc'
 require 'arjdbc/db2/adapter'
 require 'arjdbc/as400/connection_methods'
-require 'arjdbc/as400/system'
 require 'arjdbc/as400/adapter'
 
 # Register AS400 to database tasks
@@ -13,4 +12,4 @@ module ArJdbc
     register_tasks(/as400/, DB2DatabaseTasks)
 
   end
-end
+end

data/lib/arjdbc/as400/adapter.rb

@@ -1,7 +1,6 @@
 module ArJdbc
   module AS400
     include DB2
-    include System
 
     # @private
     def self.extended(adapter); DB2.extended(adapter); end
@@ -37,7 +36,9 @@ module ArJdbc
     # 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]
+      if config[:current_library]
+        execute_system_command("CHGCURLIB CURLIB(#{config[:current_library]})")
+      end
     end
 
     def os400_version
@@ -47,15 +48,15 @@ module ArJdbc
       { major: major, minor: minor }
     end
 
-    # Do not return *LIBL as schema
+    # Do not return *LIBL
     def schema
-      db2_schema
+      db2_schema == '*LIBL' ? @current_library : db2_schema
     end
 
     def tables(name = nil)
       # Do not perform search on all system
       if system_naming?
-        name ||= current_library
+        name ||= @current_library
         unless name
           raise StandardError.new('Unable to retrieve tables without current library')
         end
@@ -64,11 +65,6 @@ module ArJdbc
       @connection.tables(nil, name)
     end
 
-    # Prevent migration in QGPL
-    def supports_migrations?
-      !(system_naming? && !current_library?)
-    end
-
     # If true, next_sequence_value is called before each insert statement
     # to set the record's primary key.
     # By default DB2 for i supports IDENTITY_VAL_LOCAL for tables that have
@@ -126,9 +122,14 @@ module ArJdbc
     end
 
     private
+    def execute_system_command(command)
+      command = quote(command)
+      execute("CALL qsys2.qcmdexc(#{command})")
+    end
+
     # If naming is really in system mode CURRENT_SCHEMA is *LIBL
     def system_naming?
-      schema == '*LIBL'
+      db2_schema == '*LIBL'
     end
 
     # SET SCHEMA statement put connection in sql naming

data/test/adapter_test.rb

@@ -3,8 +3,8 @@ require 'test_helper'
 class TestAdapter < Test::Unit::TestCase
 
   def test_schema
-    assert_equal(connection.schema, config[:schema])
-    assert_equal(system_connection.schema, '*LIBL')
+    assert_equal(config[:schema], connection.schema)
+    assert_equal(nil, system_connection.schema)
   end
 
   def test_system_naming?
@@ -12,16 +12,6 @@ class TestAdapter < Test::Unit::TestCase
     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)')
@@ -66,14 +56,23 @@ class TestAdapter < Test::Unit::TestCase
 
       connection.rename_column('test_table', 'test_column', 'new_test_column')
       assert_not_nil(connection.columns('test_table').find { |column| column.name == 'new_test_column' })
-      assert_equal(connection.select_one('SELECT new_test_column FROM test_table')['new_test_column'], 1)
+      assert_equal(1, connection.select_one('SELECT new_test_column FROM test_table')['new_test_column'])
     ensure
       connection.execute('DROP TABLE test_table')
     end
   end
 
   def test_transaction_isolation_levels
-    assert_equal(connection.transaction_isolation_levels.fetch(:no_commit), 'NO COMMIT')
+    assert_equal('NO COMMIT', connection.transaction_isolation_levels.fetch(:no_commit))
+  end
+
+  def test_table_exists
+    begin
+      connection.execute('CREATE TABLE test_table (test_column INTEGER)')
+      assert_true(system_connection.table_exists?('test_table'))
+    ensure
+      connection.execute('DROP TABLE test_table')
+    end
   end
 
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.19
+  version: 1.3.20
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-01 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: activerecord
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -80,6 +66,26 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  name: activerecord
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: Install this gem to use AS/400 with JRuby on Rails.
 email: nick@nicksieger.com, ola.bini@gmail.com
 executables: []
@@ -94,11 +100,9 @@ files:
 - lib/arjdbc/as400.rb
 - lib/arjdbc/as400/adapter.rb
 - lib/arjdbc/as400/connection_methods.rb
-- lib/arjdbc/as400/system.rb
 - lib/arjdbc/discover.rb
 - test/adapter_test.rb
 - test/database_tasks_test.rb
-- test/system_test.rb
 - test/test_helper.rb
 homepage: https://github.com/pierrickrouxel/activerecord-jdbcas400-adapter
 licenses:
@@ -127,5 +131,4 @@ summary: AS/400 JDBC adapter for JRuby on Rails.
 test_files:
 - test/adapter_test.rb
 - test/database_tasks_test.rb
-- test/system_test.rb
 - test/test_helper.rb

data/lib/arjdbc/as400/system.rb

@@ -1,38 +0,0 @@
-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/system_test.rb

@@ -1,36 +0,0 @@
-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