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

data/lib/arjdbc/postgresql/schema_statements.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module ArJdbc
+  module PostgreSQL
+    module SchemaStatements
+      ForeignKeyDefinition = ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
+      Utils = ActiveRecord::ConnectionAdapters::PostgreSQL::Utils
+
+      def foreign_keys(table_name)
+        scope = quoted_scope(table_name)
+        fk_info = internal_exec_query(<<~SQL, "SCHEMA", allow_retry: true, materialize_transactions: false)
+          SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete, c.convalidated AS valid, c.condeferrable AS deferrable, c.condeferred AS deferred, c.conkey, c.confkey, c.conrelid, c.confrelid
+          FROM pg_constraint c
+          JOIN pg_class t1 ON c.conrelid = t1.oid
+          JOIN pg_class t2 ON c.confrelid = t2.oid
+          JOIN pg_attribute a1 ON a1.attnum = c.conkey[1] AND a1.attrelid = t1.oid
+          JOIN pg_attribute a2 ON a2.attnum = c.confkey[1] AND a2.attrelid = t2.oid
+          JOIN pg_namespace t3 ON c.connamespace = t3.oid
+          WHERE c.contype = 'f'
+            AND t1.relname = #{scope[:name]}
+            AND t3.nspname = #{scope[:schema]}
+          ORDER BY c.conname
+        SQL
+
+        fk_info.map do |row|
+          to_table = Utils.unquote_identifier(row["to_table"])
+          # conkey = row["conkey"].scan(/\d+/).map(&:to_i)
+          # confkey = row["confkey"].scan(/\d+/).map(&:to_i)
+          conkey = row["conkey"]
+          confkey = row["confkey"]
+
+          if conkey.size > 1
+            column = column_names_from_column_numbers(row["conrelid"], conkey)
+            primary_key = column_names_from_column_numbers(row["confrelid"], confkey)
+          else
+            column = Utils.unquote_identifier(row["column"])
+            primary_key = row["primary_key"]
+          end
+
+          options = {
+            column: column,
+            name: row["name"],
+            primary_key: primary_key
+          }
+
+          options[:on_delete] = extract_foreign_key_action(row["on_delete"])
+          options[:on_update] = extract_foreign_key_action(row["on_update"])
+          options[:deferrable] = extract_constraint_deferrable(row["deferrable"], row["deferred"])
+
+          options[:validate] = row["valid"]
+
+          ForeignKeyDefinition.new(table_name, to_table, options)
+        end
+      end
+    end
+  end
+end

data/lib/arjdbc/sqlite3/adapter.rb

@@ -18,6 +18,8 @@ require "active_record/connection_adapters/sqlite3/schema_statements"
 require "active_support/core_ext/class/attribute"
 require "arjdbc/sqlite3/column"
 
+require "arjdbc/abstract/relation_query_attribute_monkey_patch"
+
 module SQLite3
   module Constants
     module Open
@@ -669,50 +671,20 @@ module ArJdbc
       StatementPool.new(self.class.type_cast_config_to_integer(@config[:statement_limit]))
     end
 
-    def configure_connection
-      if @config[:timeout] && @config[:retries]
-        raise ArgumentError, "Cannot specify both timeout and retries arguments"
-      elsif @config[:timeout]
-        # FIXME: missing from adapter
-        # @raw_connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout]))
-      elsif @config[:retries]
-        retries = self.class.type_cast_config_to_integer(@config[:retries])
-        raw_connection.busy_handler do |count|
-          count <= retries
-        end
-      end
-
-      # Enforce foreign key constraints
-      # https://www.sqlite.org/pragma.html#pragma_foreign_keys
-      # https://www.sqlite.org/foreignkeys.html
-      raw_execute("PRAGMA foreign_keys = ON", "SCHEMA")
-      unless @memory_database
-        # Journal mode WAL allows for greater concurrency (many readers + one writer)
-        # https://www.sqlite.org/pragma.html#pragma_journal_mode
-        raw_execute("PRAGMA journal_mode = WAL", "SCHEMA")
-        # Set more relaxed level of database durability
-        # 2 = "FULL" (sync on every write), 1 = "NORMAL" (sync every 1000 written pages) and 0 = "NONE"
-        # https://www.sqlite.org/pragma.html#pragma_synchronous
-        raw_execute("PRAGMA synchronous = NORMAL", "SCHEMA")
-        # Set the global memory map so all processes can share some data
-        # https://www.sqlite.org/pragma.html#pragma_mmap_size
-        # https://www.sqlite.org/mmap.html
-        raw_execute("PRAGMA mmap_size = #{128.megabytes}", "SCHEMA")
+    def reconnect
+      if active?
+        @raw_connection.rollback rescue nil
+      else
+        connect
       end
-      # Impose a limit on the WAL file to prevent unlimited growth
-      # https://www.sqlite.org/pragma.html#pragma_journal_size_limit
-      raw_execute("PRAGMA journal_size_limit = #{64.megabytes}", "SCHEMA")
-      # Set the local connection cache to 2000 pages
-      # https://www.sqlite.org/pragma.html#pragma_cache_size
-      raw_execute("PRAGMA cache_size = 2000", "SCHEMA")
     end
 
     def configure_connection
       if @config[:timeout] && @config[:retries]
         raise ArgumentError, "Cannot specify both timeout and retries arguments"
       elsif @config[:timeout]
-        # FIXME:
-#        @raw_connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout]))
+        # FIXME: missing from adapter
+        # @raw_connection.busy_timeout(self.class.type_cast_config_to_integer(@config[:timeout]))
       elsif @config[:retries]
         retries = self.class.type_cast_config_to_integer(@config[:retries])
         raw_connection.busy_handler do |count|
@@ -742,7 +714,7 @@ module ArJdbc
       raw_execute("PRAGMA journal_size_limit = #{64.megabytes}", "SCHEMA")
       # Set the local connection cache to 2000 pages
       # https://www.sqlite.org/pragma.html#pragma_cache_size
-      raw_execute("PRAGMA cache_size = 2000", "SCHEMA")      
+      raw_execute("PRAGMA cache_size = 2000", "SCHEMA")
     end
   end
   # DIFFERENCE: A registration here is moved down to concrete class so we are not registering part of an adapter.
@@ -774,6 +746,20 @@ module ActiveRecord::ConnectionAdapters
     #   config.active_record.sqlite3_adapter_strict_strings_by_default = true
     class_attribute :strict_strings_by_default, default: false # Does not actually do anything right now
 
+    def initialize(...)
+      super
+
+      conn_params = @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.
+      #   https://github.com/xerial/sqlite-jdbc/issues/1153
+      #
+      # @config[:strict] = ConnectionAdapters::SQLite3Adapter.strict_strings_by_default unless @config.key?(:strict)
+
+      @connection_parameters = conn_params
+    end
+
     def self.represent_boolean_as_integer=(value) # :nodoc:
       if value == false
         raise "`.represent_boolean_as_integer=` is now always true, so make sure your application can work with it and remove this settings."
@@ -817,15 +803,6 @@ module ActiveRecord::ConnectionAdapters
       ::ActiveRecord::ConnectionAdapters::SQLite3Column
     end
 
-    def jdbc_connection_class(spec)
-      self.class.jdbc_connection_class
-    end
-
-    # @see ActiveRecord::ConnectionAdapters::JdbcAdapter#jdbc_connection_class
-    def self.jdbc_connection_class
-      ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
-    end
-
     # 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)
 
@@ -843,6 +820,14 @@ 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 = []
 

data/lib/arjdbc/version.rb

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

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -793,8 +793,8 @@ public class RubyJdbcConnection extends RubyObject {
                         // Unfortunately the result set gets closed when getMoreResults()
                         // is called, so we have to process the result sets as we get them
                         // this shouldn't be an issue in most cases since we're only getting 1 result set anyways
-                        //result = mapExecuteResult(context, connection, resultSet);
-                        result = mapToRawResult(context, connection, resultSet, false);
+                        result = mapExecuteResult(context, connection, resultSet);
+                        // result = mapToRawResult(context, connection, resultSet, false);
                         resultSet.close();
                     } else {
                         result = context.runtime.newFixnum(updateCount);

data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java

@@ -119,6 +119,17 @@ public class MySQLRubyJdbcConnection extends RubyJdbcConnection {
         return driverWrapper;
     }
 
+    @JRubyMethod(name = "ping")
+    public RubyBoolean db_ping(final ThreadContext context) {
+        final Connection connection = getConnection(true);
+        if (connection == null) return context.fals;
+
+        // NOTE: It seems only `connection.isValid(aliveTimeout)` is needed
+        // for JDBC 4.0 and up. https://jira.mariadb.org/browse/CONJ-51
+
+        return context.runtime.newBoolean(isConnectionValid(context, connection));
+    }
+
     private static transient Class MYSQL_CONNECTION;
     private static transient Boolean MYSQL_CONNECTION_FOUND;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-alt-adapter
 version: !ruby/object:Gem::Version
-  version: 71.0.0.alpha1
+  version: 71.0.0
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek, Jesse Chavez, and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -143,8 +144,10 @@ files:
 - 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
@@ -228,9 +231,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.26
 signing_key: