activerecord-jdbc-adapter 50.8-java → 51.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5478648fcae62c384d0b8aeb74486d827353baa4560835bf589048bd20050da3
-  data.tar.gz: 12d6e871274580e3dcbdf76e6b64daddae45fbd77c7bc7673e0f1416bd1a06c5
+SHA1:
+  metadata.gz: a171f4269e41c768fcbfaaccbf2f6f2c2df051ae
+  data.tar.gz: ec6aee76c700cfec4c7cfb3ffd64de135149a159
 SHA512:
-  metadata.gz: e9ae9c43b64186aa46d3df3e0e395778577f1db175fc84ea812687392b9a0437ef66ae4fdb42e7bfff717795dd1b0d93d2cf56944b7467f7fe222ecb6c6495b9
-  data.tar.gz: fe36ac65f5deb2e83bf8480c12292db537bc3ca5184c390495d8a459c1a91c2be4c5aa8ffa4ae8d5888a003eb74ece8b94e513e654f011670362a4c57a9d3a78
+  metadata.gz: c51149881eb9da030aad612f6df71cb2bff662ed6288cacb14aa7ddd61e42c42039ca0b425ed7df06345b71319f417bf4bc3e23f112113ff8403827127c075ef
+  data.tar.gz: ac52a7288354ab3ee6871fa149eff7cc7d74242e8950d46d43d9e034a511d665bdc61e7de44aa5491ecdb6ce07b3da36f88b55e0bdcb0973158432cef1c34470

data/.gitignore

@@ -2,7 +2,6 @@
 *.tgz
 *~
 *.log
-/log/
 patches*
 *#
 TAGS
@@ -31,4 +30,4 @@ Gemfile.lock
 .idea
 .settings
 activerecord-jdbc.iml
-lib/arjdbc/jdbc/adapter_java.jar
+lib/arjdbc/jdbc/adapter_java.jar

data/.travis.yml

@@ -1,27 +1,9 @@
+language: ruby
 sudo: false
-dist: xenial
-
-services:
-  - mysql
-addons:
-  postgresql: 9.4
-
+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"
@@ -39,15 +21,18 @@ before_script:
     mysql -e "grant all privileges on activerecord_unittest.* to rails@localhost;" && \
     mysql -e "grant all privileges on activerecord_unittest2.* to rails@localhost;" && \
     mysql -e "grant all privileges on inexistent_activerecord_unittest.* to rails@localhost;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" && \
-    mysql -e "CREATE DATABASE activerecord_unittest2 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;" \
+    mysql -e "CREATE DATABASE activerecord_unittest;" && \
+    mysql -e "CREATE DATABASE activerecord_unittest2;" \
     || true
   - |
     [ "$DB" == "postgresql" ] && [ "$TEST_PREFIX" == "rails:" ] && \
     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
 env:
   - DB=mysql2 PREPARED_STATEMENTS=false
   - DB=mysql2 PREPARED_STATEMENTS=true
@@ -58,29 +43,19 @@ env:
   - DB=postgresql PREPARED_STATEMENTS=true INSERT_RETURNING=true
   - DB=sqlite3 PREPARED_STATEMENTS=false
   - DB=sqlite3 PREPARED_STATEMENTS=true
-  - DB=jndi PREPARED_STATEMENTS=false
-  - DB=jndi PREPARED_STATEMENTS=true
+  #- DB=jndi PREPARED_STATEMENTS=false
+  #- DB=jndi PREPARED_STATEMENTS=true
+branches:
+  only:
+    - master
+    - /.*-stable$/
+    - /^test-.*/
+    - /maintenance|support/
+    - /.*dev$/
 matrix:
   allow_failures:
     - rvm: jruby-head
   include:
-    # jruby-9.2
-    - rvm: jruby-9.2.6.0
-      env: DB=mysql2
-    - rvm: jruby-9.2.6.0
-      env: DB=postgresql
-    - rvm: jruby-9.2.6.0
-      env: DB=sqlite3
-    # jruby-9.2 + Java 11
-    - rvm: jruby-9.2.6.0
-      env: DB=mysql2
-      jdk: openjdk11
-    - rvm: jruby-9.2.6.0
-      env: DB=postgresql
-      jdk: openjdk11
-    - rvm: jruby-9.2.6.0
-      env: DB=sqlite3
-      jdk: openjdk11
     # jruby-head
     - rvm: jruby-head
       env: DB=mysql2
@@ -90,15 +65,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.0.7.1" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.0.7.1"
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.6" # PS off by default
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.6" PREPARED_STATEMENTS=true
+    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.1.6" DRIVER=MariaDB
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.6" # PS on by default
+    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.1.6" PREPARED_STATEMENTS=false
+    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.1.6"

data/Gemfile

@@ -48,7 +48,6 @@ group :test do
   gem 'mocha', '~> 1.2', require: false # Rails has '~> 0.14'
 
   gem 'bcrypt', '~> 3.1.11', require: false
-  gem 'builder', require: false
 end
 
 group :rails do
@@ -61,6 +60,9 @@ group :rails do
     gem 'benchmark-ips', require: nil
   end
 
+  # AR expects this for testing xml in postgres (maybe others?)
+  gem 'builder', require: nil
+
   gem 'erubis', require: nil # "~> 2.7.0"
   # NOTE: due rails/activerecord/test/cases/connection_management_test.rb
   gem 'rack', require: nil

data/README.md

@@ -5,16 +5,15 @@
 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).
+**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.
 
-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]
+For Oracle database users you are encouraged to use
+https://github.com/rsim/oracle-enhanced.
 
 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
@@ -33,7 +32,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:
 
@@ -168,4 +166,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
 
@@ -262,43 +236,23 @@ if defined? JRUBY_VERSION
     end
 
     classpath = []
-    [ 'java.class.path', 'sun.boot.class.path' ].map { |key| ENV_JAVA[key] }.each do |v|
-      classpath += v.split(File::PATH_SEPARATOR).find_all { |jar| jar =~ /jruby/i } if v
+    [ 'java.class.path', 'sun.boot.class.path' ].each do |key|
+      classpath += ENV_JAVA[key].split(File::PATH_SEPARATOR).find_all { |jar| jar =~ /jruby/i }
     end
-    # Using Java 9+.  Let's try and infer jruby.jar location from rbconfig
-    if classpath.empty?; require 'rbconfig'
-      libdir = RbConfig::CONFIG['libdir']
-      if libdir.start_with? 'classpath:'
-        error "Cannot build activerecord-jdbc with jruby-complete"
-      end
-      classpath << File.join(libdir, 'jruby.jar')
-    end
-    
+
+    #classpath += ENV_JAVA['java.class.path'].split(File::PATH_SEPARATOR)
+    #classpath += ENV_JAVA['sun.boot.class.path'].split(File::PATH_SEPARATOR)
+
     classpath += driver_jars
     classpath = classpath.compact.join(File::PATH_SEPARATOR)
 
     source_files = FileList[ 'src/java/**/*.java' ]
 
-    version = lambda do
-      begin
-        require 'arjdbc/version'
-      rescue LoadError
-        path = File.expand_path('lib', File.dirname(__FILE__))
-        unless $LOAD_PATH.include?(path)
-          $LOAD_PATH << path; retry
-        end
-      end
-
-      gem_version = Gem::Version.create(ArJdbc::VERSION)
-      if gem_version.segments.last == 'DEV'
-        gem_version.segments[0...-1] # 50.0.DEV -> 50.0
-      else
-        gem_version.segments.dup
-      end
-    end
+    require 'tmpdir'
 
-    require 'tmpdir'; Dir.mktmpdir do |classes_dir|
-      # Cross-platform way of finding an executable in the $PATH. Thanks to @mislav
+    Dir.mktmpdir do |classes_dir|
+      # Cross-platform way of finding an executable in the $PATH.
+      # Thanks to @mislav
       which = lambda do |cmd|
         exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
         ENV['PATH'].split(File::PATH_SEPARATOR).map do |path|
@@ -322,24 +276,7 @@ if defined? JRUBY_VERSION
       # avoid environment variable expansion using backslash
       # class_files.gsub!('$', '\$') unless windows?
       # args = class_files.map { |path| [ "-C #{classes_dir}", path ] }.flatten
-
-      if ENV['INCLUDE_JAR_IN_GEM'] == '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"
-        manifest += "Specification-Vendor: JRuby\n"
-        manifest += "Specification-Version: #{version.call[0].to_s.split('').join('.')}\n" # AR VERSION (52 -> 5.2)
-        manifest += "Implementation-Vendor: The JRuby Team\n"
-        manifest += "Implementation-Version: #{version.call.join('.')}\n"
-        manifest  = Tempfile.new('MANIFEST').tap { |f| f << manifest; f.close }.path
-      end
-
-      args = []; opts = '-cf'
-      if manifest
-        opts = "#{opts}m"
-        args = [ "#{manifest}" ]
-      end
-      args += [ '-C', "#{classes_dir}/ ." ]
+      args = [ '-C', "#{classes_dir}/ ." ] # args = class_files
 
       jar_path = jar_file
       if ext_lib_dir = ENV['RUBYLIBDIR']
@@ -349,7 +286,7 @@ if defined? JRUBY_VERSION
       unless jar = which.call('jar')
         warn "could not find jar tool, please make sure it's on the PATH"
       end
-      sh("#{jar} #{opts} #{jar_path} #{args.join(' ')}") do |ok|
+      sh("#{jar} cf #{jar_path} #{args.join(' ')}") do |ok|
         raise 'could not build .jar extension - packaging failure' unless ok
       end
       cp jar_path, jar_file if ext_lib_dir # NOTE: hopefully RG won't mind?!
@@ -357,6 +294,6 @@ if defined? JRUBY_VERSION
   end
 else
   task :jar do
-    warn "please run `rake jar' under JRuby to re-compile the native (Java) extension"
+    puts "please run `rake jar' under JRuby to re-compile the native (Java) extension"
   end
 end

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.0.0', '>= 5.0.3'
+  gem.add_dependency 'activerecord', '~> 5.1.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/active_record/connection_adapters/mssql_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/mssql'

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -0,0 +1 @@
+require 'arjdbc/mssql'

data/lib/arjdbc/abstract/core.rb

@@ -22,7 +22,7 @@ module ArJdbc
 
         connection.configure_connection # will call us (maybe)
       end
-
+      
       # Retrieve the raw `java.sql.Connection` object.
       # The unwrap parameter is useful if an attempt to unwrap a pooled (JNDI)
       # connection should be made - to really return the 'native' JDBC object.
@@ -47,6 +47,8 @@ module ArJdbc
       end
 
       def translate_exception(e, message)
+        # override in derived class
+
         # we shall not translate native "Java" exceptions as they might
         # swallow an ArJdbc / driver bug into an AR::StatementInvalid !
         return e if e.is_a?(Java::JavaLang::Throwable)
@@ -54,21 +56,11 @@ 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
 
-      def extract_raw_bind_values(binds)
-        binds.map(&:value_for_database)
-      end
 
-      # this version of log() automatically fills type_casted_binds from binds if necessary
-      def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
-        if binds.any? && (type_casted_binds.nil? || type_casted_binds.empty?)
-          type_casted_binds = ->{ extract_raw_bind_values(binds) }
-        end
-        super
-      end
     end
   end
 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,22 +22,18 @@ 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
           log(sql, name, binds) do
-            # this is different from normal AR that always caches
-            cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
+            # It seems that #supports_statement_cache? is defined but isn't checked before setting "prepare" (AR 5.0)
+            cached_statement = fetch_cached_statement(sql) if prepare && supports_statement_cache?
             @connection.execute_prepared_query(sql, binds, cached_statement)
           end
         end
       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