activerecord-jdbc-adapter 50.2-java → 50.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0222c94a160b13665c886d04020a3e549a1cd040
-  data.tar.gz: ef8cf19be8e3e6febef802e235a940069b445168
+SHA256:
+  metadata.gz: fde4f57b66b6cae2acbbac6eba863c7423ed320b2e420b7a752ec8a9eb984846
+  data.tar.gz: e3a689f005016305b9e3e2b6c637fcd948135d821381d216007ba8a5a3a0eb50
 SHA512:
-  metadata.gz: d105602d32ac438487c69d77120006847ac2f995e3434820a594db4d4a04a40a2880d8a8c4101ff3581ce7391aff085864df9f6b9ae195858a41159172138cb8
-  data.tar.gz: 639a1928003e48251aa9c143298643bb282f93086df821c1bf31dac8f5c425c5b55b4654f7bdbf472e78af653dd0481ad3764576ed71211b3747b675371d9e32
+  metadata.gz: f55d6fbeecc3cc27ea2d5c8af4e31cb84c3ef82f8ea22d536772e61524798a89c2f88bf88dd09d97bd5c5fa3aeca45dc8fa21a4883fb5a4e8e80b6d98cac3d14
+  data.tar.gz: 8fb21f6c9c0f0919ed8215781329b3a8ecc012399593332c9a56432542d88036dbb36e05d6b6ddc5aa7c2b06d4df45035693c694a40ec71ce37834ca2bf68a57

data/.travis.yml

@@ -1,9 +1,18 @@
 language: ruby
 sudo: false
+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"
 before_script:
   - echo "JAVA_OPTS=$JAVA_OPTS"
   - export JRUBY_OPTS="-J-Xms64M -J-Xmx1024M"
@@ -33,6 +42,8 @@ rvm:
   - jruby-9.1.16.0
 jdk:
   - openjdk8
+addons:
+  postgresql: "9.4"
 env:
   - DB=mysql2 PREPARED_STATEMENTS=false
   - DB=mysql2 PREPARED_STATEMENTS=true
@@ -43,19 +54,29 @@ 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
-branches:
-  only:
-    - master
-    - /.*-stable$/
-    - /^test-.*/
-    - /maintenance|support/
-    - /.*dev$/
+  - DB=jndi PREPARED_STATEMENTS=false
+  - DB=jndi PREPARED_STATEMENTS=true
 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
@@ -71,9 +92,9 @@ matrix:
         mariadb: '10.1'
       env: DB=mariadb PREPARED_STATEMENTS=true
     # Rails test-suite :
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7" # PS off by default
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7" PREPARED_STATEMENTS=true
-    - env: DB=mysql2     TEST_PREFIX="rails:" AR_VERSION="v5.0.7" DRIVER=MariaDB
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7" # PS on by default
-    - env: DB=postgresql TEST_PREFIX="rails:" AR_VERSION="v5.0.7" PREPARED_STATEMENTS=false
-    - env: DB=sqlite3    TEST_PREFIX="rails:" AR_VERSION="v5.0.7"
+    - 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"

data/lib/arjdbc/abstract/database_statements.rb

@@ -26,8 +26,8 @@ module ArJdbc
           log(sql, name) { @connection.execute_query(sql) }
         else
           log(sql, name, binds) do
-            # 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?
+            # this is different from normal AR that always caches
+            cached_statement = fetch_cached_statement(sql) if prepare && @jdbc_statement_cache_enabled
             @connection.execute_prepared_query(sql, binds, cached_statement)
           end
         end

data/lib/arjdbc/abstract/statement_cache.rb

@@ -23,7 +23,7 @@ module ArJdbc
         # Only say we support the statement cache if we are using prepared statements
         # and have a max number of statements defined
         statement_limit = self.class.type_cast_config_to_integer(config[:statement_limit])
-        @jdbc_statement_cache_enabled = config[:prepared_statements] && (statement_limit.nil? || statement_limit > 0)
+        @jdbc_statement_cache_enabled = prepared_statements && (statement_limit.nil? || statement_limit > 0)
 
         @statements = StatementPool.new(statement_limit) # AR (5.0) expects this to be stored as @statements
       end
@@ -34,11 +34,11 @@ module ArJdbc
       end
 
       def delete_cached_statement(sql)
-        @statements.delete(cached_statement_key(sql))
+        @statements.delete(sql_key(sql))
       end
 
       def fetch_cached_statement(sql)
-        @statements[cached_statement_key(sql)] ||= @connection.connection.prepare_statement(sql)
+        @statements[sql_key(sql)] ||= @connection.prepare_statement(sql)
       end
 
       def supports_statement_cache?
@@ -49,7 +49,7 @@ module ArJdbc
 
       # This should be overridden by the adapter if the sql itself
       # is not enough to make the key unique
-      def cached_statement_key(sql)
+      def sql_key(sql)
         sql
       end
 

data/lib/arjdbc/mysql/adapter.rb

@@ -32,7 +32,15 @@ module ActiveRecord
       include ArJdbc::MySQL
 
       def initialize(connection, logger, connection_parameters, config)
+        # workaround to skip version check on JNDI to be lazy, dummy version is high enough for Rails 5.0 - 6.0
+        is_jndi = ::ActiveRecord::ConnectionAdapters::JdbcConnection.jndi_config?(config)
+        @version = '8.1.5' if is_jndi
+
         super
+
+        # set to nil to have it lazy-load the real value when required
+        @version = nil if is_jndi
+
         @prepared_statements = false unless config.key?(:prepared_statements)
         # configure_connection taken care of at ArJdbc::Abstract::Core
       end

data/lib/arjdbc/postgresql/adapter.rb

@@ -522,61 +522,6 @@ module ArJdbc
       execute "TRUNCATE TABLE #{quote_table_name(table_name)}", name
     end
 
-    # Returns an array of indexes for the given table.
-    def indexes(table_name, name = nil)
-      # FIXME: AR version => table = Utils.extract_schema_qualified_name(table_name.to_s)
-      schema, table = extract_schema_and_table(table_name.to_s)
-
-      result = query(<<-SQL, 'SCHEMA')
-            SELECT distinct i.relname, d.indisunique, d.indkey, pg_get_indexdef(d.indexrelid), t.oid,
-                            pg_catalog.obj_description(i.oid, 'pg_class') AS comment,
-            (SELECT COUNT(*) FROM pg_opclass o
-               JOIN (SELECT unnest(string_to_array(d.indclass::text, ' '))::int oid) c
-                 ON o.oid = c.oid WHERE o.opcdefault = 'f')
-            FROM pg_class t
-            INNER JOIN pg_index d ON t.oid = d.indrelid
-            INNER JOIN pg_class i ON d.indexrelid = i.oid
-            LEFT JOIN pg_namespace n ON n.oid = i.relnamespace
-            WHERE i.relkind = 'i'
-              AND d.indisprimary = 'f'
-              AND t.relname = '#{table}'
-              AND n.nspname = #{schema ? "'#{schema}'" : 'ANY (current_schemas(false))'}
-            ORDER BY i.relname
-      SQL
-
-      result.map do |row|
-        index_name = row[0]
-        # FIXME: These values [1,2] are returned in a different format than AR expects, maybe we could update it on the Java side to be more accurate
-        unique = row[1].is_a?(String) ? row[1] == 't' : row[1] # JDBC gets us a boolean
-        indkey = row[2].is_a?(Java::OrgPostgresqlUtil::PGobject) ? row[2].value : row[2]
-        indkey = indkey.split(" ").map(&:to_i)
-        inddef = row[3]
-        oid = row[4]
-        comment = row[5]
-        opclass = row[6]
-
-        using, expressions, where = inddef.scan(/ USING (\w+?) \((.+?)\)(?: WHERE (.+))?\z/).flatten
-
-        if indkey.include?(0) || opclass > 0
-          columns = expressions
-        else
-          columns = Hash[query(<<-SQL.strip_heredoc, "SCHEMA")].values_at(*indkey).compact
-                SELECT a.attnum, a.attname
-                FROM pg_attribute a
-                WHERE a.attrelid = #{oid}
-                AND a.attnum IN (#{indkey.join(",")})
-          SQL
-
-          # add info on sort order for columns (only desc order is explicitly specified, asc is the default)
-          orders = Hash[
-              expressions.scan(/(\w+) DESC/).flatten.map { |order_column| [order_column, :desc] }
-          ]
-        end
-
-        IndexDefinition.new(table_name, index_name, unique, columns, [], orders, where, nil, using.to_sym, comment.presence)
-      end.compact
-    end
-
     # @private
     def column_name_for_operation(operation, node)
       case operation
@@ -682,8 +627,6 @@ module ActiveRecord::ConnectionAdapters
     require 'arjdbc/postgresql/oid_types'
     include ::ArJdbc::PostgreSQL::OIDTypes
 
-    load 'arjdbc/postgresql/_bc_time_cast_patch.rb'
-
     include ::ArJdbc::PostgreSQL::ColumnHelpers
 
     include ::ArJdbc::Util::QuotedCache
@@ -736,7 +679,7 @@ module ActiveRecord::ConnectionAdapters
 
     # Prepared statements aren't schema aware so we need to make sure we
     # store different PreparedStatement objects for different schemas
-    def cached_statement_key(sql)
+    def sql_key(sql)
       "#{schema_search_path}-#{sql}"
     end
 

data/lib/arjdbc/postgresql/oid_types.rb

@@ -9,6 +9,61 @@ module ArJdbc
     # @private
     OID = ::ActiveRecord::ConnectionAdapters::PostgreSQL::OID
 
+    # this version makes sure to register the types by name as well
+    # we still need to version with OID since it's used from SchemaStatements as well
+    class ArjdbcTypeMapInitializer < OID::TypeMapInitializer
+      private
+
+      def name_with_ns(row)
+        if row['in_ns']
+          row['typname']
+        else
+          %Q("#{row['nspname']}"."#{row['typname']}")
+        end
+      end
+
+      def register_enum_type(row)
+        super
+        register name_with_ns(row), OID::Enum.new
+      end
+
+      def register_array_type(row)
+        super
+        register_with_subtype(name_with_ns(row), row['typelem'].to_i) do |subtype|
+          OID::Array.new(subtype, row['typdelim'])
+        end
+      end
+
+      def register_range_type(row)
+        super
+        name = name_with_ns(row)
+        register_with_subtype(name, row['rngsubtype'].to_i) do |subtype|
+          OID::Range.new(subtype, name.to_sym)
+        end
+      end
+
+      def register_domain_type(row)
+        if base_type = @store.lookup(row['typbasetype'].to_i)
+          register row['oid'], base_type
+          register name_with_ns(row), base_type
+        else
+          warn "unknown base type (OID: #{row['typbasetype']}) for domain #{row['typname']}."
+        end
+      end
+
+      def register_composite_type(row)
+        if subtype = @store.lookup(row['typelem'].to_i)
+          register row['oid'], OID::Vector.new(row['typdelim'], subtype)
+          register name_with_ns(row), OID::Vector.new(row['typdelim'], subtype)
+        end
+      end
+
+      def assert_valid_registration(oid, oid_type)
+        ret = super
+        ret == 0 ? oid : ret
+      end
+    end
+
     # @private
     module OIDTypes
 
@@ -41,7 +96,7 @@ module ArJdbc
 
       def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
         if !type_map.key?(oid)
-          load_additional_types(type_map, [oid])
+          load_additional_types(type_map, oid)
         end
 
         type_map.fetch(oid, fmod, sql_type) {
@@ -138,26 +193,45 @@ module ArJdbc
         end
 
         load_additional_types(m)
+
+        # pgjdbc returns these if the column is auto-incrmenting
+        m.alias_type 'serial', 'int4'
+        m.alias_type 'bigserial', 'int8'
       end
 
-      def load_additional_types(type_map, oids = nil) # :nodoc:
-        initializer = OID::TypeMapInitializer.new(type_map)
+      def load_additional_types(type_map, oid = nil) # :nodoc:
+        initializer = ArjdbcTypeMapInitializer.new(type_map)
 
         if supports_ranges?
           query = <<-SQL
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype,
+                ns.nspname, ns.nspname = ANY(current_schemas(true)) in_ns
               FROM pg_type as t
               LEFT JOIN pg_range as r ON oid = rngtypid
+              JOIN pg_namespace AS ns ON t.typnamespace = ns.oid
           SQL
         else
           query = <<-SQL
-              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype
+              SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, t.typtype, t.typbasetype,
+                ns.nspname, ns.nspname = ANY(current_schemas(true)) in_ns
               FROM pg_type as t
+              JOIN pg_namespace AS ns ON t.typnamespace = ns.oid
           SQL
         end
 
-        if oids
-          query += "WHERE t.oid::integer IN (%s)" % oids.join(", ")
+        if oid
+          if oid.is_a? Numeric || oid.match(/^\d+$/)
+            # numeric OID
+            query += "WHERE t.oid::integer = %s" % oid
+
+          elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
+            # namespace and type name
+            query += "WHERE ns.nspname = '%s' AND t.typname = '%s'" % [m[1], m[2]]
+
+          else
+            # only type name
+            query += "WHERE t.typname = '%s' AND ns.nspname = ANY(current_schemas(true))" % oid
+          end
         else
           query += initializer.query_conditions_for_initial_load(type_map)
         end

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '50.2'
+  VERSION = '50.3'
 end

data/rakelib/rails.rake

@@ -9,14 +9,15 @@ namespace :rails do
       if ENV['RAILS']
         ar_path = File.join(ENV['RAILS'], 'activerecord')
       end
-      
+
       unless ar_path && File.exist?(ar_path)
-        ar_path = `bundle info --path activerecord`.chomp
+        ar_path = `bundle info --path activerecord`.lines.last.chomp
       end
 
       unless File.exist? ar_test_dir = File.join(ar_path, 'test')
         raise "can not directly load Rails tests;" +
-              " try setting a local repository path e.g. export RAILS=`pwd`/../rails"
+              " try setting a local repository path e.g. export RAILS=`pwd`/../rails;" +
+              " failed guess: #{ar_path}"
       end
 
       driver = "jdbc-#{ENV['DRIVER'] ? ENV['DRIVER'].downcase : (adapter =~ /postgres/i ? 'postgres' : adapter)}"

data/src/java/arjdbc/ArJdbcModule.java

@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.jruby.NativeException;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -148,13 +147,7 @@ public class ArJdbcModule {
             }
         }
         catch (ClassNotFoundException e) { /* ignored */ }
-        catch (NoSuchMethodException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (IllegalAccessException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (InvocationTargetException e) {
+        catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
 
@@ -263,18 +256,15 @@ public class ArJdbcModule {
         try {
             return klass.getMethod(name, argType).invoke(null, arg);
         }
-        catch (IllegalAccessException e) {
-            throw newNativeException(runtime, e);
-        }
-        catch (InvocationTargetException e) {
+        catch (IllegalAccessException | InvocationTargetException e) {
             throw newNativeException(runtime, e);
         }
     }
 
     private static RaiseException newNativeException(final Ruby runtime, final Throwable cause) {
-        RubyClass nativeClass = runtime.getClass(NativeException.CLASS_NAME);
-        NativeException nativeException = new NativeException(runtime, nativeClass, cause);
-        return new RaiseException(cause, nativeException);
+        final RaiseException error = runtime.newRuntimeError(cause.toString());
+        error.initCause(cause);
+        return error;
     }
 
     @JRubyMethod(meta = true)

data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -83,8 +83,8 @@ public class DerbyRubyJdbcConnection extends RubyJdbcConnection {
             final int minor = jdbcDriver.getMinorVersion();
             if ( major < 10 || ( major == 10 && minor < 5 ) ) {
                 final RubyClass errorClass = getConnectionNotEstablished(context.runtime);
-                throw new RaiseException(context.runtime, errorClass,
-                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "", false);
+                throw context.runtime.newRaiseException(errorClass,
+                    "adapter requires Derby >= 10.5 got: " + major + "." + minor + "");
             }
             if ( major == 10 && minor < 8 ) { // 10.8 ~ supports JDBC 4.1
                 // config[:connection_alive_sql] ||= 'SELECT 1 FROM SYS.SYSSCHEMAS FETCH FIRST 1 ROWS ONLY'

data/src/java/arjdbc/jdbc/ConnectionFactory.java

@@ -27,12 +27,6 @@ package arjdbc.jdbc;
 
 import java.sql.Connection;
 import java.sql.SQLException;
-import javax.sql.DataSource;
-
-import org.jruby.RubyObject;
-import org.jruby.RubyString;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 
 /**
  * Interface to be implemented in Ruby for retrieving a new connection.
@@ -49,84 +43,3 @@ public interface ConnectionFactory {
     Connection newConnection() throws SQLException;
 
 }
-
-class DataSourceConnectionFactoryImpl implements ConnectionFactory {
-
-    private final DataSource dataSource;
-    final String username, password; // optional
-
-    public DataSourceConnectionFactoryImpl(final DataSource dataSource) {
-        this.dataSource = dataSource;
-        this.username = null; this.password = null;
-    }
-
-    public DataSourceConnectionFactoryImpl(final DataSource dataSource,
-        final String username, final String password) {
-        this.dataSource = dataSource;
-        this.username = username; this.password = password;
-    }
-
-    @Override
-    public Connection newConnection() throws SQLException {
-        if ( username != null ) {
-            dataSource.getConnection(username, password);
-        }
-        return dataSource.getConnection();
-    }
-
-    DataSource getDataSource() { return dataSource; } /* for tests */
-
-}
-
-class DriverConnectionFactoryImpl implements ConnectionFactory {
-
-    private final DriverWrapper driverWrapper;
-    final String url;
-    final String username, password; // null allowed
-
-    public DriverConnectionFactoryImpl(final DriverWrapper driver, final String url) {
-        this.driverWrapper = driver; this.url = url;
-        this.username = null; this.password = null;
-    }
-
-    public DriverConnectionFactoryImpl(final DriverWrapper driver, final String url,
-        final String username, final String password) {
-        this.driverWrapper = driver; this.url = url;
-        this.username = username; this.password = password;
-    }
-
-    @Override
-    public Connection newConnection() throws SQLException {
-        return driverWrapper.connect(url, username, password);
-    }
-
-    DriverWrapper getDriverWrapper() { return driverWrapper; } /* for tests */
-
-}
-
-// @legacy ActiveRecord::ConnectionAdapters::JdbcDriver
-class RubyConnectionFactoryImpl implements ConnectionFactory {
-
-    private final IRubyObject driver;
-    final RubyString url;
-    final IRubyObject username, password; // null allowed
-
-    private final RubyObject contextProvider;
-
-    public RubyConnectionFactoryImpl(final IRubyObject driver, final RubyString url,
-        final IRubyObject username, final IRubyObject password) {
-        this.driver = driver; this.url = url;
-        this.username = username; this.password = password;
-        contextProvider = (RubyObject) driver;
-    }
-
-    @Override
-    public Connection newConnection() throws SQLException {
-        final ThreadContext context = contextProvider.getRuntime().getCurrentContext();
-        final IRubyObject connection = driver.callMethod(context, "connection", new IRubyObject[] { url, username, password });
-        return (Connection) connection.toJava(Connection.class);
-    }
-
-    IRubyObject getDriver() { return driver; } /* for tests */
-
-}