activerecord-jdbc-adapter 52.1-java → 52.2-java

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

@@ -531,77 +531,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)
-
-      # 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
-            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]
-
-        using, expressions, where = inddef.scan(/ USING (\w+?) \((.+?)\)(?: WHERE (.+))?\z/m).flatten
-
-        orders = {}
-        opclasses = {}
-
-        if indkey.include?(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 (only desc order is explicitly specified, asc is the default)
-          # and non-default opclasses
-          expressions.scan(/(?<column>\w+)\s?(?<opclass>\w+_ops)?\s?(?<desc>DESC)?\s?(?<nulls>NULLS (?:FIRST|LAST))?/).each do |column, opclass, desc, nulls|
-            opclasses[column] = opclass.to_sym if opclass
-            if nulls
-              orders[column] = [desc, nulls].compact.join(' ')
-            elsif desc
-              orders[column] = :desc
-            end
-          end
-        end
-
-        IndexDefinition.new(
-            table_name,
-            index_name,
-            unique,
-            columns,
-            orders: orders,
-            opclasses: opclasses,
-            where: where,
-            using: using.to_sym,
-            comment: comment.presence
-        )
-      end
-    end
-
     # @private
     def column_name_for_operation(operation, node)
       case operation
@@ -690,6 +619,10 @@ module ArJdbc
       @local_tz ||= execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
     end
 
+    def bind_params_length
+      32767
+    end
+
   end
 end
 
@@ -766,7 +699,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
 
@@ -33,15 +88,9 @@ module ArJdbc
         @extensions ||= super
       end
 
-      # @override
-      def lookup_cast_type(sql_type)
-        oid = execute("SELECT #{quote(sql_type)}::regtype::oid", "SCHEMA")
-        super oid.first['oid'].to_i
-      end
-
       def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
         if !type_map.key?(oid)
-          load_additional_types([oid])
+          load_additional_types(type_map, oid)
         end
 
         type_map.fetch(oid, fmod, sql_type) {
@@ -132,27 +181,46 @@ module ArJdbc
           end
         end
 
-        load_additional_types
+        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(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
         end

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '52.1'
+  VERSION = '52.2'
 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 */
-
-}

data/src/java/arjdbc/jdbc/DataSourceConnectionFactory.java

@@ -68,7 +68,6 @@ final class DataSourceConnectionFactory implements ConnectionFactory {
 
     @Override
     public Connection newConnection() throws SQLException {
-        DataSource dataSource = this.dataSource;
         // in case DS failed previously look it up again from JNDI :
         if (dataSource == null) {
             lookupDataSource();

data/src/java/arjdbc/jdbc/RubyConnectionFactory.java

@@ -0,0 +1,61 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Copyright (c) 2012-2014 Karol Bucek <self@kares.org>
+ * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
+ * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ ***** END LICENSE BLOCK *****/
+
+package arjdbc.jdbc;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+// @legacy ActiveRecord::ConnectionAdapters::JdbcDriver
+class RubyConnectionFactory implements ConnectionFactory {
+
+    private final IRubyObject driver;
+    final RubyString url;
+    final IRubyObject username, password; // null allowed
+
+    private final RubyObject contextProvider;
+
+    public RubyConnectionFactory(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 */
+
+}