activerecord-jdbcas400-adapter 1.3.17 → 1.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de383695fd83a189b57c340e772063a684984780
-  data.tar.gz: 1c597efa80468dc104c5cd0eac8d75902d21e39e
+  metadata.gz: e7c9181a3a661ce9e1b9264e06b22c26ac9cbf40
+  data.tar.gz: 3885e230dfcd4a88ab88ed44c6be08d8d45064a9
 SHA512:
-  metadata.gz: d0f64830e2ab95d4fbc8e4e27529b89784bcab4e0bb801773bd96c7e67d72250d57efafcc5ffabf09759ad6ead515dcecaef2f857d26caecd77cbd91ae0aa0cf
-  data.tar.gz: 40004ba104a3dca0e79d2fafd66008f55e259d8f11bdcd79afd25cacb65633afecf0814eab2e5ede4e0871b182346b3aee3a40b7295287dd0a838987c8333af2
+  metadata.gz: fdb11030d59143c8069ab0da0c7aade664d35d88372d1990927779407728af9ad8d111931a95f0600521d07d984dbfdffe3db141e494c362511ad838742ffc3c
+  data.tar.gz: 55c30fb2e15856e5a60e70dce44afe077c0f9165402e7bac272c6f1a92714f85be0dd96681eaae2a5cffedef6a0785b95d09a0af3eefd46cf3517deca803ae11

data/lib/arjdbc/as400/adapter.rb

@@ -16,12 +16,9 @@ module ArJdbc
     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) } ]
+      [ /as400/i, lambda { |config, column| column.extend(ColumnMethods) } ]
     end
 
-    # @private
-    Column = DB2::Column
-
     # Boolean emulation can be disabled using :
     #
     #   ArJdbc::AS400.emulate_booleans = false
@@ -43,6 +40,13 @@ module ArJdbc
       change_current_library(config[:current_library]) if config[:current_library]
     end
 
+    def os400_version
+      metadata = jdbc_connection.getMetaData()
+      major = metadata.getDatabaseMajorVersion()
+      minor = metadata.getDatabaseMinorVersion()
+      { major: major, minor: minor }
+    end
+
     # Do not return *LIBL as schema
     def schema
       db2_schema
@@ -65,11 +69,24 @@ module ArJdbc
       !(system_naming? && !current_library?)
     end
 
-    # @override
+    # 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
+    # one primary key.
     def prefetch_primary_key?(table_name = nil)
       return true if table_name.nil?
       table_name = table_name.to_s
-      columns(table_name).count { |column| column.primary } == 0
+      primary_keys(table_name.to_s).size == 0
+    end
+
+    # TRUNCATE only works with V7R2+
+    # @override
+    def truncate(table_name, name = nil)
+      if os400_version[:major] < 7 || (os400_version[:major] == 7 && os400_version[:minor] < 2)
+        raise NotImplementedError
+      else
+        super
+      end
     end
 
     # @override

data/test/adapter_test.rb

@@ -38,6 +38,23 @@ class TestAdapter < Test::Unit::TestCase
     end
   end
 
+  def test_truncate
+    begin
+      connection.execute('CREATE TABLE test_table (test_column INTEGER)')
+    ensure
+      if connection.os400_version[:major] < 7 || (connection.os400_version[:major] == 7 && connection.os400_version[:minor] < 2)
+        assert_raise NotImplementedError do
+          connection.truncate 'test_table'
+        end
+      else
+        assert_nothing_raised do
+          connection.truncate 'test_table'
+        end
+      end
+      connection.execute('DROP TABLE test_table')
+    end
+  end
+
   def test_rename_column
     begin
       connection.execute('CREATE TABLE test_table (test_column INTEGER)')

data/test/test_helper.rb

@@ -24,6 +24,8 @@ class Test::Unit::TestCase
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
+    require 'java'
+
     # Create a data source to the iSeries database.
     datasource = com.ibm.as400.access.AS400JDBCDataSource.new
     datasource.setServerName(config[:host])

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcas400-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.17
+  version: 1.3.19
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Pierrick Rouxel and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-05 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: 3.0.0
   name: activerecord
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 4.1.13
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: