activerecord-jdbc-adapter 70.0-java → 70.1-java

data/lib/arjdbc/postgresql/oid_types.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-
 require 'thread'
 
 module ArJdbc
@@ -91,8 +90,23 @@ module ArJdbc
       end
 
       def get_oid_type(oid, fmod, column_name, sql_type = '') # :nodoc:
-        if !type_map.key?(oid)
-          load_additional_types(type_map, oid)
+        # Note: type_map is storing a bunch of oid type prefixed with a namespace even
+        # if they are not namespaced (e.g. ""."oidvector").  builtin types which are
+        # common seem to not be prefixed (e.g. "varchar").  OID numbers are also keys
+        # but JDBC never returns those.  So the current scheme is to check with
+        # what we got and that covers number and plain strings and otherwise we will
+        # wrap with the namespace form.
+        found = type_map.key?(oid)
+
+        if !found
+          key = oid.kind_of?(String) && oid != "oid" ? "\"\".\"#{oid}\"" : oid
+          found = type_map.key?(key)
+
+          if !found
+            load_additional_types([oid])
+          else
+            oid = key
+          end
         end
 
         type_map.fetch(oid, fmod, sql_type) {
@@ -103,132 +117,165 @@ module ArJdbc
         }
       end
 
+      def reload_type_map
+          type_map.clear
+          initialize_type_map
+      end
+
+        def initialize_type_map_inner(m)
+          m.register_type "int2", Type::Integer.new(limit: 2)
+          m.register_type "int4", Type::Integer.new(limit: 4)
+          m.register_type "int8", Type::Integer.new(limit: 8)
+          m.register_type "oid", OID::Oid.new
+          m.register_type "float4", Type::Float.new
+          m.alias_type "float8", "float4"
+          m.register_type "text", Type::Text.new
+          register_class_with_limit m, "varchar", Type::String
+          m.alias_type "char", "varchar"
+          m.alias_type "name", "varchar"
+          m.alias_type "bpchar", "varchar"
+          m.register_type "bool", Type::Boolean.new
+          register_class_with_limit m, "bit", OID::Bit
+          register_class_with_limit m, "varbit", OID::BitVarying
+          m.register_type "date", OID::Date.new
+
+          m.register_type "money", OID::Money.new
+          m.register_type "bytea", OID::Bytea.new
+          m.register_type "point", OID::Point.new
+          m.register_type "hstore", OID::Hstore.new
+          m.register_type "json", Type::Json.new
+          m.register_type "jsonb", OID::Jsonb.new
+          m.register_type "cidr", OID::Cidr.new
+          m.register_type "inet", OID::Inet.new
+          m.register_type "uuid", OID::Uuid.new
+          m.register_type "xml", OID::Xml.new
+          m.register_type "tsvector", OID::SpecializedString.new(:tsvector)
+          m.register_type "macaddr", OID::Macaddr.new
+          m.register_type "citext", OID::SpecializedString.new(:citext)
+          m.register_type "ltree", OID::SpecializedString.new(:ltree)
+          m.register_type "line", OID::SpecializedString.new(:line)
+          m.register_type "lseg", OID::SpecializedString.new(:lseg)
+          m.register_type "box", OID::SpecializedString.new(:box)
+          m.register_type "path", OID::SpecializedString.new(:path)
+          m.register_type "polygon", OID::SpecializedString.new(:polygon)
+          m.register_type "circle", OID::SpecializedString.new(:circle)
+          m.register_type "regproc", OID::Enum.new
+          # FIXME: adding this vector type leads to quoting not handlign Array data in quoting.
+          #m.register_type "_int4", OID::Vector.new(",", m.lookup("int4"))
+          register_class_with_precision m, "time", Type::Time
+          register_class_with_precision m, "timestamp", OID::Timestamp
+          register_class_with_precision m, "timestamptz", OID::TimestampWithTimeZone
+
+          m.register_type "numeric" do |_, fmod, sql_type|
+            precision = extract_precision(sql_type)
+            scale = extract_scale(sql_type)
+
+            # The type for the numeric depends on the width of the field,
+            # so we'll do something special here.
+            #
+            # When dealing with decimal columns:
+            #
+            # places after decimal  = fmod - 4 & 0xffff
+            # places before decimal = (fmod - 4) >> 16 & 0xffff
+            if fmod && (fmod - 4 & 0xffff).zero?
+              # FIXME: Remove this class, and the second argument to
+              # lookups on PG
+              Type::DecimalWithoutScale.new(precision: precision)
+            else
+              OID::Decimal.new(precision: precision, scale: scale)
+            end
+          end
+
+          m.register_type "interval" do |*args, sql_type|
+            precision = extract_precision(sql_type)
+            OID::Interval.new(precision: precision)
+          end
+
+          # pgjdbc returns these if the column is auto-incrmenting
+          m.alias_type 'serial', 'int4'
+          m.alias_type 'bigserial', 'int8'
+        end
+
+
+      # We differ from AR here because we will initialize type_map when adapter initializes
       def type_map
         @type_map
       end
 
-      def reload_type_map
-        if ( @type_map ||= nil )
-          @type_map.clear
-          initialize_type_map(@type_map)
-        end
+      def initialize_type_map(m = type_map)
+        initialize_type_map_inner(m)
+        load_additional_types
       end
 
       private
 
-      def initialize_type_map(m = type_map)
-        register_class_with_limit m, 'int2', Type::Integer
-        register_class_with_limit m, 'int4', Type::Integer
-        register_class_with_limit m, 'int8', Type::Integer
-        m.register_type 'oid', OID::Oid.new
-        m.register_type 'float4', Type::Float.new
-        m.alias_type 'float8', 'float4'
-        m.register_type 'text', Type::Text.new
-        register_class_with_limit m, 'varchar', Type::String
-        m.alias_type 'char', 'varchar'
-        m.alias_type 'name', 'varchar'
-        m.alias_type 'bpchar', 'varchar'
-        m.register_type 'bool', Type::Boolean.new
-        register_class_with_limit m, 'bit', OID::Bit
-        register_class_with_limit m, 'varbit', OID::BitVarying
-        m.alias_type 'timestamptz', 'timestamp'
-        m.register_type 'date', OID::Date.new
-
-        m.register_type 'money', OID::Money.new
-        m.register_type 'bytea', OID::Bytea.new
-        m.register_type 'point', OID::Point.new
-        m.register_type 'hstore', OID::Hstore.new
-        m.register_type 'json', Type::Json.new
-        m.register_type 'jsonb', OID::Jsonb.new
-        m.register_type 'cidr', OID::Cidr.new
-        m.register_type 'inet', OID::Inet.new
-        m.register_type 'uuid', OID::Uuid.new
-        m.register_type 'xml', OID::Xml.new
-        m.register_type 'tsvector', OID::SpecializedString.new(:tsvector)
-        m.register_type 'macaddr', OID::Macaddr.new
-        m.register_type 'citext', OID::SpecializedString.new(:citext)
-        m.register_type 'ltree', OID::SpecializedString.new(:ltree)
-        m.register_type 'line', OID::SpecializedString.new(:line)
-        m.register_type 'lseg', OID::SpecializedString.new(:lseg)
-        m.register_type 'box', OID::SpecializedString.new(:box)
-        m.register_type 'path', OID::SpecializedString.new(:path)
-        m.register_type 'polygon', OID::SpecializedString.new(:polygon)
-        m.register_type 'circle', OID::SpecializedString.new(:circle)
-
-        m.register_type 'interval' do |*args, sql_type|
-          precision = extract_precision(sql_type)
-          OID::Interval.new(precision: precision)
+      def register_class_with_limit(...)
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:register_class_with_limit, ...)
+      end
+
+      def register_class_with_precision(...)
+        ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:register_class_with_precision, ...)
+      end
+
+      def load_additional_types(oids = nil) # :nodoc:
+        initializer = ArjdbcTypeMapInitializer.new(type_map)
+        load_types_queries(initializer, oids) do |query|
+          execute_and_clear(query, "SCHEMA", []) do |records|
+            initializer.run(records)
+          end
         end
+      end
 
-        register_class_with_precision m, 'time', Type::Time
-        register_class_with_precision m, 'timestamp', OID::DateTime
-
-        m.register_type 'numeric' do |_, fmod, sql_type|
-          precision = extract_precision(sql_type)
-          scale = extract_scale(sql_type)
-
-          # The type for the numeric depends on the width of the field,
-          # so we'll do something special here.
-          #
-          # When dealing with decimal columns:
-          #
-          # places after decimal  = fmod - 4 & 0xffff
-          # places before decimal = (fmod - 4) >> 16 & 0xffff
-          if fmod && (fmod - 4 & 0xffff).zero?
-            # FIXME: Remove this class, and the second argument to
-            # lookups on PG
-            Type::DecimalWithoutScale.new(precision: precision)
+      def load_types_queries(initializer, oids)
+        query = <<~SQL
+            SELECT t.oid, t.typname, t.typelem, t.typdelim, t.typinput, r.rngsubtype, t.typtype, t.typbasetype
+            FROM pg_type as t
+            LEFT JOIN pg_range as r ON oid = rngtypid
+        SQL
+        if oids
+          if oids.all? { |e| e.kind_of? Numeric }
+            yield query + "WHERE t.oid IN (%s)" % oids.join(", ")
           else
-            OID::Decimal.new(precision: precision, scale: scale)
+            in_list = oids.map { |e| %Q{'#{e}'} }.join(", ")
+            yield query + "WHERE t.typname IN (%s)" % in_list
           end
+        else
+          yield query + initializer.query_conditions_for_known_type_names
+          yield query + initializer.query_conditions_for_known_type_types
+          yield query + initializer.query_conditions_for_array_types
         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, oid = nil) # :nodoc:
-        initializer = ArjdbcTypeMapInitializer.new(type_map)
+      def update_typemap_for_default_timezone
+        if @default_timezone != ActiveRecord.default_timezone && @timestamp_decoder
+          decoder_class = ActiveRecord.default_timezone == :utc ?
+                            PG::TextDecoder::TimestampUtc :
+                            PG::TextDecoder::TimestampWithoutTimeZone
 
-        if supports_ranges?
-          query = <<-SQL
-              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,
-                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
+          @timestamp_decoder = decoder_class.new(@timestamp_decoder.to_h)
+          @connection.type_map_for_results.add_coder(@timestamp_decoder)
 
-        if oid
-          if oid.is_a? Numeric || oid.match(/^\d+$/)
-            # numeric OID
-            query += "WHERE t.oid = %s" % oid
+          @default_timezone = ActiveRecord.default_timezone
 
-          elsif m = oid.match(/"?(\w+)"?\."?(\w+)"?/)
-            # namespace and type name
-            query += "WHERE ns.nspname = '%s' AND t.typname = '%s'" % [m[1], m[2]]
+          # if default timezone has changed, we need to reconfigure the connection
+          # (specifically, the session time zone)
+          configure_connection
+        end
+      end
 
-          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
+      def extract_scale(sql_type)
+        case sql_type
+        when /\((\d+)\)/ then 0
+        when /\((\d+)(,(\d+))\)/ then $3.to_i
         end
+      end
+
+      def extract_precision(sql_type)
+        $1.to_i if sql_type =~ /\((\d+)(,\d+)?\)/
+      end
 
-        records = execute(query, 'SCHEMA')
-        initializer.run(records)
+      def extract_limit(sql_type)
+        $1.to_i if sql_type =~ /\((.*)\)/
       end
 
       # Support arrays/ranges for defining attributes that don't exist in the db

data/lib/arjdbc/sqlite3/adapter.rb

@@ -756,6 +756,29 @@ module ActiveRecord::ConnectionAdapters
     # Note: This is not an override of ours but a moved line from AR Sqlite3Adapter to register ours vs our copied module (which would be their class).
 #    ActiveSupport.run_load_hooks(:active_record_sqlite3adapter, SQLite3Adapter)
 
+    # DIFFERENCE: FQN
+    class SQLite3Integer < ::ActiveRecord::Type::Integer # :nodoc:
+      private
+      def _limit
+        # INTEGER storage class can be stored 8 bytes value.
+        # See https://www.sqlite.org/datatype3.html#storage_classes_and_datatypes
+        limit || 8
+      end
+    end
+
+    # DIFFERENCE: FQN
+    ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
+
+    class << self
+      private
+        def initialize_type_map(m)
+          super
+          register_class_with_limit m, %r(int)i, SQLite3Integer
+        end
+    end
+
+    TYPE_MAP = ActiveRecord::Type::TypeMap.new.tap { |m| initialize_type_map(m) }
+
     private
 
     # because the JDBC driver doesn't like multiple SQL statements in one JDBC statement
@@ -763,6 +786,10 @@ module ActiveRecord::ConnectionAdapters
       total_sql
     end
 
+    def type_map
+      TYPE_MAP
+    end
+
     # combine
     def write_query?(sql) # :nodoc:
       return sql.any? { |stmt| super(stmt) } if sql.kind_of? Array
@@ -770,23 +797,5 @@ module ActiveRecord::ConnectionAdapters
     rescue ArgumentError # Invalid encoding
       !READ_QUERY.match?(sql.b)
     end
-
-    def initialize_type_map(m = type_map)
-      super
-      register_class_with_limit m, %r(int)i, SQLite3Integer
-    end
-
-    # DIFFERENCE: FQN
-    class SQLite3Integer < ::ActiveRecord::Type::Integer # :nodoc:
-      private
-      def _limit
-        # INTEGER storage class can be stored 8 bytes value.
-        # See https://www.sqlite.org/datatype3.html#storage_classes_and_datatypes
-        limit || 8
-      end
-    end
-
-    # DIFFERENCE: FQN
-    ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
   end
 end

data/lib/arjdbc/tasks/database_tasks.rb

@@ -10,21 +10,6 @@ module ArJdbc
 
     require 'arjdbc/tasks/jdbc_database_tasks'
     require 'arjdbc/tasks/sqlite_database_tasks_patch'
-    #require 'arjdbc/tasks/db2_database_tasks'
-    #require 'arjdbc/tasks/derby_database_tasks'
-    #require 'arjdbc/tasks/h2_database_tasks'
-    #require 'arjdbc/tasks/hsqldb_database_tasks'
-    #require 'arjdbc/tasks/mssql_database_tasks'
-
-    # re-invent built-in (but deprecated on 4.0) tasks :
-    #register_tasks(/sqlserver/, MSSQLDatabaseTasks)
-    #register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
-    # tasks for custom (JDBC) adapters :
-    #register_tasks(/db2/, DB2DatabaseTasks)
-    #register_tasks(/derby/, DerbyDatabaseTasks)
-    #register_tasks(/h2/, H2DatabaseTasks)
-    #register_tasks(/hsqldb/, HSQLDBDatabaseTasks)
-    # (default) generic JDBC task :
     register_tasks(/^jdbc$/, JdbcDatabaseTasks)
 
     # NOTE: no need to register "built-in" adapters such as MySQL

data/lib/arjdbc/util/serialized_attributes.rb

@@ -31,33 +31,11 @@ module ArJdbc
         SerializedAttributes.dump_column_value(self, column)
       end
 
-      if defined? ActiveRecord::Type::Serialized # ArJdbc::AR42
-
       def self.dump_column_value(record, column)
         value = record[ column.name.to_s ]
         column.cast_type.type_cast_for_database(value)
       end
 
-      else
-
-      def self.dump_column_value(record, column)
-        value = record[ name = column.name.to_s ]
-        if record.class.respond_to?(:serialized_attributes)
-          if coder = record.class.serialized_attributes[name]
-            value = coder.respond_to?(:dump) ? coder.dump(value) : value.to_yaml
-          end
-        else
-          if record.respond_to?(:unserializable_attribute?)
-            value = value.to_yaml if record.unserializable_attribute?(name, column)
-          else
-            value = value.to_yaml if value.is_a?(Hash)
-          end
-        end
-        value
-      end
-
-      end
-
       def self.setup(lob_type = nil, after_save_alias = nil)
         ActiveRecord::Base.send :include, self # include SerializedAttributes
         ActiveRecord::Base.lob_type = lob_type unless lob_type.nil?

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '70.0'
+  VERSION = '70.1'
 end

data/rakelib/02-test.rake

@@ -1,7 +1,7 @@
 
 test_tasks = [ 'test_mysql', 'test_sqlite3', 'test_postgresql_with_hint' ]
 if defined?(JRUBY_VERSION)
-  test_tasks.push :test_derby, :test_hsqldb, :test_h2
+  test_tasks.push :test_hsqldb, :test_h2
   test_tasks.push :test_jndi, :test_jdbc
 end
 
@@ -55,7 +55,6 @@ def test_task_for(adapter, options = {})
   test_task
 end
 
-test_task_for :Derby, :desc => 'Run tests against (embedded) DerbyDB'
 test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
 test_task_for :MySQL #, :prereqs => 'db:mysql'
@@ -64,29 +63,22 @@ test_task_for :PostgreSQL, :driver => ENV['JDBC_POSTGRES_VERSION'] || 'postgres'
 task :test_postgres => :test_postgresql # alias
 test_task_for :SQLite3, :driver => ENV['JDBC_SQLITE_VERSION']
 task :test_sqlite => :test_sqlite3 # alias
-test_task_for :Firebird
 
 test_task_for :MariaDB, :files => FileList["test/db/mysql/*_test.rb"] do |test_task| #, :prereqs => 'db:mysql'
   test_task.ruby_opts << '-rdb/mariadb_config'
 end
 
 # ensure driver for these DBs is on your class-path
-[ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|
+[ :Oracle ].each do |adapter|
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"
 end
 
-test_task_for :AS400, :desc => "Run tests against AS400 (DB2) (ensure driver is on class-path)",
-              :files => FileList["test/db2*_test.rb"] + FileList["test/db/db2/*_test.rb"]
-
-#task :test_jdbc => [ :test_jdbc_mysql, :test_jdbc_derby ] if defined?(JRUBY_VERSION)
-
 test_task_for 'JDBC', :desc => 'Run tests against plain JDBC adapter (uses MySQL and Derby)',
   :prereqs => [ 'db:mysql' ], :files => FileList['test/*jdbc_*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-mysql/lib' << 'jdbc-derby/lib'
+  test_task.libs << 'jdbc-mysql/lib'
 end
 
 # TODO since Derby AR 5.x support is not implemented we only run JNDI with MySQL :
-#task :test_jndi => [ :test_jndi_mysql, :test_jndi_derby ] if defined?(JRUBY_VERSION)
 task :test_jndi => [ :test_jndi_mysql ] if defined?(JRUBY_VERSION)
 
 jndi_classpath = [ 'test/jars/tomcat-juli.jar', 'test/jars/tomcat-catalina.jar' ]
@@ -100,13 +92,6 @@ get_jndi_classpath_opt = lambda do
   "-J-cp \"#{cp.join(File::PATH_SEPARATOR)}\""
 end
 
-test_task_for 'JNDI_Derby', :desc => 'Run tests against a Derby JNDI connection',
-  :prereqs => jndi_classpath, :files => FileList['test/*jndi_derby*test.rb'] do |test_task|
-  test_task.libs << 'jdbc-derby/lib'
-  test_task.ruby_opts << get_jndi_classpath_opt.call
-  #test_task.verbose = true
-end
-
 test_task_for 'JNDI_MySQL', :desc => 'Run tests against a MySQL JNDI connection',
   :prereqs => [ 'db:mysql' ] + jndi_classpath, :files => FileList['test/*jndi_mysql*test.rb'] do |test_task|
   test_task.libs << 'jdbc-mysql/lib'

data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java

@@ -214,6 +214,11 @@ public class PostgreSQLRubyJdbcConnection extends arjdbc.jdbc.RubyJdbcConnection
         });
     }
 
+    @JRubyMethod
+    public IRubyObject exec_params(ThreadContext context, IRubyObject sql, IRubyObject binds) {
+        return execute_prepared_query(context, sql, binds, null);
+    }
+
     private transient RubyClass oidArray; // PostgreSQL::OID::Array
 
     private RubyClass oidArray(final ThreadContext context) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: '70.0'
+  version: '70.1'
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-29 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -48,13 +48,9 @@ files:
 - Rakefile
 - Rakefile.jdbc
 - activerecord-jdbc-adapter.gemspec
-- lib/active_record/connection_adapters/as400_adapter.rb
-- lib/active_record/connection_adapters/db2_adapter.rb
-- lib/active_record/connection_adapters/derby_adapter.rb
 - lib/active_record/connection_adapters/firebird_adapter.rb
 - lib/active_record/connection_adapters/h2_adapter.rb
 - lib/active_record/connection_adapters/hsqldb_adapter.rb
-- lib/active_record/connection_adapters/informix_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jndi_adapter.rb
 - lib/active_record/connection_adapters/mariadb_adapter.rb
@@ -64,9 +60,6 @@ files:
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/activerecord-jdbc-adapter.rb
 - lib/arel/visitors/compat.rb
-- lib/arel/visitors/db2.rb
-- lib/arel/visitors/derby.rb
-- lib/arel/visitors/firebird.rb
 - lib/arel/visitors/h2.rb
 - lib/arel/visitors/hsqldb.rb
 - lib/arel/visitors/postgresql_jdbc.rb
@@ -78,20 +71,7 @@ files:
 - lib/arjdbc/abstract/database_statements.rb
 - lib/arjdbc/abstract/statement_cache.rb
 - lib/arjdbc/abstract/transaction_support.rb
-- lib/arjdbc/db2.rb
-- lib/arjdbc/db2/adapter.rb
-- lib/arjdbc/db2/as400.rb
-- lib/arjdbc/db2/column.rb
-- lib/arjdbc/db2/connection_methods.rb
-- lib/arjdbc/derby.rb
-- lib/arjdbc/derby/active_record_patch.rb
-- lib/arjdbc/derby/adapter.rb
-- lib/arjdbc/derby/connection_methods.rb
-- lib/arjdbc/derby/schema_creation.rb
 - lib/arjdbc/discover.rb
-- lib/arjdbc/firebird.rb
-- lib/arjdbc/firebird/adapter.rb
-- lib/arjdbc/firebird/connection_methods.rb
 - lib/arjdbc/h2.rb
 - lib/arjdbc/h2/adapter.rb
 - lib/arjdbc/h2/connection_methods.rb
@@ -101,8 +81,6 @@ files:
 - lib/arjdbc/hsqldb/explain_support.rb
 - lib/arjdbc/hsqldb/schema_creation.rb
 - lib/arjdbc/informix.rb
-- lib/arjdbc/informix/adapter.rb
-- lib/arjdbc/informix/connection_methods.rb
 - lib/arjdbc/jdbc.rb
 - lib/arjdbc/jdbc/adapter.rb
 - lib/arjdbc/jdbc/adapter_java.jar
@@ -138,13 +116,9 @@ files:
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
-- lib/arjdbc/sybase.rb
-- lib/arjdbc/sybase/adapter.rb
 - lib/arjdbc/tasks.rb
 - lib/arjdbc/tasks/database_tasks.rb
 - lib/arjdbc/tasks/databases.rake
-- lib/arjdbc/tasks/db2_database_tasks.rb
-- lib/arjdbc/tasks/derby_database_tasks.rb
 - lib/arjdbc/tasks/h2_database_tasks.rb
 - lib/arjdbc/tasks/hsqldb_database_tasks.rb
 - lib/arjdbc/tasks/jdbc_database_tasks.rb
@@ -171,13 +145,9 @@ files:
 - src/java/arjdbc/ArJdbcModule.java
 - src/java/arjdbc/db2/DB2Module.java
 - src/java/arjdbc/db2/DB2RubyJdbcConnection.java
-- src/java/arjdbc/derby/DerbyModule.java
-- src/java/arjdbc/derby/DerbyRubyJdbcConnection.java
-- src/java/arjdbc/firebird/FirebirdRubyJdbcConnection.java
 - src/java/arjdbc/h2/H2Module.java
 - src/java/arjdbc/h2/H2RubyJdbcConnection.java
 - src/java/arjdbc/hsqldb/HSQLDBModule.java
-- src/java/arjdbc/informix/InformixRubyJdbcConnection.java
 - src/java/arjdbc/jdbc/AdapterJavaService.java
 - src/java/arjdbc/jdbc/Callable.java
 - src/java/arjdbc/jdbc/ConnectionFactory.java
@@ -215,9 +185,6 @@ post_install_message:
 rdoc_options:
 - "--main"
 - README.md
-- "-SHN"
-- "-f"
-- darkfish
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/active_record/connection_adapters/as400_adapter.rb

@@ -1,2 +0,0 @@
-require 'arjdbc/db2'
-require 'arjdbc/db2/as400'

data/lib/active_record/connection_adapters/db2_adapter.rb

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

data/lib/active_record/connection_adapters/derby_adapter.rb

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

data/lib/active_record/connection_adapters/informix_adapter.rb

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