activerecord-jdbc-alt-adapter 51.7.0-java → 52.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bac3f491bd6e25ce779db381c70f8de2bcfc566f7d7add71c73453d4b9d96da
-  data.tar.gz: 5e3cdf41dde39ac86a39d6d21057ede60c0fa321aa9e1164cc5c13c1b6584800
+  metadata.gz: 7b4f2f45217c4f0c6288ef6375f304b68a243adfe3a436c06c101e24d50e1ec5
+  data.tar.gz: 2304823483354e2e1c2cd2d5eae14325e7980da104e0e3b717fd373daa8c01ad
 SHA512:
-  metadata.gz: 28c69d682d31b0c159bf4fbc309699c0c362696e7edff789e1a51304284407dd09f4f63bf0d97bd460616378b3456cad4535c7fef4c19d607a92ccb962c8d80d
-  data.tar.gz: d83167a275cc51a6715f9a019d8df7519c6bb35d531466fe2e0c61191150238f20c70f9ae233a85e5ad31f89ae61b2f28d9c1fb2b7a17e2591c2ca2ccf529b1b
+  metadata.gz: ad807e645ff8175d8822ab5ffd32ca5f80a67d7a056987e15297611efeec5161a4dae42cc1a40dbcba71ae09df169c16f7f5c3591d0eb068bb8d8e7bf80385f3
+  data.tar.gz: c16e63f118c4a4609516e6f43c7bf0fcf17521bde1ab0e7587a500049863473f59eeeeca9d3c4882da38b546a8387338c8ffd1bc210bfd7b28aad595bc1e2f10

data/.gitignore

@@ -2,7 +2,6 @@
 *.tgz
 *~
 *.log
-/log/
 patches*
 *#
 TAGS
@@ -34,5 +33,3 @@ activerecord-jdbc.iml
 lib/arjdbc/jdbc/adapter_java.jar
 .jrubyrc
 tags
-.ruby-version
-pik.sh

data/.travis.yml

@@ -1,27 +1,18 @@
+language: ruby
 sudo: false
-dist: xenial
-
-services:
-  - mysql
-addons:
-  postgresql: 9.4
-
+branches:
+  only:
+  - master
+  - /.*-stable$/
+  - /^test-.*/
+  - /maintenance|support/
+  - /.*dev$/
+bundler_args: --without development
+script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_install:
   - unset _JAVA_OPTIONS
   - rvm @default,@global do gem uninstall bundler -a -x -I || true
   - gem install bundler -v "~>1.17.3"
-install:
-- bundle install --retry 3 --without development
-# to fix this issue: https://travis-ci.community/t/mariadb-10-1-fails-to-install-on-xenial/3151/3
-- mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' || true
-
-language: ruby
-rvm:
-  - jruby-9.1.16.0
-jdk:
-  - openjdk8
-
-script: bundle exec rake ${TEST_PREFIX}test_$DB
 before_script:
   - echo "JAVA_OPTS=$JAVA_OPTS"
   - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"
@@ -47,7 +38,12 @@ before_script:
     psql  -c "create database activerecord_unittest;" -U postgres && \
     psql  -c "create database activerecord_unittest2;" -U postgres \
     || true
-
+rvm:
+  - jruby-9.1.16.0
+jdk:
+  - openjdk8
+addons:
+  postgresql: "9.4"
 env:
   - DB=mysql2 PREPARED_STATEMENTS=false
   - DB=mysql2 PREPARED_STATEMENTS=true
@@ -90,15 +86,15 @@ matrix:
       env: DB=sqlite3
     # testing against MariaDB
     - addons:
-        mariadb: 10.2
+        mariadb: '10.0'
       env: DB=mariadb PREPARED_STATEMENTS=false
     - addons:
-        mariadb: 10.3
+        mariadb: '10.1'
       env: DB=mariadb PREPARED_STATEMENTS=true
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.7" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.7" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.7" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.1.7"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.2.3" DRIVER=MariaDB
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" # PS on by default
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.2.3" PREPARED_STATEMENTS=false
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.2.3"

data/Gemfile

@@ -48,14 +48,13 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'jdbc-mssql', '~> 0.7.0', require: nil
+  gem 'jdbc-mssql', '~> 0.6.0', require: nil
   # gem 'pry-debugger-jruby', platform: :jruby
 end
 
 group :rails do
   group :test do
-    # FIX: Our test suite isn't ready to run in random order yet.
-    gem 'minitest', '< 5.3.4', require: nil
+    gem 'minitest', '~> 5.11.3', require: nil
     gem 'minitest-excludes', '~> 2.0.1', require: nil
     gem 'minitest-rg', require: nil
 

data/README.md

@@ -6,13 +6,16 @@ supported by the original adapter such as PostgreSQL but it is advised to
 use the [original adapter](https://github.com/jruby/active)
 
 This adapter only works with JRuby and it is advised to install the latest
-stable versins of Rails
+stable versions of Rails
 
 - For Rails `5.0.7.2` install the `50.3.1` version of this adapter
 - For Rails `5.1.7` install the `51.3.0` version of this adapter
+- For Rails `5.2.3` install the `52.2.0` version of this adapter
 
-Support for Rails 5.2 is planned in the near future.
+Support for Rails 6.0 is planned in the future.
 
+This adapter passes most of the Rails tests (ActiveRecord tests) with the
+exception of some test that are not compatible with the SQL Server
 
 ### How to use it:
 
@@ -99,7 +102,7 @@ production:
 ```
 
 
-### WARNING
+### NOTE
 
 Keep one eye in the Rails connection pool, we have not thoroughly tested that
 part since we don't use the default Rails connection pool, other than that
@@ -114,20 +117,26 @@ this adapter should just work.
 ActiveRecord-JDBC-Adapter (AR-JDBC) is the main database adapter for Rails'
 *ActiveRecord* component that can be used with [JRuby][0].
 ActiveRecord-JDBC-Adapter provides full or nearly full support for:
-**MySQL**, **PostgreSQL**, **SQLite3** and **MSSQL*** (SQLServer).
-
-Unless we get more contributions we will not be supporting more adapters.
-Note that the amount of work needed to get another adapter is not huge but
-the amount of testing required to make sure that adapter continues to work
-is not something we can do with the resources we currently have.
-
-- for **Oracle** database users you are encouraged to use
-  https://github.com/rsim/oracle-enhanced
-- **MSSQL** adapter's gem parts reside in a [separate repository][8]
-
-Version **50.x** supports Rails version 5.0.x and it lives on branch 50-stable.
-Version **51.x** supports Rails version 5.1.x and is currently on master until
-its first release. The minimum version of JRuby for 50+ is JRuby **9.1.x** and
+**MySQL**, **PostgreSQL**, **SQLite3**.  In the near future there are plans to
+add support **MSSQL**. Unless we get more contributions we will not be going
+beyond these four adapters.  Note that the amount of work needed to get
+another adapter is not huge but the amount of testing required to make sure
+that adapter continues to work is not something we can do with the resources
+we currently have.
+
+For Oracle database users you are encouraged to use
+https://github.com/rsim/oracle-enhanced.
+
+Versions are targeted at certain versions of Rails and live on their own branches.
+
+| Gem Version | Rails Version | Branch |
+| ----------- | ------------- | ------ |
+| 50.x        | 5.0.x         | 50-stable |
+| 51.x        | 5.1.x         | 51-stable |
+| 52.x        | 5.2.x         | 52-stable |
+| future      | latest        | master    |
+
+The minimum version of JRuby for 50+ is JRuby **9.1.x** and
 JRuby 9.1+ requires Java 7 or newer (we recommend Java 8 at minimum).
 
 ## Using ActiveRecord JDBC
@@ -142,7 +151,6 @@ adapters are available:
   - MySQL (`activerecord-jdbcmysql-adapter`)
   - PostgreSQL (`activerecord-jdbcpostgresql-adapter`)
   - SQLite3 (`activerecord-jdbcsqlite3-adapter`)
-  - MSSQL (`activerecord-jdbcsqlserver-adapter`)
 
 2. If you're generating a new Rails application, use the following command:
 
@@ -277,4 +285,4 @@ license the database's drivers are licensed. See each driver gem's LICENSE.txt.
 [5]: https://github.com/jruby/activerecord-jdbc-adapter/wiki
 [6]: https://webchat.freenode.net/?channels=#jruby
 [7]: http://badge.fury.io/rb/activerecord-jdbc-adapter
-[8]: https://github.com/jruby/activerecord-jdbcsqlserver-adapter
+[8]: https://github.com/jruby/activerecord-jdbc-adapter/wiki/Migrating-from-1.2.x-to-1.3.0

data/Rakefile

@@ -1,29 +1,3 @@
-# Common usage
-#
-#   rake build:adapters - to build all specific adapter gems and the base gem
-#   rake release:do - build:adapters + git tag + push gems
-#
-# Environment variables used by this Rakefile:
-#
-# INCLUDE_JAR_IN_GEM [default task - false, other taks - true]:
-#   Note: This is something you should not normally have to set.
-#   For local development we always will end up including the jar file
-#   in any task which generates our main gem.  The wrinkle to this
-#   is when we do a custom github link in bundler:
-#
-#      gem 'ar-jdbc', github: '...'
-#
-#   Because we stopped committing a .jar file for every change and so when
-#   we  include a gem like this it clones the repository and does a default
-#   build in rake.  This in turn will end up forcing a compile to generate
-#   that jar (similar to how c-extensions compile at the time of install).
-#   For shipped gems we do include the jar so that people do not require
-#   this compile step.
-#
-# NOOP [release:do - false]
-#
-#   No commands or gem pushing during a release.
-
 require 'rake/clean'
 
 CLEAN.include 'derby*', 'test.db.*', '*test.sqlite3', 'test/reports'
@@ -64,8 +38,7 @@ rake = lambda { |task| ruby "-S", "rake", task }
 
 desc "Build #{gem_name} gem into the pkg directory."
 task :build => :jar do
-  include_jar = ENV['INCLUDE_JAR_IN_GEM'] || 'true'
-  sh("INCLUDE_JAR_IN_GEM=#{include_jar} gem build -V '#{gemspec_path}'") do
+  sh("RELEASE=#{ENV['RELEASE']} gem build -V '#{gemspec_path}'") do
     gem_path = built_gem_path.call
     file_name = File.basename(gem_path)
     FileUtils.mkdir_p(File.join(base_dir, 'pkg'))
@@ -85,6 +58,7 @@ end
 
 desc "Releasing AR-JDBC gems (use NOOP=true to disable gem pushing)"
 task 'release:do' do
+  ENV['RELEASE'] = 'true' # so that .gemspec is built with adapter_java.jar
   Rake::Task['build'].invoke
   # Rake::Task['build:adapters'].invoke
 
@@ -283,7 +257,7 @@ if defined? JRUBY_VERSION
       begin
         require 'arjdbc/version'
       rescue LoadError
-        path = File.expand_path('lib', File.dirname(__FILE__))
+        path = File.expand_path('../lib', File.dirname(__FILE__))
         unless $LOAD_PATH.include?(path)
           $LOAD_PATH << path; retry
         end
@@ -323,7 +297,7 @@ if defined? JRUBY_VERSION
       # class_files.gsub!('$', '\$') unless windows?
       # args = class_files.map { |path| [ "-C #{classes_dir}", path ] }.flatten
 
-      if ENV['INCLUDE_JAR_IN_GEM'] == 'true'; require 'tempfile'
+      if ENV['RELEASE'] == 'true'; require 'tempfile'
         manifest  = "Built-Time: #{Time.now.utc.strftime('%Y-%m-%d %H:%M:%S')}\n"
         manifest += "Built-JRuby: #{JRUBY_VERSION}\n"
         manifest += "Specification-Title: ActiveRecord-JDBC\n"

data/activerecord-jdbc-adapter.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |gem|
     reject { |f| f =~ /^(gemfiles)/ } # no tests - no Gemfile_s appraised ...
   gem.files += ['lib/arjdbc/jdbc/adapter_java.jar'] #if ENV['RELEASE'].eql?('true')
 
-  if ENV['INCLUDE_JAR_IN_GEM'] != 'true' # @see Rakefile
+  if ENV['RELEASE'] != 'true' # @see Rakefile
     gem.extensions << 'Rakefile' # to support auto-building .jar with :git paths
 
     #gem.add_runtime_dependency 'jar-dependencies', '~> 0.1' # development not enough!
@@ -44,7 +44,7 @@ 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', '~> 5.1.0'
+  gem.add_dependency 'activerecord', '~> 5.2.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/activerecord-jdbc-alt-adapter.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.license = 'BSD-2-Clause'
   gem.summary = 'ActiveRecord JDBC adapter, for use within JRuby on Rails and SQL Server'
   gem.description = "" <<
-    "Fork of the ActiveRecord JDBC adapter with support for SQL Server and Azure SQL, " <<
+    "Fork of the ActiveRecord JDBC adapter with support for SQL Server/Azure SQL, " <<
     "for more information and help look at the README file in the github repository. " <<
     "AR-JDBC is a database adapter for Rails' ActiveRecord component designed " <<
     "to be used with JRuby built upon Java's JDBC API for database access. " <<
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
     "as well as adapters for popular databases such as Oracle, SQLServer, " <<
     "DB2, FireBird and even Java (embed) databases: Derby, HSQLDB and H2. " <<
     "It allows to connect to virtually any JDBC-compliant database with your " <<
-    "JRuby on Rails application. This fork supports SQL Server/Azure SQL."
+    "JRuby on Rails application."
 
   gem.require_paths = ["lib"]
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
     reject { |f| f =~ /^(gemfiles)/ } # no tests - no Gemfile_s appraised ...
   gem.files += ['lib/arjdbc/jdbc/adapter_java.jar'] #if ENV['RELEASE'].eql?('true')
 
-  if ENV['INCLUDE_JAR_IN_GEM'] != 'true' # @see Rakefile
+  if ENV['RELEASE'] != 'true' # @see Rakefile
     gem.extensions << 'Rakefile' # to support auto-building .jar with :git paths
 
     #gem.add_runtime_dependency 'jar-dependencies', '~> 0.1' # development not enough!
@@ -46,7 +46,7 @@ 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', '~> 5.1.0', '>= 5.1.7'
+  gem.add_dependency 'activerecord', '~> 5.2.0', '>= 5.2.3'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arel/visitors/sqlserver.rb

@@ -18,7 +18,7 @@ module Arel
 
       def visit_Arel_Nodes_BindParam o, collector
         # collector.add_bind(o) { |i| "@#{i-1}" }
-        collector.add_bind(o) { |i| '?' }
+        collector.add_bind(o.value) { |i| '?' }
       end
 
       def visit_Arel_Nodes_Bin o, collector
@@ -212,6 +212,7 @@ module Arel
       def primary_Key_From_Table t
         return unless t
         # column_name = schema_cache.primary_keys(t.name) || column_cache(t.name).first.try(:second).try(:name)
+        # NOTE: for table name aliases columns_hash('table_alias')  requires to return an empty hash.
         column_name = @connection.schema_cache.primary_keys(t.name) ||
           @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
         column_name ? t[column_name] : nil

data/lib/arjdbc/abstract/core.rb

@@ -56,7 +56,7 @@ module ArJdbc
         case e
           when SystemExit, SignalException, NoMemoryError then e
           when ActiveModel::RangeError, TypeError, RuntimeError then e
-          else super
+          else ActiveRecord::StatementInvalid.new(message)
         end
       end
 
@@ -73,4 +73,14 @@ module ArJdbc
       end
     end
   end
-end
+
+  module LogSubscriber
+    JDBC_GEM_ROOT = File.expand_path("../../../..", __FILE__) + "/"
+
+    # Remove this gem from log trace so that query shows where it was called in application
+    def ignored_callstack(path)
+      super || path.start_with?(JDBC_GEM_ROOT)
+    end
+  end
+  ActiveRecord::LogSubscriber.prepend(ArJdbc::LogSubscriber)
+end

data/lib/arjdbc/abstract/database_statements.rb

@@ -10,13 +10,11 @@ module ArJdbc
       NO_BINDS = [].freeze
 
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil)
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-
         if without_prepared_statement?(binds)
-          log(sql, name) { @connection.execute_insert_pk(sql, pk) }
+          log(sql, name) { @connection.execute_insert(sql) }
         else
           log(sql, name, binds) do
-            @connection.execute_insert_pk(sql, binds, pk)
+            @connection.execute_insert(sql, binds)
           end
         end
       end
@@ -24,8 +22,6 @@ module ArJdbc
       # It appears that at this point (AR 5.0) "prepare" should only ever be true
       # if prepared statements are enabled
       def exec_query(sql, name = nil, binds = NO_BINDS, prepare: false)
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-
         if without_prepared_statement?(binds)
           log(sql, name) { @connection.execute_query(sql) }
         else
@@ -38,8 +34,6 @@ module ArJdbc
       end
 
       def exec_update(sql, name = nil, binds = NO_BINDS)
-        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
-
         if without_prepared_statement?(binds)
           log(sql, name) { @connection.execute_update(sql) }
         else
@@ -48,10 +42,30 @@ module ArJdbc
       end
       alias :exec_delete :exec_update
 
+      # overridden to support legacy binds
+      def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
+        super
+      end
+      alias create insert
+
+      # overridden to support legacy binds
+      def update(arel, name = nil, binds = [])
+        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
+        super
+      end
+
+      # overridden to support legacy binds
+      def delete(arel, name = nil, binds = [])
+        binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
+        super
+      end
+
       def execute(sql, name = nil)
         log(sql, name) { @connection.execute(sql) }
       end
 
+      # overridden to support legacy binds
       def select_all(arel, name = nil, binds = NO_BINDS, preparable: nil)
         binds = convert_legacy_binds_to_attributes(binds) if binds.first.is_a?(Array)
         super

data/lib/arjdbc/abstract/statement_cache.rb

@@ -42,6 +42,7 @@ module ArJdbc
       end
 
       def supports_statement_cache?
+        ActiveSupport::Deprecation.deprecation_warning(__method__)
         @jdbc_statement_cache_enabled
       end
 

data/lib/arjdbc/db2/adapter.rb

@@ -30,6 +30,65 @@ module ArJdbc
   # @note This adapter doesn't support explain `config.active_record.auto_explain_threshold_in_seconds` should be commented (Rails < 4.0)
   module DB2
 
+
+    module ActiveRecord::ConnectionAdapters
+
+      remove_const(:DB2Adapter) if const_defined?(:DB2Adapter)
+
+      class DB2Adapter < JdbcAdapter
+
+        include ArJdbc::DB2
+        include ArJdbc::DB2::Column
+
+        # AR 5.2 Fix
+        def initialize(connection, logger = nil, connection_parameters = nil, config = {})
+          super(connection, logger, config) # configure_connection happens in super
+        end
+
+        def jdbc_connection_class(spec)
+          ArJdbc::DB2.jdbc_connection_class
+        end
+
+        def data_source_sql(name = nil, type: nil)
+          scope = quoted_scope(name, type: type)
+
+          sql = if scope[:type] == "'T'"
+                  "select table_name from sysibm.tables".dup
+                else
+                  "select table_name from sysibm.views".dup
+                end
+
+          wheres = []
+
+          wheres << " table_type = #{scope[:type]}" if scope[:type]
+          wheres << " table_schema = #{scope[:schema]}" if scope[:schema]
+          wheres << " UPPER(table_name) = UPPER(#{scope[:name]})" if scope[:name]
+
+          if wheres.present?
+            sql << ' WHERE '
+            sql << wheres.join(' AND ')
+          end
+          sql
+        end
+
+        def quoted_scope(name = nil, type: nil)
+          type = \
+              case type
+              when "BASE TABLE"
+                "'T'"
+              when "VIEW"
+                "'V'"
+              end
+          scope = {}
+          scope[:name] = quote(name) if name
+          scope[:type] = type if type
+          scope[:schema] = quote(scope[:schema] || schema)
+          scope
+        end
+
+      end
+    end
+
     # @private
     def self.extended(adapter); initialize!; end
 
@@ -269,6 +328,17 @@ module ArJdbc
       select_one(sql).nil?
     end
 
+    # @override
+    def primary_keys(table)
+      # If no schema in table name is given but present in URL parameter. Use the URL parameter one
+      # This avoids issues if the table is present in multiple schemas
+      if table.split(".").size == 1 && schema
+        table = "#{schema}.#{table}"
+      end
+
+      super
+    end
+
     def next_sequence_value(sequence_name)
       select_value("SELECT NEXT VALUE FOR #{sequence_name} FROM sysibm.sysdummy1")
     end
@@ -378,9 +448,9 @@ module ArJdbc
       types
     end
 
-    def type_to_sql(type, limit = nil, precision = nil, scale = nil)
+    def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
       limit = nil if type.to_sym == :integer
-      super(type, limit, precision, scale)
+      super
     end
 
     # @private
@@ -393,7 +463,7 @@ module ArJdbc
 
     def add_column(table_name, column_name, type, options = {})
       # The keyword COLUMN allows to use reserved names for columns (ex: date)
-      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+      add_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ADD COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options)}"
       add_column_options!(add_column_sql, options)
       execute(add_column_sql)
     end
@@ -536,7 +606,7 @@ module ArJdbc
     end
 
     def change_column(table_name, column_name, type, options = {})
-      data_type = type_to_sql(type, options[:limit], options[:precision], options[:scale])
+      data_type = type_to_sql(type, options)
       sql = "ALTER TABLE #{table_name} ALTER COLUMN #{column_name} SET DATA TYPE #{data_type}"
       execute_table_change(sql, table_name, 'Change Column')
 
@@ -644,11 +714,10 @@ module ArJdbc
 
     # alias_method :execute_and_auto_confirm, :execute
 
-    # Returns the value of an identity column of the last *INSERT* statement
-    # made over this connection.
+    # 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 [Fixnum]
-    def last_insert_id
+    # @return [Integer, NilClass]
+    def last_inserted_id(result)
       @connection.identity_val_local
     end
 

data/lib/arjdbc/db2/as400.rb

@@ -4,6 +4,18 @@ module ArJdbc
   module AS400
     include DB2
 
+    module ActiveRecord::ConnectionAdapters
+      remove_const(:AS400Adapter) if const_defined?(:AS400Adapter)
+      class AS400Adapter < DB2Adapter
+
+        include ::ArJdbc::AS400
+
+        def jdbc_connection_class(spec)
+          ArJdbc::AS400.jdbc_connection_class
+        end
+      end
+    end
+
     # @private
     def self.extended(adapter); DB2.extended(adapter); end
 

data/lib/arjdbc/db2/column.rb

@@ -47,6 +47,9 @@ module ArJdbc
 
       # @override
       def type_cast(value)
+        # AR5.2
+        return super unless respond_to?(:type)
+
         return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
         case type
         when :string    then value

data/lib/arjdbc/db2/connection_methods.rb

@@ -15,6 +15,8 @@ ArJdbc::ConnectionMethods.module_eval do
     end
     config[:driver] ||= ::ArJdbc::DB2::DRIVER_NAME
     config[:connection_alive_sql] ||= 'SELECT 1 FROM syscat.tables FETCH FIRST 1 ROWS ONLY'
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::DB2Adapter unless config.key?(:adapter_class)
+
     jdbc_connection(config)
   end
   alias_method :jdbcdb2_connection, :db2_connection
@@ -38,6 +40,8 @@ ArJdbc::ConnectionMethods.module_eval do
     require 'arjdbc/db2/as400'
     config[:driver] ||= ::ArJdbc::AS400::DRIVER_NAME
     config[:connection_alive_sql] ||= 'SELECT 1 FROM sysibm.tables FETCH FIRST 1 ROWS ONLY'
+    config[:adapter_class] = ActiveRecord::ConnectionAdapters::AS400Adapter unless config.key?(:adapter_class)
+
     jdbc_connection(config)
   end
   alias_method :jdbcas400_connection, :as400_connection

data/lib/arjdbc/jdbc/adapter.rb

@@ -250,12 +250,6 @@ module ActiveRecord
         end
       end
 
-      # @private
-      # @override
-      def select_rows(sql, name = nil, binds = [])
-        exec_query_raw(sql, name, binds).map!(&:values)
-      end
-
       # Executes the SQL statement in the context of this connection.
       # The return value from this method depends on the SQL type (whether
       # it's a SELECT, INSERT etc.). For INSERTs a generated id might get
@@ -364,6 +358,10 @@ module ActiveRecord
       # @return [Integer, NilClass]
       def last_inserted_id(result)
         if result.is_a?(Hash) || result.is_a?(ActiveRecord::Result)
+          # If table does not have primary key defined
+          return nil if result.first.blank?
+
+
           result.first.first[1] # .first = { "id"=>1 } .first = [ "id", 1 ]
         else
           result