activerecord-jdbc-adapter 1.3.22 → 1.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f59b963d6b856bb7a8ecd3ab0bf506653c04fc50
-  data.tar.gz: ff0251deca4b0c4dc691cabad8da7a6e63e3a6cd
+  metadata.gz: 87ea17eefa2d7db8e501c87fa8a349d93b3b2eeb
+  data.tar.gz: af9e8507422e47c0eea8b525b1f797b9ab67bcb7
 SHA512:
-  metadata.gz: 68dad2a1551b5c8fe023a0118a68786172a9df1e209261b8b66c47da4bcee33198d8a5640171ce0b9998a021164f0cbcc787e91e0ef9a5f11d3902b113de7153
-  data.tar.gz: 79d7ea6b89a613c149579e14fb065dee1e24ab93a0dae03513b3a56251edcd1c243f36b245c19de9440c87c69b830ec73336cd9cf1a43dc1651322effac8115a
+  metadata.gz: e3d85c46104e42aa4a1439e4a91c929bec9c5af3094c35999c784cfbbba97e837dbabf8d3627a38a5956bf7d69bad950c8621f74241733252582a70650c561d9
+  data.tar.gz: 48bbbd8d3cf5647e26378fcf6d7b86d64d877632d5abc0acac694aad1936dcca7656061722eea6b41e3a536c3afad31c96de2c2655aec9c9b75d1cbc899c808a

data/.travis.yml

@@ -46,25 +46,6 @@ branches:
     - /^test-.*/
 matrix:
   allow_failures:
-    # 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
     - env: DB=mariadb
     - env: DB=mariadb PREPARED_STATEMENTS=true
   include:
@@ -76,13 +57,13 @@ matrix:
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: openjdk6
     - addons:
-        mariadb: '10.0'
+        mariadb: '10.1'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails42.gemfile
       env: DB=mariadb
       jdk: openjdk7
     - addons:
-        mariadb: '10.0'
+        mariadb: '10.1'
       rvm: jruby-1.7.24
       gemfile: gemfiles/rails41.gemfile
       env: DB=mariadb PREPARED_STATEMENTS=true
@@ -113,7 +94,7 @@ matrix:
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: openjdk6
       # include testing with JRuby 9K (4.2) :
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
@@ -121,7 +102,7 @@ matrix:
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql PREPARED_STATEMENTS=true
       jdk: oraclejdk7
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk7
@@ -129,7 +110,7 @@ matrix:
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk8
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk8
@@ -137,15 +118,15 @@ matrix:
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk8
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk8
-    - rvm: jruby-9.1.6.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails42.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8
@@ -162,27 +143,27 @@ matrix:
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=mysql
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=postgresql
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=sqlite3
       jdk: oraclejdk8
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=derby
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=h2
       jdk: oraclejdk7
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.1.8.0
       gemfile: gemfiles/rails41.gemfile
       env: JRUBY_OPTS="$JRUBY_OPTS" DB=hsqldb
       jdk: oraclejdk8

data/Appraisals

@@ -21,11 +21,11 @@ appraise "rails40" do
 end
 
 appraise "rails41" do
-  gem "activerecord", "~> 4.1.8", :require => false
+  gem "activerecord", "~> 4.1.11", :require => false
 end
 
 appraise "rails42" do
-  gem "activerecord", "~> 4.2.0", :require => false
+  gem "activerecord", "~> 4.2.6", :require => false
 end
 
 appraise "railsNG" do

data/Gemfile

@@ -14,6 +14,10 @@ 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'

data/History.md

@@ -1,3 +1,12 @@
+## 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)

data/activerecord-jdbc-adapter.gemspec

@@ -29,8 +29,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/})
 
-  # NOTE: 1.3.0 only supports >= 2.3 but users report it works with 2.2 :
-  gem.add_dependency 'activerecord', '>= 2.2'
+  gem.add_dependency 'activerecord', '>= 2.2', '< 5.0'
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/db2/adapter.rb

@@ -716,7 +716,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 [Fixnum]
+    # @return [Integer]
     def last_insert_id
       @connection.identity_val_local
     end

data/lib/arjdbc/db2/column.rb

@@ -47,7 +47,7 @@ module ArJdbc
 
       # @override
       def type_cast(value)
-        return nil if value.nil? || value == 'NULL' || value =~ /^\s*NULL\s*$/i
+        return nil if value.nil? || value.eql?('NULL') || value =~ /^\s*NULL\s*$/i
         case type
         when :string    then value
         when :integer   then value.respond_to?(:to_i) ? value.to_i : (value ? 1 : 0)

data/lib/arjdbc/derby/adapter.rb

@@ -511,7 +511,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 [Fixnum]
+    # @return [Integer]
     def last_insert_id
       @connection.identity_val_local
     end

data/lib/arjdbc/firebird/adapter.rb

@@ -354,7 +354,7 @@ module ArJdbc
       when NilClass then 'NULL'
       when TrueClass then (type == :integer ? '1' : quoted_true)
       when FalseClass then (type == :integer ? '0' : quoted_false)
-      when Float, Fixnum, Bignum then value.to_s
+      when Float, Integer then value.to_s
       # BigDecimals need to be output in a non-normalized form and quoted.
       when BigDecimal then value.to_s('F')
       when Symbol then "'#{quote_string(value.to_s)}'"

data/lib/arjdbc/jdbc/adapter_require.rb

@@ -23,24 +23,43 @@ module ActiveRecord
       #  adapters) would be to mingle with the $LOAD_PATH which seems worse ...
       case path
       when 'active_record/connection_adapters/mysql_adapter'
-        $LOADED_FEATURES << 'active_record/connection_adapters/mysql_adapter.rb'
-        super('arjdbc/mysql')
+        if !$LOADED_FEATURES.include?('active_record/connection_adapters/mysql_adapter.rb')
+          $LOADED_FEATURES << 'active_record/connection_adapters/mysql_adapter.rb'
+          super('arjdbc/mysql')
+        else
+          false
+        end
       when 'active_record/connection_adapters/mysql2_adapter'
-        $LOADED_FEATURES << 'active_record/connection_adapters/mysql2_adapter.rb'
-        super('arjdbc/mysql')
+        if !$LOADED_FEATURES.include?('active_record/connection_adapters/mysql2_adapter.rb')
+          $LOADED_FEATURES << 'active_record/connection_adapters/mysql2_adapter.rb'
+          super('arjdbc/mysql')
+        else
+          false
+        end
       when 'active_record/connection_adapters/postgresql_adapter'
-        $LOADED_FEATURES << 'active_record/connection_adapters/postgresql_adapter.rb'
-        super('arjdbc/postgresql')
+        if !$LOADED_FEATURES.include?('active_record/connection_adapters/postgresql_adapter.rb')
+          $LOADED_FEATURES << 'active_record/connection_adapters/postgresql_adapter.rb'
+          super('arjdbc/postgresql')
+        else
+          false
+        end
       when 'active_record/connection_adapters/sqlite_adapter'
-        $LOADED_FEATURES << 'active_record/connection_adapters/sqlite_adapter.rb'
-        super('arjdbc/sqlite3')
+        if !$LOADED_FEATURES.include?('active_record/connection_adapters/sqlite_adapter.rb')
+          $LOADED_FEATURES << 'active_record/connection_adapters/sqlite_adapter.rb'
+          super('arjdbc/sqlite3')
+        else
+          false
+        end
       when 'active_record/connection_adapters/sqlite3_adapter'
-        $LOADED_FEATURES << 'active_record/connection_adapters/sqlite3_adapter.rb'
-        super('arjdbc/sqlite3')
+        if !$LOADED_FEATURES.include?('active_record/connection_adapters/sqlite3_adapter.rb')
+          $LOADED_FEATURES << 'active_record/connection_adapters/sqlite3_adapter.rb'
+          super('arjdbc/sqlite3')
+        else
+          false
+        end
       else super
       end
     end
-
   end
 
-end
+end

data/lib/arjdbc/mysql/adapter.rb

@@ -49,7 +49,7 @@ module ArJdbc
       # Increase timeout so the server doesn't disconnect us.
       wait_timeout = config[:wait_timeout]
       wait_timeout = self.class.type_cast_config_to_integer(wait_timeout)
-      variables[:wait_timeout] = wait_timeout.is_a?(Fixnum) ? wait_timeout : 2147483
+      variables[:wait_timeout] = wait_timeout.is_a?(Integer) ? wait_timeout : 2147483
 
       # Make MySQL reject illegal values rather than truncating or blanking them, see
       # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
@@ -850,7 +850,7 @@ module ArJdbc
       case length
       when Hash
         column_names.map { |name| length[name] ? "#{quote_column_name(name)}(#{length[name]})" : quote_column_name(name) }
-      when Fixnum
+      when Integer
         column_names.map { |name| "#{quote_column_name(name)}(#{length})" }
       else
         column_names.map { |name| quote_column_name(name) }

data/lib/arjdbc/postgresql/adapter.rb

@@ -165,7 +165,7 @@ module ArJdbc
           when 1, 2; 'smallint'
           when 3, 4; 'integer'
           when 5..8; 'bigint'
-          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with precision 0 instead.")
+          else raise(ActiveRecordError, "No integer type has byte size #{limit}. Use a numeric with scale 0 instead.")
         end
       when 'datetime'
         return super unless precision
@@ -571,7 +571,8 @@ module ArJdbc
       end
 
       if pk && use_insert_returning?
-        sql = "#{sql} RETURNING #{quote_column_name(pk)}"
+        returning = Array(pk).map(&method(:quote_table_name)).join(', ')
+        sql = "#{sql} RETURNING (#{returning})"
       end
 
       [ sql, binds ]
@@ -589,7 +590,7 @@ module ArJdbc
         exec_query(sql, name, binds) # due RETURNING clause returns a result set
       else
         result = super
-        if pk
+        if pk && use_insert_returning?
           unless sequence_name
             table_ref = extract_table_ref_from_insert_sql(sql)
             sequence_name = default_sequence_name(table_ref, pk)

data/lib/arjdbc/sqlite3/adapter.rb

@@ -277,7 +277,7 @@ module ArJdbc
 
     # Returns 62. SQLite supports index names up to 64 characters.
     # The rest is used by Rails internally to perform temporary rename operations.
-    # @return [Fixnum]
+    # @return [Integer]
     def allowed_index_name_length
       index_name_length - 2
     end

data/lib/arjdbc/tasks/databases3.rake

@@ -112,7 +112,7 @@ namespace :db do
         unless search_path.blank?
           search_path = search_path.split(",").map{ |part| "--schema=#{Shellwords.escape(part.strip)}" }.join(" ")
         end
-        sh "pg_dump -i -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}"
+        sh "pg_dump -s -x -O -f #{Shellwords.escape(filename)} #{search_path} #{Shellwords.escape(config['database'])}"
 
         File.open(filename, 'a') { |f| f << "SET search_path TO #{ActiveRecord::Base.connection.schema_search_path};\n\n" }
       when /sqlite/

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.22"
+  VERSION = "1.3.23"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/rakelib/db.rake

@@ -7,6 +7,7 @@ namespace :db do
     fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
     load 'test/db/mysql_config.rb' # rescue nil
     puts MYSQL_CONFIG.inspect if $VERBOSE
+    # DROP USER arjdbc@localhost; __ERROR 1396 (HY000): Operation CREATE USER failed__
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
 CREATE USER #{MYSQL_CONFIG[:username]}@localhost;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.23
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -16,6 +16,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   name: activerecord
   prerelease: false
   type: :runtime
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: '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. Provides
   (ActiveRecord) built-in adapters: MySQL, PostgreSQL and SQLite3 as well as adapters