activerecord-nulldb-adapter 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af43f27ebeb1eb1c313923392e50c59a234c1942355422e614fb3026ecb3bb13
-  data.tar.gz: 2c60b7ed36c6da832eaf7f0dcfd3e31c555a9735283903fed26e80f168a7905c
+  metadata.gz: d96aa93ee94ff8e5066079bc5a1109013411dae9daa1e9b4ad3006c376cde011
+  data.tar.gz: 95f8ba73a83564f08990b90e21caa482dc486f9435092c91eff452b6a376c663
 SHA512:
-  metadata.gz: 8b09032c9f0421c412fab061201d1381a4fd3b265b5c8a00d5ced214201aade646ed7a9d8ae207c3c015aeb30cf7ddf5d21f429864262cb7a791f7a1c0ad8fb9
-  data.tar.gz: 8792abf6acf27101e8fc0e1c3a2806a16e629d5cc14fd660a12833d1afff4aed679030948799646dd321746117f5f6282100f8ffa391b598f6f310f08466a93c
+  metadata.gz: 8a69a0503e3b4b5a2fc57359c76f7227f22663575af4cb3c786da9a0cea42164b91f5009307733e2aacf420bf32e2be105c9f9ed12bfd06c8fd1604de247c6f7
+  data.tar.gz: c6ac3b7d961fc2cb68279201987cbeb9143d79bdc66a62984f1df97fa4cf04f295c136192e3d0c4ccd7e8da91784cd884438b11aad5001f9fade65294fb61444

data/.github/workflows/ruby.yml

@@ -12,58 +12,48 @@ jobs:
             activerecord_7.1,
             activerecord_7.2,
             activerecord_8.0,
+            activerecord_8.1,
             activerecord_master,
           ]
-        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "jruby-9.3.1.0"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4", "jruby-9.4", "jruby-10"]
         exclude:
-          - ruby: "jruby-9.3.1.0"
+          - ruby: "3.4"
+            gemfile: "activerecord_6.1"
+          - ruby: "3.4"
             gemfile: "activerecord_7.0"
-
-          - ruby: "jruby-9.3.1.0"
+          - ruby: "jruby-9.4"
+            gemfile: "activerecord_7.1"
+          - ruby: "3.4"
             gemfile: "activerecord_7.1"
-
           - ruby: "2.7"
             gemfile: "activerecord_7.2"
-
-          - ruby: "2.8"
-            gemfile: "activerecord_7.2"
-
           - ruby: "3.0"
             gemfile: "activerecord_7.2"
-
-          - ruby: "jruby-9.3.1.0"
-            gemfile: "activerecord_7.2"
-
-          - ruby: "2.7"
+          - ruby: "jruby-9.4"
             gemfile: "activerecord_8.0"
-
-          - ruby: "2.8"
+          - ruby: "2.7"
             gemfile: "activerecord_8.0"
-
           - ruby: "3.0"
             gemfile: "activerecord_8.0"
-
           - ruby: "3.1"
             gemfile: "activerecord_8.0"
-
-          - ruby: "jruby-9.3.1.0"
-            gemfile: "activerecord_8.0"
-
+          - ruby: "jruby-9.4"
+            gemfile: "activerecord_8.1"
           - ruby: "2.7"
+            gemfile: "activerecord_8.1"
+          - ruby: "3.0"
+            gemfile: "activerecord_8.1"
+          - ruby: "3.1"
+            gemfile: "activerecord_8.1"
+          - ruby: "jruby-9.4"
             gemfile: "activerecord_master"
-
-          - ruby: "2.8"
+          - ruby: "2.7"
             gemfile: "activerecord_master"
-
           - ruby: "3.0"
             gemfile: "activerecord_master"
-
           - ruby: "3.1"
             gemfile: "activerecord_master"
 
-          - ruby: "jruby-9.3.1.0"
-            gemfile: "activerecord_master"
-
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile

data/Appraisals

@@ -22,6 +22,10 @@ appraise "activerecord-8.0" do
   gem "activerecord", github: 'rails/rails', branch: "8-0-stable"
 end
 
+appraise "activerecord-8.1" do
+  gem "activerecord", github: 'rails/rails', branch: "8-1-stable"
+end
+
 appraise "activerecord-master" do
   gem "activerecord", github: 'rails/rails', branch: :main
 end

data/CHANGES.md

@@ -1,7 +1,16 @@
 Unreleased
 ----------
 
-1.1.1 (20214-11-14)
+1.2.1 (2025-12-02)
+
+- Add `exclusion_constraint` #142
+- Add ActiveRecord 8.2 QueryIntent support #146
+
+1.2.0 (2025-12-01)
+
+- ActiveRecord 8.1 support #143
+
+1.1.1 (2024-11-14)
 
 - Fix syntax error on 2.7 and 3.0.
 

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'activerecord', '>= 6.0', '< 8.1'
+gem 'activerecord', '>= 6.1', '< 8.2'
 
 group :development, :test do
   gem 'spec'

data/README.md

@@ -1,9 +1,5 @@
-[<img src="https://badge.fury.io/rb/activerecord-nulldb-adapter.png" alt="Gem
-Version" />](http://badge.fury.io/rb/activerecord-nulldb-adapter) [<img
-src="https://codeclimate.com/github/nulldb/nulldb.png"
-/>](https://codeclimate.com/github/nulldb/nulldb) [<img
-src="https://github.com/nulldb/nulldb/workflows/build/badge.svg?branch=master"
-alt="Build Status" />](https://github.com/nulldb/nulldb/actions)
+[<img src="https://badge.fury.io/rb/activerecord-nulldb-adapter.svg" alt="Gem
+Version" />](http://badge.fury.io/rb/activerecord-nulldb-adapter) [![build](https://github.com/nulldb/nulldb/actions/workflows/ruby.yml/badge.svg)](https://github.com/nulldb/nulldb/actions/workflows/ruby.yml)
 
 # The NullDB Connection Adapter Plugin
 

data/activerecord-nulldb-adapter.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/nulldb/nulldb"
   s.licenses = ["MIT"]
 
-  s.add_runtime_dependency 'activerecord', '>= 6.0', '< 8.1'
+  s.add_runtime_dependency 'activerecord', '>= 6.1', '< 8.2'
   s.add_development_dependency 'spec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'

data/gemfiles/activerecord_6.1.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 6.1.0"
+gem "concurrent-ruby", "1.3.4" # Locked, because "1.3.5" Removed Dependency used by ActiveRecord 6.1
 
 group :development, :test do
   gem "spec"

data/gemfiles/activerecord_7.0.gemfile

@@ -3,6 +3,7 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 7.0.0"
+gem "concurrent-ruby", "1.3.4" # Locked, because "1.3.5" Removed Dependency used by ActiveRecord 7.0
 
 group :development, :test do
   gem "spec"

data/gemfiles/activerecord_8.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", github: "rails/rails", branch: "8-0-stable"
+gem "activerecord", "~> 8.0.0"
 
 group :development, :test do
   gem "spec"

data/gemfiles/{activerecord_6.0.gemfile → activerecord_8.1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.0"
+gem "activerecord", "~> 8.1.0"
 
 group :development, :test do
   gem "spec"
@@ -15,3 +15,4 @@ group :development do
   gem "appraisal"
   gem "simplecov", require: false
 end
+

data/lib/active_record/connection_adapters/nulldb_adapter/core.rb

@@ -98,7 +98,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   end
 
   # Rails 6.1+
-  if ActiveRecord::VERSION::MAJOR >= 7 || (ActiveRecord::VERSION::MAJOR >= 6 and ActiveRecord::VERSION::MINOR > 0)
+  if ActiveRecord.version >= Gem::Version.new('6.1.a')
     def remove_index(table_name, column_name = nil, **options )
       index_name = index_name_for_remove(table_name, column_name, options)
       index = @indexes[table_name].reject! { |index| index.name == index_name }
@@ -269,9 +269,23 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
   end
 
   ### Rails 8.0+ ###
-  def perform_query(raw_connection, statement, binds, type_casted_binds, prepare:, notification_payload:, batch:)
-    self.execution_log << Statement.new(entry_point, statement)
-    NullObject.new
+  # Rails 8.2+ uses QueryIntent object, earlier versions use individual arguments
+  # https://github.com/rails/rails/pull/55897
+  if defined?(ActiveRecord::ConnectionAdapters::QueryIntent)
+    def perform_query(raw_connection, intent)
+      self.execution_log << Statement.new(entry_point, intent.processed_sql)
+      ActiveRecord::Result.empty
+    end
+
+    def cast_result(raw_result)
+      # NullDB returns ActiveRecord::Result directly, no casting needed
+      raw_result
+    end
+  else
+    def perform_query(raw_connection, statement, binds, type_casted_binds, prepare:, notification_payload:, batch:)
+      self.execution_log << Statement.new(entry_point, statement)
+      NullObject.new
+    end
   end
 
   def affected_rows(raw_result)
@@ -358,13 +372,34 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     end
   end
 
+  def native_database_types
+    {}
+  end
+
   def default_column_arguments(col_def)
-    [
-      col_def.name.to_s,
-      col_def.default.present? ? col_def.default.to_s : nil,
-      sql_type_definition(col_def),
-      col_def.null.nil? || col_def.null
-    ]
+    # ActiveRecord 8.1+ expects: name, cast_type, default, sql_type_metadata, null
+    # Earlier versions expect: name, default, sql_type_metadata, null
+    if ::ActiveRecord.version >= Gem::Version.new('8.1.a')
+      cast_type = ActiveRecord::ConnectionAdapters::AbstractAdapter::TYPE_MAP.lookup(col_def.type.to_s)
+      sql_type_meta = sql_type_definition(col_def)
+
+      [
+        col_def.name.to_s,
+        cast_type,
+        col_def.default.present? ? col_def.default.to_s : nil,
+        sql_type_meta,
+        col_def.null.nil? || col_def.null
+      ]
+    else
+      sql_type_meta = sql_type_definition(col_def)
+
+      [
+        col_def.name.to_s,
+        col_def.default.present? ? col_def.default.to_s : nil,
+        sql_type_meta,
+        col_def.null.nil? || col_def.null
+      ]
+    end
   end
 
   def sql_type_definition(col_def)

data/lib/active_record/connection_adapters/nulldb_adapter/table_definition.rb

@@ -14,8 +14,9 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter
     alias_method :hstore, :json
 
     def unique_constraint(*args, **kwargs, &block); end
+    def exclusion_constraint(*args); end
 
-    if ::ActiveRecord::VERSION::MAJOR >= 7 && ::ActiveRecord::VERSION::MINOR >= 1
+    if ::ActiveRecord.version >= Gem::Version.new('7.1.a')
       # Avoid check for option validity
       def create_column_definition(name, type, options)
         ActiveRecord::ConnectionAdapters::ColumnDefinition.new(name, type, options)

data/lib/nulldb/version.rb

@@ -1,3 +1,3 @@
 module NullDB
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

data/spec/nulldb_spec.rb

@@ -124,8 +124,17 @@ describe "NullDB" do
     expect(Employee.columns_hash['name'].null).to be false
   end
 
-  it "should stringify default values" do
-    expect(Employee.columns_hash['active'].default).to eq "true"
+  # In ActiveRecord 8.1+, immutable default values are type-casted by the Column class
+  # For boolean columns for example, "true" is deserialized to true
+  # https://github.com/rails/rails/commit/205cdd5
+  if ::ActiveRecord.version >= Gem::Version.new('8.1.a')
+    it "should deserialize immutable default values" do
+      expect(Employee.columns_hash['active'].default).to eq true
+    end
+  else
+    it "should stringify default values" do
+      expect(Employee.columns_hash['active'].default).to eq "true"
+    end
   end
 
   it "should have no default for employee_number" do
@@ -194,9 +203,9 @@ describe "NullDB" do
     expect( Employee.connection.tables ).to include "schema_info"
   end
 
-  it "should return an empty array from #select" do
+  it "should return an empty result from #select" do
     result = Employee.connection.select_all("who cares", "blah")
-    expect( result ).to eq []
+    expect( result.to_a ).to eq []
   end
 
   it "should provide a way to set log checkpoints" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Avdi Grimm
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-14 00:00:00.000000000 Z
+date: 2025-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.1'
+        version: '8.2'
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement
@@ -149,12 +149,12 @@ files:
 - README.md
 - Rakefile
 - activerecord-nulldb-adapter.gemspec
-- gemfiles/activerecord_6.0.gemfile
 - gemfiles/activerecord_6.1.gemfile
 - gemfiles/activerecord_7.0.gemfile
 - gemfiles/activerecord_7.1.gemfile
 - gemfiles/activerecord_7.2.gemfile
 - gemfiles/activerecord_8.0.gemfile
+- gemfiles/activerecord_8.1.gemfile
 - gemfiles/activerecord_master.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
 - lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: The Null Object pattern as applied to ActiveRecord database adapters