activerecord-jdbc-adapter 80.0.pre1-java → 81.0.pre1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126f20bb7b8403ad8a284fd75f73d0141039f68f10e3488a0be36da6e31d1307
-  data.tar.gz: '09f8725e1f8a28d4b9cb8e01a4fb07f419727ec9dfc561740ec52e2b56b6e2dd'
+  metadata.gz: ffdbea8302a2c3049c57ade1e0fdd453ccb55f2d71648d08c7cda8c73db6ad4d
+  data.tar.gz: a9748358df5fb32f141d3bcee61ed3b578f1f7bcc55c57ca19f10c66934f25f7
 SHA512:
-  metadata.gz: 1615999867c54b179d94ab833100320af6c6b3be80a3a1f1991ab2efb4cb1c586818b6d0b88a3e1103be50bfa357feb52551543a0be1e81b43d8e6b47d90039e
-  data.tar.gz: 17bef2d1991fb4eeb5fd53011e16dba1ce5056742fb82311bddd31455d99de20d70b9fb3a43fac0b35e547827f100b1d12f369a916a1461bf82a5c911a3b531a
+  metadata.gz: fe6be99838a8b20e72d93822179ee2d38c188ccfac4f38e036cc7f2ee72c2c14b800aa077d9df6c4f8280b4994237fb4350f4dc8c1c2fe5d6b72ff9ba2a95d03
+  data.tar.gz: d13f9c3807685214330867d70855129f7491b9d62897b8c37b8dda609b4957e318ddb1eedf888a90af238c438133091e1b4823fcd0766aa84a5b029670e84dcb

data/.github/workflows/ruby.yml

@@ -23,7 +23,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['mysql2']
         test_targets: ["rails:test_mysql2"]
-        ar_version: ["8-0-stable"]
+        ar_version: ["8-1-stable"]
         prepared_statements: ['false', 'true']
         driver: ['MySQL']
 
@@ -83,7 +83,7 @@ jobs:
         ruby-version: [ 'jruby-head' ]
         db: [ 'postgresql' ]
         test_targets: [ "rails:test_postgresql" ]
-        ar_version: ["8-0-stable"]
+        ar_version: ["8-1-stable"]
         prepared_statements: [ 'false', 'true' ]
 
     services:
@@ -152,7 +152,7 @@ jobs:
         ruby-version: ['jruby-head']
         db: ['sqlite3']
         test_targets: ["rails:test_sqlite3"]
-        ar_version: ["8-0-stable"]
+        ar_version: ["8-1-stable"]
 
     env:
       DB: ${{ matrix.db }}

data/README.md

@@ -28,9 +28,10 @@ Versions are targeted at certain versions of Rails and live on their own branche
 | 70.x        | 7.0.x         | 70-stable | 9.3.0     | 8        |
 | 71.x        | 7.1.x         | 71-stable | 9.4.3     | 8        |
 | 72.x        | 7.2.x         | 72-stable | 9.4.3     | 8        |
-| 80.x        | 8.0.x         | master    | 10.0.0    | 21       |
+| 80.x        | 8.0.x         | 80-stable | 10.0.0    | 21       |
+| 81.x        | 8.1.x         | master    | 10.0.0    | 21       |
 
-Note: 80.x is still under development and not supported yet.
+Note: 80.x and 81.x are still under development and not supported yet.
 
 Note that JRuby 9.1.x and JRuby 9.2.x are at end-of-life. We recommend Java 8
 at a minimum for all versions.

data/RUNNING_TESTS.md

@@ -83,7 +83,15 @@ CREATE DATABASE activerecord_unittest2;
 GRANT ALL PRIVILEGES ON activerecord_unittest2.* TO 'rails'@'localhost';
 ```
 
-Then edit test/rails/config.yml for the appropriate configuration credentials.
+Then edit test/rails/config.yml for the appropriate configuration credentials. You may need to add a "password: testtest9" entry to authenticate.
+
+Additionally, you may need to add the following to the config.yml file to disable SSL and allow public key retrieval:
+
+```yaml
+      properties:
+        useSSL: false
+        allowPublicKeyRetrieval: true
+```
 
 ### ActiveRecord (Rails) Tests
 

data/Rakefile

@@ -284,7 +284,7 @@ if defined? JRUBY_VERSION
           if match = requirement.match(/^jar\s+([\w\-\.]+):([\w\-]+),\s+?([\w\.\-]+)?/)
             matched_jar = Jars.send :to_jar, match[1], match[2], match[3], nil
             matched_jar = File.join( Jars.home, matched_jar )
-            matched_jars << matched_jar if File.exists?( matched_jar )
+            matched_jars << matched_jar if File.exist?( matched_jar )
           end
         end
         matched_jars

data/activerecord-jdbc-adapter.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^test/})
 
-  gem.add_dependency "activerecord", "~> 8.0.0"
+  gem.add_dependency "activerecord", "~> 8.1"
 
   #gem.add_development_dependency 'test-unit', '2.5.4'
   #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'

data/lib/arjdbc/abstract/database_statements.rb

@@ -9,6 +9,17 @@ module ArJdbc
 
       NO_BINDS = [].freeze
 
+      def mark_transaction_written_if_write(sql)
+        if write_query?(sql)
+          ensure_writes_are_allowed(sql)
+          mark_transaction_written
+        end
+      end
+
+      def check_if_write_query(sql)
+        ensure_writes_are_allowed(sql) if write_query?(sql)
+      end
+
       def exec_insert(sql, name = nil, binds = NO_BINDS, pk = nil, sequence_name = nil, returning: nil)
         if preventing_writes?
           raise ActiveRecord::ReadOnlyError, "Write query attempted while in readonly mode: #{sql}"

data/lib/arjdbc/postgresql/schema_statements.rb

@@ -6,6 +6,23 @@ module ArJdbc
       ForeignKeyDefinition = ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
       Utils = ActiveRecord::ConnectionAdapters::PostgreSQL::Utils
 
+      def decode_string_array(value)
+        return value if value.is_a?(Array)
+        _arjdbc_array_parser.parse_pg_array(value)
+      end
+
+      private
+
+      def _arjdbc_array_parser
+        @_arjdbc_array_parser ||= begin
+          obj = Object.new
+          obj.extend(ActiveRecord::ConnectionAdapters::PostgreSQL::ArrayParser)
+          obj
+        end
+      end
+
+      public
+
       def foreign_keys(table_name)
         scope = quoted_scope(table_name)
         fk_info = internal_exec_query(<<~SQL, "SCHEMA", allow_retry: true, materialize_transactions: false)

data/lib/arjdbc/sqlite3/adapter.rb

@@ -471,12 +471,17 @@ module ArJdbc
 
       rowid = is_column_the_rowid?(field, definitions)
 
-      ActiveRecord::ConnectionAdapters::SQLite3Column.new(
-        field["name"],
+      column_args = [field["name"]]
+      column_args << lookup_cast_type(field["type"])
+      column_args.push(
         default_value,
         type_metadata,
         field["notnull"].to_i == 0,
-        default_function,
+        default_function
+      )
+
+      ActiveRecord::ConnectionAdapters::SQLite3Column.new(
+        *column_args,
         collation: field["collation"],
         auto_increment: field["auto_increment"],
         rowid: rowid,
@@ -609,7 +614,7 @@ module ArJdbc
             column_options[:stored] = column.virtual_stored?
             column_options[:type] = column.type
           elsif column.has_default?
-            type = lookup_cast_type_from_column(column)
+            type = column.fetch_cast_type(self)
             default = type.deserialize(column.default)
             default = -> { column.default_function } if default.nil?
 
@@ -870,6 +875,10 @@ module ActiveRecord::ConnectionAdapters
       def jdbc_connection_class
         ::ActiveRecord::ConnectionAdapters::SQLite3JdbcConnection
       end
+
+      def native_database_types # :nodoc:
+        ArJdbc::SQLite3::NATIVE_DATABASE_TYPES
+      end
     end
 
     # NOTE: include these modules before all then override some methods with the

data/lib/arjdbc/sqlite3/column.rb

@@ -9,7 +9,7 @@ module ActiveRecord::ConnectionAdapters
       super
 
       @auto_increment = auto_increment
-      @default = nil if default =~ /NULL/
+      @default = nil if default.is_a?(String) && default.match?(/NULL/)
       @rowid = rowid
       @generated_type = generated_type
     end

data/lib/arjdbc/version.rb

@@ -1,3 +1,3 @@
 module ArJdbc
-  VERSION = '80.0.pre1'
+  VERSION = '81.0.pre1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 80.0.pre1
+  version: 81.0.pre1
 platform: java
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: '8.1'
 description: 'AR-JDBC is a database adapter for Rails'' ActiveRecord component designed
   to be used with JRuby built upon Java''s JDBC API for database access. Provides
   (ActiveRecord) built-in adapters: MySQL,  PostgreSQL, and SQLite3.'
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.21
 specification_version: 4
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 test_files: []