activerecord-jdbc-adapter 1.3.25 → 5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281e8f3a4a07822db0e22d4ccddcab3cfac306df
-  data.tar.gz: 6272c2231879854604d74b03720a6759f1e601ac
+  metadata.gz: 16bdeec72b7b2db4b9593138ae56a56cb52fd7d7
+  data.tar.gz: d3a6f0d4a0593326b598f9fda7ac77f0bb9266a2
 SHA512:
-  metadata.gz: bb5752131090b67b4724e34ced5ce7ca04eab6b5f593e2b99d95d7b8914ec20b90a96d0e1820c09bcbea7ad145819cb3349155ef0986cf26d9943cfad080972f
-  data.tar.gz: 8a9cc04265ff89f82356d99c8418a7203269146462aae805f302aefb2b799f810421f526dc1989b96d543a365e5f964f1d9ac444890053374f6725c22f6fc905
+  metadata.gz: 4e9df27017621984d70cc5a824a2d82775b8a6cd21b7307769557f7e154c1e1b95bead7c411aed5e16d9af85ab26a8ddba8cf58edce863ed5c0f1491b587101e
+  data.tar.gz: 6b5449e2e4e0f126046a68811acb030a0032b3f7b1f91e5a2a7a7a96fb83cd1d01f1c686e1266311a60a629ad9634bcf70ce63ea30776709b1f2cb59b011e047

data/.travis.yml

@@ -1,8 +1,3 @@
-addons:
-  apt:
-    packages:
-      - openjdk-6-jdk
-
 language: ruby
 sudo: false
 bundler_args: --without development
@@ -51,110 +46,104 @@ branches:
     - /^test-.*/
 matrix:
   allow_failures:
-    # NOTE: failing HStore inserts for whatever reason - hopefully someone will investigate ...
-    - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
-    - env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
-    - env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+    # yet another BC timestamp issue: <Wed, 31 Dec -0001 22:58:59 +0000> expected but was <Fri, 02 Jan 0000 22:58:59 +0000>
+    - rvm: jruby-9.0.5.0
+      gemfile: gemfiles/rails41.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
+      jdk: oraclejdk7
+    # ``/system call symlink regression (since JRuby 1.7.19)
+    # + (postgres) database_tasks got updated on 4.2 : https://github.com/rails/rails/commit/07f8a96aa14b642a86
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=false INSERT_RETURNING=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="--1.9 $JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
+    - rvm: jruby-1.7.24
+      gemfile: gemfiles/rails42.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
   include:
     # testing against MariaDB
     - addons:
-        mariadb: '10.0'
+        mariadb: '5.5'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails32.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
-      jdk: openjdk8 # MariaDB 2.x assumes JDK 8
+      jdk: openjdk6
     - addons:
-        mariadb: '10.1'
+        mariadb: '10.0'
       rvm: jruby-1.7.24
-      gemfile: gemfiles/rails42.gemfile
-      env: DB=mariadb
-      jdk: openjdk8
+      gemfile: gemfiles/rails40.gemfile
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb
+      jdk: openjdk7
     - addons:
-        mariadb: '10.2'
+        mariadb: '10.0'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
-      env: DB=mariadb PREPARED_STATEMENTS=true
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mariadb PREPARED_STATEMENTS=true
       jdk: oraclejdk8
       # include some tests on JDK 6 :
-    - rvm: jruby-1.7.27
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=mysql
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: openjdk6
-    - rvm: jruby-1.7.27
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=postgresql
+      env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: openjdk6
-    - rvm: jruby-1.7.27
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: openjdk6
-    - rvm: jruby-1.7.27
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: openjdk6
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: openjdk6
-    - rvm: jruby-1.7.26
+    - rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: openjdk6
-      # include some (more) --2.0 testing :
-    - rvm: jruby-1.7.27
-      gemfile: gemfiles/rails41.gemfile
-      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=mysql
-      jdk: openjdk8
-    - rvm: jruby-1.7.27
-      gemfile: gemfiles/rails41.gemfile
-      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=postgresql
-      jdk: openjdk7
-    - rvm: jruby-1.7.27
-      gemfile: gemfiles/rails41.gemfile
-      env: JRUBY_OPTS="--2.0 $JRUBY_OPTS" DB=sqlite3
-      jdk: openjdk7
       # include testing with JRuby 9K (4.2) :
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB PREPARED_STATEMENTS=true
-      jdk: openjdk8
-    - rvm: jruby-9.1.12.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.12.0
-      gemfile: gemfiles/rails42.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB
-      jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.8.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8
@@ -171,31 +160,27 @@ matrix:
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
-      gemfile: gemfiles/rails41.gemfile
-      env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql DRIVER=MariaDB
-      jdk: openjdk8 # MariaDB 2.x assumes JDK 8
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
-      jdk: openjdk7
-    - rvm: jruby-9.1.13.0
+      jdk: oraclejdk7
+    - rvm: jruby-9.0.5.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8

data/Appraisals

@@ -21,13 +21,18 @@ appraise "rails40" do
 end
 
 appraise "rails41" do
-  gem "activerecord", "~> 4.1.11", :require => false
+  gem "activerecord", "~> 4.1.8", :require => false
 end
 
 appraise "rails42" do
-  gem "activerecord", "~> 4.2.6", :require => false
+  gem "activerecord", "~> 4.2.0", :require => false
 end
 
+appraise "rails50" do
+  gem "activerecord", "~> 5.0.0.beta4", :require => false
+end
+
+
 appraise "railsNG" do
   branch = ( ENV['rails_branch'] || 'master' )
   gem "activerecord", :github => 'rails/rails', :branch => branch, :require => false

data/Gemfile

@@ -14,17 +14,13 @@ else
   gem 'activerecord', :require => nil
 end
 
-# NOTE: gem overrides AR internals and assumes it can safely patch adapter classes ...
-# thus it is to be used (in tests) as an optional - tests should roll fine without it!
-gem 'composite_primary_keys', :require => nil unless ENV['COMPOSITE_PK'].eql?('false')
-
 gem 'thread_safe', :require => nil # "optional" - we can roll without it
 
 if defined?(JRUBY_VERSION) && JRUBY_VERSION < '1.7.0'
 gem 'jruby-openssl', :platform => :jruby
 end
 
-gem 'rake', '~> 10.4.2', :require => nil
+gem 'rake', :require => nil
 gem 'appraisal', '~> 0.5.2', :require => nil
 
 # appraisal ignores group block declarations :
@@ -38,10 +34,10 @@ gem 'bcrypt-ruby', '~> 3.0.0', :require => nil, :group => :test
 #gem 'trinidad_dbpool', :require => nil, :group => :test
 
 group :development do
-  gem 'ruby-debug', :require => nil if ENV['DEBUG']
+  gem 'ruby-debug', :require => nil # if ENV['DEBUG']
   group :doc do
     gem 'yard', :require => nil
-    gem 'yard-method-overrides', :github => 'kares/yard-method-overrides', :require => nil
+    gem 'yard-method-overrides', :git => 'https://github.com/kares/yard-method-overrides.git', :require => nil
     gem 'kramdown', :require => nil
   end
 end

data/History.md

@@ -1,53 +1,3 @@
-## 1.3.25 (08/22/18)
-
-- [mysql] get rid of official driver < 5 checking on conn initialization 
-- [oracle] fix Oracle adapter not suing schema config properly (#869) 
-- [db2] refactor db2 quote (to avoid SQL injection) (#861) 
-- [db2] Fix a TypeError that happens when offset is used without limit (#873)
-- [mssql] automatically remove identity columns from AR generated UPDATE (#872)
-- [db2] Errors when dealing with blobs in jruby 9.2k (#902)
-
-## 1.3.24 (09/24/17)
-
-- [as400] Fixed ordering when limit and offset present (#789)
-- [postgres] limit driver version correctly since > 9.4.1206 might break
-- [db2] fixed issue with serialization not happening (#795)
-  resolves #725 (serialize with custom class not working on AR 4.2)
-- reconnect!/disconnect! shall call super to reset cache/transaction state
-- [oracle] some ~ enhanced adapter compatibility with configuration
-- [mysql] support setting collation: xxx with config[:encoding] like AR 4.2
-- [as400] Check if the exception thrown is a false-positive (#792)
-- [as400] Added truncate functionality for DB2/AS400 (#793)
-- [as400] Added DatabaseTasks for the as400 (#791)
-
-## 1.3.23 (05/14/17)
-
-- specify gem 'activerecord' < 5 since 5.x is not supported in 1.3.x
-- [postgres] get non-seq id inserts working when insert_returning: false (#716)
-- [postgres] previously-deprecated -i switch to pg_dump is no longer supported 
-  (in PostgreSQL 9.5) (#729)
-- [postgres] Assume that primary key can be multiple values (#773)
-- prevent multiple pushes of the adapter file onto $LOADED_FEATURES
-
-## 1.3.22 (12/23/16)
-
-- [postgres] Fix incorrect postgresql_version when running RC (#717)
-- [postgres] fixed insert into partitioned table (#723)
-- [postgres] add ssl support from environment vars (#760)
-- [postgres] Adds citext to AR42 Native database types (#746)
-- [mysql] handle db:create failure compatibly with AR's MySQL tasks
-- [mssql] Changed selects from information schema to uppercase
-  in case SQLServer database has case sensitive collation
-- Added long varchar to type converter for legacy sybase DB (#757)
-- [mysql] Don't read mysql binary column as stream (#742)
-
-## 1.3.21 (08/18/16)
-
-- check for instanceof RubyArray when extracting binds with stmnts
-  (for JRuby 9.1 packed array feature compatibility)
-- default to useSSL=false for MariaDB driver
-- [db2] allow to force zos: true using database config
-
 ## 1.3.20 (03/09/16)
 
 - Retrieve AM::Type::Boolean::FALSE_VALUES for Rails 5 (#705)

data/RUNNING_TESTS.md

@@ -1,6 +1,10 @@
 
 ## Running AR-JDBC's Tests
 
+After you have built arjdbc (run rake), then you can try testing it (if you
+do not build then adapter_java.jar is not put into the lib dir).  If you
+change any of the .java files you will need to rebuild.
+
 Most DB specific unit tests hide under the **test/db** directory, the files
 included in the *test* directory are mostly shared test modules and helpers.
 

data/activerecord-jdbc-adapter.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency 'activerecord', '>= 2.2', '< 5.0'
+  # NOTE: 1.3.0 only supports >= 2.3 but users report it works with 2.2 :
+  gem.add_dependency 'activerecord', '>= 2.2'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/common_jdbc_methods.rb

@@ -0,0 +1,89 @@
+module ArJdbc
+  # This is minimum amount of code neede from base JDBC Adapter class to make common adapters
+  # work.  This replaces using jdbc/adapter as a base class for all adapters.
+  module CommonJdbcMethods
+    def initialize(connection, logger = nil, config = {})
+      config[:adapter_spec] = adapter_spec(config) unless config.key?(:adapter_spec)
+
+      connection ||= jdbc_connection_class(config[:adapter_spec]).new(config, self)
+
+      super(connection, logger, config)
+    end
+
+    # Starts a database transaction.
+    # @override
+    def begin_db_transaction
+      @connection.begin
+    end
+
+    # Starts a database transaction.
+    # @param isolation the transaction isolation to use
+    def begin_isolated_db_transaction(isolation)
+      @connection.begin(isolation)
+    end
+
+    # Commits the current database transaction.
+    # @override
+    def commit_db_transaction
+      @connection.commit
+    end
+
+    # Rolls back the current database transaction.
+    # @override
+    def exec_rollback_db_transaction
+      @connection.rollback
+    end
+
+
+    def execute(sql, name = nil)
+      # FIXME: Can we kill :skip_logging?
+      if name == :skip_logging
+        @connection.execute(sql)
+      else
+        log(sql, name) { @connection.execute(sql) }
+      end
+    end
+
+    # Take an id from the result of an INSERT query.
+    # @return [Integer, NilClass]
+    def last_inserted_id(result)
+      if result.is_a?(Hash) || result.is_a?(ActiveRecord::Result)
+        result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
+      else
+        result
+      end
+    end
+
+    # Creates a (transactional) save-point one can rollback to.
+    # Unlike 'plain' `ActiveRecord` it is allowed to pass a save-point name.
+    # @param name the save-point name
+    # @return save-point name (even if nil passed will be generated)
+    # @since 1.3.0
+    # @extension added optional name parameter
+    def create_savepoint(name = current_savepoint_name(true))
+      @connection.create_savepoint(name)
+    end
+
+    # Transaction rollback to a given (previously created) save-point.
+    # If no save-point name given rollback to the last created one.
+    # @param name the save-point name
+    # @extension added optional name parameter
+    def rollback_to_savepoint(name = current_savepoint_name(true))
+      @connection.rollback_savepoint(name)
+    end
+
+    # Release a previously created save-point.
+    # @note Save-points are auto-released with the transaction they're created
+    # in (on transaction commit or roll-back).
+    # @param name the save-point name
+    # @extension added optional name parameter
+    def release_savepoint(name = current_savepoint_name(false))
+      @connection.release_savepoint(name)
+    end
+
+    # @private
+    def current_savepoint_name(compat = nil)
+      current_transaction.savepoint_name # unlike AR 3.2-4.1 might be nil
+    end
+  end
+end

data/lib/arjdbc/db2/adapter.rb

@@ -54,17 +54,6 @@ module ArJdbc
       ::ActiveRecord::ConnectionAdapters::DB2Column
     end
 
-    # @see ActiveRecord::ConnectionAdapters::Jdbc::ArelSupport
-    def self.arel_visitor_type(config = nil)
-      require 'arel/visitors/db2'; ::Arel::Visitors::DB2
-    end
-
-    # @deprecated no longer used
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#arel2_visitors
-    def self.arel2_visitors(config)
-      { 'db2' => arel_visitor_type }
-    end
-
     # @private
     @@emulate_booleans = true
 
@@ -356,49 +345,57 @@ module ArJdbc
     # @param column (optional) contains info on the field
     # @override
     def quote(value, column = nil)
+      return value.quoted_id if value.respond_to?(:quoted_id)
       return value if sql_literal?(value)
 
-      # Can anyone explain what this is for?
-      if column && column.respond_to?(:primary) && column.primary && column.klass != String
-        return value.to_i.to_s
+      if column
+        if column.respond_to?(:primary) && column.primary && column.klass != String
+          return value.to_i.to_s
+        end
+        if value && (column.type.to_sym == :decimal || column.type.to_sym == :integer)
+          return value.to_s
+        end
       end
 
       column_type = column && column.type.to_sym
 
       case value
-        when Numeric # IBM_DB doesn't accept quotes on numeric types
-          # if the column type is text or string, return the quote value
-          if column_type == :text || column_type == :string
-            "'#{value}'"
-          else
-            super
-          end
-
-        when String, ActiveSupport::Multibyte::Chars
-          if column_type == :binary && column.sql_type !~ /for bit data/i
-            if update_lob_value?(value, column)
-              BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
-            else
-              "BLOB('#{super}')"
-            end
-          elsif column && column.sql_type =~ /clob/ # :text
-            CLOB_VALUE_MARKER if update_lob_value?(value, column)# "'@@@IBMTEXT@@@'"
+      when nil then 'NULL'
+      when Numeric # IBM_DB doesn't accept quotes on numeric types
+        # if the column type is text or string, return the quote value
+        if column_type == :text || column_type == :string
+          "'#{value}'"
+        else
+          value.to_s
+        end
+      when String, ActiveSupport::Multibyte::Chars
+        if column_type == :binary && column.sql_type !~ /for bit data/i
+          if update_lob_value?(value, column)
+            value.nil? ? 'NULL' : BLOB_VALUE_MARKER # '@@@IBMBINARY@@@'"
           else
-            super
+            "BLOB('#{quote_string(value)}')"
           end
-
-        when Time
-          # AS400 doesn't support date in time column
-          if column_type == :time
-            quote_time(value)
+        elsif column && column.sql_type =~ /clob/ # :text
+          if update_lob_value?(value, column)
+            value.nil? ? 'NULL' : CLOB_VALUE_MARKER # "'@@@IBMTEXT@@@'"
           else
-            super
+            "'#{quote_string(value)}'"
           end
-
+        elsif column_type == :xml
+          value.nil? ? 'NULL' : "'#{quote_string(value)}'" # "'<ibm>@@@IBMXML@@@</ibm>'"
+        else
+          "'#{quote_string(value)}'"
+        end
+      when Symbol then "'#{quote_string(value.to_s)}'"
+      when Time
+        # AS400 doesn't support date in time column
+        if column_type == :time
+          quote_time(value)
         else
           super
+        end
+      else super
       end
-
     end
 
     # @override
@@ -484,26 +481,29 @@ module ArJdbc
 
     # @private shared with {Arel::Visitors::DB2}
     def replace_limit_offset!(sql, limit, offset, orders = nil)
-      # Ordering is done somewhere before this method gets called
+      limit = limit.to_i
+
+      if offset # && limit
+        over_order_by = nil # NOTE: orders matching got reverted as it was not complete and there were no case covering it ...
 
-      # Create the limit and offset sql
-      param_sql = ''
+        start_sql = "SELECT B.* FROM (SELECT A.*, row_number() OVER (#{over_order_by}) AS internal$rownum FROM (SELECT"
+        end_sql = ") A ) B WHERE B.internal$rownum > #{offset} AND B.internal$rownum <= #{limit + offset.to_i}"
 
-      if offset.present? && limit.present?
-        param_sql << " LIMIT #{limit} OFFSET #{offset} "
+        if sql.is_a?(String)
+          sql.sub!(/SELECT/i, start_sql)
+          sql << end_sql
+        else # AR 4.2 sql.class ... Arel::Collectors::Bind
+          sql.parts[0] = start_sql # sql.sub! /SELECT/i
+          sql.parts[ sql.parts.length ] = end_sql
+        end
       else
-        param_sql << " OFFSET #{offset}" if offset.present?
-        if limit.present?
-          param_sql << (limit == 1 ? ' FETCH FIRST ROW ONLY' : " FETCH FIRST #{limit} ROWS ONLY")
+        limit_sql = limit == 1 ? " FETCH FIRST ROW ONLY" : " FETCH FIRST #{limit} ROWS ONLY"
+        if sql.is_a?(String)
+          sql << limit_sql
+        else # AR 4.2 sql.class ... Arel::Collectors::Bind
+          sql.parts[ sql.parts.length ] = limit_sql
         end
       end
-
-      if sql.is_a?(String)
-        sql << param_sql
-      else # AR 4.2 sql.class ... Arel::Collectors::Bind
-        sql.parts[sql.parts.length] = param_sql
-      end
-
       sql
     end
 
@@ -568,7 +568,6 @@ module ArJdbc
     end
 
     def change_column_null(table_name, column_name, null)
-      raise NotImplementedError, "DB2 for zOS does not support changing the column's nullability" if zos?
       if null
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP NOT NULL"
       else
@@ -579,7 +578,6 @@ module ArJdbc
 
     def change_column_default(table_name, column_name, default)
       if default.nil?
-        raise NotImplementedError, "DB2 for zOS does not support changing the column default to NULL" if zos?
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} DROP DEFAULT"
       else
         sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET WITH DEFAULT #{quote(default)}"
@@ -682,12 +680,6 @@ module ArJdbc
     # @override
     def supports_views?; true end
 
-    # @override
-    def supports_foreign_keys?; true end
-
-	  # @override
-    def supports_ddl_transactions?; true end
-
     def execute_table_change(sql, table_name, name = nil)
       outcome = execute(sql, name)
       reorg_table(table_name, name)
@@ -705,7 +697,7 @@ module ArJdbc
     # Returns the value of an identity column of the last *INSERT* statement
     # made over this connection.
     # @note Check the *IDENTITY_VAL_LOCAL* function for documentation.
-    # @return [Integer]
+    # @return [Fixnum]
     def last_insert_id
       @connection.identity_val_local
     end
@@ -734,14 +726,11 @@ module ArJdbc
 
     # @private
     def zos?
-      @zos = config[:zos] unless defined? @zos
+      @zos = nil unless defined? @zos
       return @zos unless @zos.nil?
-      # jdbc:db2: - connection to a DB2 for z/OS, DB2 for Linux, UNIX, and Windows
-      # jdbc:db2j:net: - connection is to a remote IBM Cloudscape server
-      # jdbc:ids: - informix (not supported)
       @zos =
         if url = config[:url]
-          !!( config[:driver] == DRIVER_NAME && url =~ /^jdbc:db2j:net:/ )
+          !!( url =~ /^jdbc:db2j:net:/ && config[:driver] == DRIVER_NAME )
         else
           nil
         end