activerecord-nulldb-adapter 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7850d9dc9902b347863dd9a2709e81570029aa6ed7a205249c3c85ddc352c2f9
-  data.tar.gz: dd61adf8796a726d042b020937ef34d2389774e079ce6fb21ef48d01aec099c3
+  metadata.gz: af43f27ebeb1eb1c313923392e50c59a234c1942355422e614fb3026ecb3bb13
+  data.tar.gz: 2c60b7ed36c6da832eaf7f0dcfd3e31c555a9735283903fed26e80f168a7905c
 SHA512:
-  metadata.gz: d080b5426ccbd9094e4b3a72294050be0afe8660d8e6d34fba29c231aca24afa317c7920592e12db9b852f68d88c155c87dd639022ec490348b0c528a18bab39
-  data.tar.gz: fddb22b3e21e86e26c91d7545a3c619fc0693b62ffdab790278eb5458aedaa58ed9c914af3a5660cbf4cf8fc43cfbb7883969320f1e133e4d1a2bd5e830bf16c
+  metadata.gz: 8b09032c9f0421c412fab061201d1381a4fd3b265b5c8a00d5ced214201aade646ed7a9d8ae207c3c015aeb30cf7ddf5d21f429864262cb7a791f7a1c0ad8fb9
+  data.tar.gz: 8792abf6acf27101e8fc0e1c3a2806a16e629d5cc14fd660a12833d1afff4aed679030948799646dd321746117f5f6282100f8ffa391b598f6f310f08466a93c

data/.github/workflows/ruby.yml

@@ -7,47 +7,59 @@ jobs:
       matrix:
         gemfile:
           [
-            activerecord_5.2,
-            activerecord_6.0,
             activerecord_6.1,
             activerecord_7.0,
             activerecord_7.1,
+            activerecord_7.2,
+            activerecord_8.0,
             activerecord_master,
           ]
-        ruby: ["2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "jruby-9.3.1.0"]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "jruby-9.3.1.0"]
         exclude:
-          - ruby: "3.0"
-            gemfile: activerecord_5.2
+          - ruby: "jruby-9.3.1.0"
+            gemfile: "activerecord_7.0"
 
-          - ruby: "3.1"
-            gemfile: activerecord_5.2
+          - ruby: "jruby-9.3.1.0"
+            gemfile: "activerecord_7.1"
 
-          - ruby: "3.2"
-            gemfile: activerecord_5.2
+          - ruby: "2.7"
+            gemfile: "activerecord_7.2"
 
-          - ruby: "2.5"
-            gemfile: "activerecord_master"
+          - ruby: "2.8"
+            gemfile: "activerecord_7.2"
 
-          - ruby: "2.6"
-            gemfile: "activerecord_master"
+          - ruby: "3.0"
+            gemfile: "activerecord_7.2"
 
-          - ruby: "2.5"
-            gemfile: "activerecord_7.0"
+          - ruby: "jruby-9.3.1.0"
+            gemfile: "activerecord_7.2"
 
-          - ruby: "2.6"
-            gemfile: "activerecord_7.0"
+          - ruby: "2.7"
+            gemfile: "activerecord_8.0"
 
-          - ruby: "2.5"
-            gemfile: "activerecord_7.1"
+          - ruby: "2.8"
+            gemfile: "activerecord_8.0"
 
-          - ruby: "2.6"
-            gemfile: "activerecord_7.1"
+          - ruby: "3.0"
+            gemfile: "activerecord_8.0"
 
-          - ruby: "jruby-9.3.1.0"
-            gemfile: "activerecord_7.0"
+          - ruby: "3.1"
+            gemfile: "activerecord_8.0"
 
           - ruby: "jruby-9.3.1.0"
-            gemfile: "activerecord_7.1"
+            gemfile: "activerecord_8.0"
+
+          - ruby: "2.7"
+            gemfile: "activerecord_master"
+
+          - ruby: "2.8"
+            gemfile: "activerecord_master"
+
+          - ruby: "3.0"
+            gemfile: "activerecord_master"
+
+          - ruby: "3.1"
+            gemfile: "activerecord_master"
 
           - ruby: "jruby-9.3.1.0"
             gemfile: "activerecord_master"
@@ -56,7 +68,7 @@ jobs:
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/Appraisals

@@ -10,6 +10,18 @@ appraise "activerecord-7.0" do
   gem "activerecord", "~> 7.0.0"
 end
 
+appraise "activerecord-7.1" do
+  gem "activerecord", "~> 7.1.0"
+end
+
+appraise "activerecord-7.2" do
+  gem "activerecord", "~> 7.2.0"
+end
+
+appraise "activerecord-8.0" do
+  gem "activerecord", github: 'rails/rails', branch: "8-0-stable"
+end
+
 appraise "activerecord-master" do
   gem "activerecord", github: 'rails/rails', branch: :main
 end

data/CHANGES.md

@@ -1,6 +1,17 @@
 Unreleased
 ----------
 
+1.1.1 (20214-11-14)
+
+- Fix syntax error on 2.7 and 3.0.
+
+1.1.0 (2024-11-14)
+-----------
+
+- Add support to Rails 8 #136
+- *Breaking* Drop support to Ruby 2.5, 2.6
+- *Breaking* Drop support to Rails 6.0 (keep 6.1)
+
 1.0.1 (2023-10-16)
 -----------
 

data/Gemfile

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

data/README.md

@@ -17,42 +17,50 @@ including `after_save` hooks - without ever touching a real database.
 ## Compatibility
 
 ### Ruby
-Currently supported Ruby versions: MRI 2.5.x, 2.6.x, 2.7.x, 3.X.
+Currently supported Ruby versions: `2.7.X`, `3.X`.
 
 Experimental support provided for: JRuby
 
 ### ActiveRecord
-Any version of ActiveRecord >= 5.2
-
-It is tested against AR 5.2, 6.0, 6.1 and master branch.
+Any version of ActiveRecord `>= 6.1`
 
 ## Installation
 
-    gem install activerecord-nulldb-adapter
+```bash
+gem install activerecord-nulldb-adapter
+```
 
 ## How
 
 Once installed, NullDB can be used much like any other ActiveRecord database
 adapter:
 
-    ActiveRecord::Base.establish_connection :adapter => :nulldb
+```ruby
+ActiveRecord::Base.establish_connection :adapter => :nulldb
+```
 
 NullDB needs to know where you keep your schema file in order to reflect table
 metadata.  By default it looks in RAILS_ROOT/db/schema.rb.  You can override
 that by setting the `schema` option:
 
-    ActiveRecord::Base.establish_connection :adapter => :nulldb,
-                                            :schema  => 'foo/myschema.rb'
+```ruby
+ActiveRecord::Base.establish_connection :adapter => :nulldb,
+                                        :schema  => 'foo/myschema.rb'
+```
 
 NullDB comes with RSpec integration.  To replace the database with NullDB in
 all of your specs, put the following in your spec/rails_helper:
 
-    require 'nulldb_rspec'
-    include NullDB::RSpec::NullifiedDatabase
+```ruby
+require 'nulldb_rspec'
+include NullDB::RSpec::NullifiedDatabase
+```
 
 after you load your rails environment
 
-    require File.expand_path('../config/environment', __dir__)
+```ruby
+require File.expand_path('../config/environment', __dir__)
+```
 
 otherwise you will encounter issues such as
 ([bug)](https://github.com/nulldb/nulldb/pull/90#issuecomment-496690958).
@@ -60,17 +68,19 @@ otherwise you will encounter issues such as
 Or if you just want to use NullDB in a specific spec context, you can include
 the same module inside a context:
 
-    require 'nulldb_rspec'
+```ruby
+require 'nulldb_rspec'
 
-    describe Employee, "with access to the database" do
-      fixtures :employees
-      # ...
-    end
+describe Employee, "with access to the database" do
+  fixtures :employees
+  # ...
+end
 
-    describe Employee, "with NullDB" do
-      include NullDB::RSpec::NullifiedDatabase
-      # ...
-    end
+describe Employee, "with NullDB" do
+  include NullDB::RSpec::NullifiedDatabase
+  # ...
+end
+```
 
 If you want to have NullDB enabled by default but disabled for particular
 contexts then (see this
@@ -80,29 +90,35 @@ contexts then (see this
 NullDB::Rspec provides some custom matcher support for verifying expectations
 about interactions with the database:
 
-    describe Employee do
-      include NullDB::RSpec::NullifiedDatabase
+```ruby
+describe Employee do
+  include NullDB::RSpec::NullifiedDatabase
 
-      it "should cause an insert statement to be executed" do
-        Employee.create!
-        Employee.connection.should have_executed(:insert)
-      end
-    end
+  it "should cause an insert statement to be executed" do
+    Employee.create!
+    Employee.connection.should have_executed(:insert)
+  end
+end
+```
 
 UnitRecord-style verification that no database calls have been made at all can
 be achieved by using the special `:anything` symbol:
 
-    describe "stuff that shouldn't touch the database" do
-      after :each do
-        Employee.connection.should_not have_executed(:anything)
-      end
-      # ...
-    end
+```ruby
+describe "stuff that shouldn't touch the database" do
+  after :each do
+    Employee.connection.should_not have_executed(:anything)
+  end
+  # ...
+end
+```
 
 You can also experiment with putting NullDB in your database.yml:
 
-    unit_test:
-      adapter: nulldb
+```yaml
+unit_test:
+  adapter: nulldb
+```
 
 However, due to the way Rails hard-codes specific database adapters into its
 standard Rake tasks, you may find that this generates unexpected and

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', '>= 5.2.0', '< 7.2'
+  s.add_runtime_dependency 'activerecord', '>= 6.0', '< 8.1'
   s.add_development_dependency 'spec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'

data/gemfiles/{activerecord_5.2.gemfile → activerecord_7.2.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.2.0"
+gem "activerecord", "~> 7.2.0"
 
 group :development, :test do
   gem "spec"

data/gemfiles/activerecord_8.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", github: "rails/rails", branch: "8-0-stable"
+
+group :development, :test do
+  gem "spec"
+  gem "rspec", ">= 1.2.9"
+  gem "rake"
+  gem "rdoc"
+end
+
+group :development do
+  gem "appraisal"
+  gem "simplecov", require: false
+end

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

@@ -197,7 +197,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
   def delete(statement, name=nil, binds = [])
     with_entry_point(:delete) do
-      super(statement, name).size
+      super(statement, name)
     end
   end
 
@@ -268,9 +268,39 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
     end
   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
+  end
+
+  def affected_rows(raw_result)
+    0
+  end
+
+  def valid_column_definition_options
+    super + [:array, :using, :cast_as, :as, :type, :enum_type, :stored, :srid]
+  end
+
+  READ_QUERY = ActiveRecord::ConnectionAdapters::AbstractAdapter.build_read_query_regexp(
+    :close, :declare, :fetch, :move, :set, :show
+  ) # :nodoc:
+  private_constant :READ_QUERY
+
+  def write_query?(sql) # :nodoc:
+    !READ_QUERY.match?(sql)
+  rescue ArgumentError # Invalid encoding
+    !READ_QUERY.match?(sql.b)
+  end
+
+  def reconnect
+    true
+  end
+  ### Rails 8.0+ ###
+
   protected
 
-  def select(statement, name = nil, binds = [], prepare: nil, async: nil)
+  def select(statement, name = nil, binds = [], prepare: nil, async: nil, allow_retry: nil)
     EmptyResult.new.tap do |r|
       r.bind_column_meta(columns_for(name))
       self.execution_log << Statement.new(entry_point, statement)
@@ -319,7 +349,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::Connection
 
   def new_table_definition(adapter = nil, table_name = nil, is_temporary = nil, options = {})
     case ::ActiveRecord::VERSION::MAJOR
-    when 6, 7
+    when 6, 7, 8
       TableDefinition.new(self, table_name, temporary: is_temporary, options: options.except(:id))
     when 5
       TableDefinition.new(table_name, is_temporary, options.except(:id), nil)

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

@@ -13,7 +13,9 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter
     alias_method :jsonb, :json if method_defined? :json
     alias_method :hstore, :json
 
-    if ::ActiveRecord::VERSION::MAJOR == 7 && ::ActiveRecord::VERSION::MINOR >= 1
+    def unique_constraint(*args, **kwargs, &block); end
+
+    if ::ActiveRecord::VERSION::MAJOR >= 7 && ::ActiveRecord::VERSION::MINOR >= 1
       # Avoid check for option validity
       def create_column_definition(name, type, options)
         ActiveRecord::ConnectionAdapters::ColumnDefinition.new(name, type, options)

data/lib/active_record/connection_adapters/nulldb_adapter.rb

@@ -9,6 +9,8 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'nulldb/core'
 require 'nulldb/extensions'
 
+require 'active_record/connection_adapters/quoting'
+
 require 'active_record/connection_adapters/nulldb_adapter/core'
 require 'active_record/connection_adapters/nulldb_adapter/statement'
 require 'active_record/connection_adapters/nulldb_adapter/checkpoint'
@@ -20,3 +22,12 @@ require 'active_record/connection_adapters/nulldb_adapter/null_object'
 require 'active_record/connection_adapters/nulldb_adapter/table_definition'
 
 require 'active_record/tasks/nulldb_database_tasks' if defined?(ActiveRecord::Tasks)
+
+module ActiveRecord
+  module ConnectionAdapters
+    if ActiveRecord::VERSION::STRING >= '7.2'
+      register 'nulldb', 'ActiveRecord::ConnectionAdapters::NullDBAdapter', 'active_record/connection_adapters/nulldb_adapter'
+    end
+  end
+end
+

data/lib/active_record/connection_adapters/quoting.rb

@@ -0,0 +1,13 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Quoting
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def quote_column_name(column_name)
+          "'#{column_name}'"
+        end
+      end
+    end
+  end
+end

data/lib/nulldb/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Avdi Grimm
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2024-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,20 +18,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: spec
   requirement: !ruby/object:Gem::Requirement
@@ -149,11 +149,12 @@ files:
 - README.md
 - Rakefile
 - activerecord-nulldb-adapter.gemspec
-- gemfiles/activerecord_5.2.gemfile
 - 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_master.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
 - lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb
@@ -165,6 +166,7 @@ files:
 - lib/active_record/connection_adapters/nulldb_adapter/null_object.rb
 - lib/active_record/connection_adapters/nulldb_adapter/statement.rb
 - lib/active_record/connection_adapters/nulldb_adapter/table_definition.rb
+- lib/active_record/connection_adapters/quoting.rb
 - lib/active_record/tasks/nulldb_database_tasks.rb
 - lib/activerecord-nulldb-adapter.rb
 - lib/nulldb.rb