activerecord-jdbc-alt-adapter 71.0.0.alpha2-java → 72.0.0.alpha1-java

data/lib/arjdbc/postgresql.rb

@@ -1,3 +1,3 @@
 require 'arjdbc'
 require 'arjdbc/postgresql/adapter'
-require 'arjdbc/postgresql/connection_methods'
+# require 'arjdbc/postgresql/connection_methods'

data/lib/arjdbc/sqlite3/adapter.rb

@@ -17,6 +17,9 @@ require "active_record/connection_adapters/sqlite3/schema_dumper"
 require "active_record/connection_adapters/sqlite3/schema_statements"
 require "active_support/core_ext/class/attribute"
 require "arjdbc/sqlite3/column"
+require "arjdbc/sqlite3/adapter_hash_config"
+
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
 
 module SQLite3
   module Constants
@@ -61,13 +64,6 @@ module ArJdbc
     SchemaCreation = ConnectionAdapters::SQLite3::SchemaCreation
     SQLite3Adapter = ConnectionAdapters::AbstractAdapter
 
-    ADAPTER_NAME = 'SQLite'
-
-    # DIFFERENCE: FQN
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
-    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
-
     NATIVE_DATABASE_TYPES = {
         primary_key:  "integer PRIMARY KEY AUTOINCREMENT NOT NULL",
         string:       { name: "varchar" },
@@ -82,7 +78,7 @@ module ArJdbc
         boolean:      { name: "boolean" },
         json:         { name: "json" },
     }
-    
+
     class StatementPool < ConnectionAdapters::StatementPool # :nodoc:
       private
       def dealloc(stmt)
@@ -669,6 +665,14 @@ module ArJdbc
       StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
     end
 
+    def reconnect
+      if active?
+        @raw_connection.rollback rescue nil
+      else
+        connect
+      end
+    end
+
     def configure_connection
       if @config[:timeout] && @config[:retries]
         raise ArgumentError, "Cannot specify both timeout and retries arguments"
@@ -719,13 +723,41 @@ module ActiveRecord::ConnectionAdapters
   # ActiveRecord::ConnectionAdapters::SQLite3Adapter.  Once we can do that we can remove the
   # module SQLite3 above and remove a majority of this file.
   class SQLite3Adapter < AbstractAdapter
+    ADAPTER_NAME = "SQLite"
+
+    class << self
+      def new_client(conn_params, adapter_instance)
+        jdbc_connection_class.new(conn_params, adapter_instance)
+      end
+
+      def dbconsole(config, options = {})
+        args = []
+
+        args << "-#{options[:mode]}" if options[:mode]
+        args << "-header" if options[:header]
+        args << File.expand_path(config.database, const_defined?(:Rails) && Rails.respond_to?(:root) ? Rails.root : nil)
+
+        find_cmd_and_exec("sqlite3", *args)
+      end
+
+      def jdbc_connection_class
+        ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
+      end
+    end
+
     include ArJdbc::Abstract::Core
     include ArJdbc::SQLite3
+    include ArJdbc::SQLite3Config
+
     include ArJdbc::Abstract::ConnectionManagement
     include ArJdbc::Abstract::DatabaseStatements
     include ArJdbc::Abstract::StatementCache
     include ArJdbc::Abstract::TransactionSupport
 
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::DatabaseStatements
+
     ##
     # :singleton-method:
     # Configure the SQLite3Adapter to be used in a strict strings mode.
@@ -739,7 +771,8 @@ module ActiveRecord::ConnectionAdapters
     def initialize(...)
       super
 
-      conn_params = @config.compact
+      # assign arjdbc extra connection params
+      conn_params = build_connection_config(@config.compact)
 
       # NOTE: strict strings is not supported by the jdbc driver yet,
       # hope it will supported soon, I open a issue in their repository.
@@ -810,24 +843,6 @@ module ActiveRecord::ConnectionAdapters
     ::ActiveRecord::Type.register(:integer, SQLite3Integer, adapter: :sqlite3)
 
     class << self
-      def jdbc_connection_class
-        ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
-      end
-
-      def new_client(conn_params, adapter_instance)
-        jdbc_connection_class.new(conn_params, adapter_instance)
-      end
-
-      def dbconsole(config, options = {})
-        args = []
-
-        args << "-#{options[:mode]}" if options[:mode]
-        args << "-header" if options[:header]
-        args << File.expand_path(config.database, const_defined?(:Rails) && Rails.respond_to?(:root) ? Rails.root : nil)
-
-        find_cmd_and_exec("sqlite3", *args)
-      end
-
       private
         def initialize_type_map(m)
           super

data/lib/arjdbc/sqlite3/adapter_hash_config.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module ArJdbc
+  module SQLite3Config
+    def build_connection_config(config)
+      config = config.deep_dup
+
+      load_jdbc_driver
+
+      config[:driver] ||= "org.sqlite.JDBC"
+
+      parse_sqlite3_config!(config)
+
+      database = config[:database]
+
+      # NOTE: "jdbc:sqlite::memory:" syntax is supported
+      config[:url] ||= "jdbc:sqlite:#{database == ':memory:' ? '' : database}"
+      config[:connection_alive_sql] ||= "SELECT 1"
+
+      config[:properties] = build_properties(config)
+
+      config
+    end
+
+    private
+
+    def load_jdbc_driver
+      require "jdbc/sqlite3"
+
+      ::Jdbc::SQLite3.load_driver(:require) if defined?(::Jdbc::SQLite3.load_driver)
+    rescue LoadError
+      # assuming driver.jar is on the class-path
+    end
+
+    def build_properties(config)
+      properties = config[:properties] || {}
+
+      if config[:readonly]
+        # See
+        # * http://sqlite.org/c3ref/open.html
+        # * http://sqlite.org/c3ref/c_open_autoproxy.html
+        # => 0x01 = readonly, 0x40 = uri (default in JDBC)
+        properties[:open_mode] =
+          ::SQLite3::Constants::Open::READONLY | ::SQLite3::Constants::Open::URI
+      end
+
+      if config[:flags]
+        properties[:open_mode] ||= 0
+        properties[:open_mode] |= config[:flags]
+
+        # JDBC driver has an extra flag for it
+        if config[:flags] & ::SQLite3::Constants::Open::SHAREDCACHE != 0
+          properties[:shared_cache] = true
+        end
+      end
+
+      timeout = config[:timeout]
+      if timeout && timeout.to_s !~ /\A\d+\Z/
+        raise ActiveRecord::StatementInvalid.new(
+          "TypeError: Timeout must be nil or a number (got: #{timeout}).",
+          connection_pool: ActiveRecord::ConnectionAdapters::NullPool.new
+        )
+      end
+
+      properties["busy_timeout"] ||= timeout unless timeout.nil?
+
+      properties
+    end
+
+    def parse_sqlite3_config!(config)
+      database = (config[:database] ||= config[:dbfile])
+
+      if database != ":memory:"
+        # make sure to have an absolute path. Ruby and Java don't agree
+        # on working directory
+        base_dir = defined?(Rails.root) ? Rails.root : nil
+        config[:database] = File.expand_path(database, base_dir)
+        dirname = File.dirname(config[:database])
+        Dir.mkdir(dirname) unless File.directory?(dirname)
+      end
+    rescue Errno::ENOENT => e
+      if e.message.include?("No such file or directory")
+        raise ActiveRecord::NoDatabaseError.new(
+          connection_pool: ActiveRecord::ConnectionAdapters::NullPool.new
+        )
+      end
+
+      raise
+    end
+  end
+end

data/lib/arjdbc/sqlite3.rb

@@ -1,3 +1,3 @@
 require 'arjdbc'
 require 'arjdbc/sqlite3/adapter'
-require 'arjdbc/sqlite3/connection_methods'
+# require 'arjdbc/sqlite3/connection_methods'

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArJdbc
-  VERSION = '71.0.0.alpha2'
+  VERSION = "72.0.0.alpha1"
 end

data/lib/arjdbc.rb

@@ -12,8 +12,14 @@ if defined?(JRUBY_VERSION)
   rescue LoadError => e
     warn "activerecord-jdbc-adapter failed to load railtie: #{e.inspect}"
   end if defined?(Rails) && ActiveRecord::VERSION::MAJOR >= 3
+
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::ConnectionAdapters.register(
+      "sqlserver", "ActiveRecord::ConnectionAdapters::MSSQLAdapter", "active_record/connection_adapters/mssql_adapter"
+    )
+  end
 else
   warn "activerecord-jdbc-adapter is for use with JRuby only"
 end
 
-require 'arjdbc/version'
+require 'arjdbc/version'

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 71.0.0.alpha2
+  version: 72.0.0.alpha1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2025-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.2.2
   name: activerecord
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.3
+        version: 7.2.2
 description: 'Fork of the ActiveRecord JDBC adapter with support for SQL Server and
   Azure SQL, for more information and help look at the README file in the github repository.
   AR-JDBC is a database adapter for Rails'' ActiveRecord component designed to be
@@ -78,6 +78,7 @@ files:
 - lib/arjdbc/abstract/connection_management.rb
 - lib/arjdbc/abstract/core.rb
 - lib/arjdbc/abstract/database_statements.rb
+- lib/arjdbc/abstract/relation_query_attribute_monkey_patch.rb
 - lib/arjdbc/abstract/statement_cache.rb
 - lib/arjdbc/abstract/transaction_support.rb
 - lib/arjdbc/discover.rb
@@ -109,6 +110,7 @@ files:
 - lib/arjdbc/jdbc/type_converter.rb
 - lib/arjdbc/mssql.rb
 - lib/arjdbc/mssql/adapter.rb
+- lib/arjdbc/mssql/adapter_hash_config.rb
 - lib/arjdbc/mssql/column.rb
 - lib/arjdbc/mssql/connection_methods.rb
 - lib/arjdbc/mssql/database_limits.rb
@@ -133,22 +135,26 @@ files:
 - lib/arjdbc/mssql/utils.rb
 - lib/arjdbc/mysql.rb
 - lib/arjdbc/mysql/adapter.rb
+- lib/arjdbc/mysql/adapter_hash_config.rb
 - lib/arjdbc/mysql/connection_methods.rb
 - lib/arjdbc/oracle/adapter.rb
 - lib/arjdbc/postgresql.rb
 - lib/arjdbc/postgresql/adapter.rb
+- lib/arjdbc/postgresql/adapter_hash_config.rb
 - lib/arjdbc/postgresql/base/array_decoder.rb
 - lib/arjdbc/postgresql/base/array_encoder.rb
 - lib/arjdbc/postgresql/base/array_parser.rb
 - lib/arjdbc/postgresql/base/pgconn.rb
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
+- lib/arjdbc/postgresql/database_statements.rb
 - lib/arjdbc/postgresql/name.rb
 - lib/arjdbc/postgresql/oid_types.rb
 - lib/arjdbc/postgresql/schema_statements.rb
 - lib/arjdbc/railtie.rb
 - lib/arjdbc/sqlite3.rb
 - lib/arjdbc/sqlite3/adapter.rb
+- lib/arjdbc/sqlite3/adapter_hash_config.rb
 - lib/arjdbc/sqlite3/column.rb
 - lib/arjdbc/sqlite3/connection_methods.rb
 - lib/arjdbc/tasks.rb