elasticsearch_record 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df21aa38516f4e56830e16ffcff4164b65541a869e3964771771eacdf4e8ad16
-  data.tar.gz: 7ba579e28c1a85e7f890654c99c675eb60dd2fddf1b1eb877b0967e17f1d7097
+  metadata.gz: b3d4d1dd73be19114191e80cba0ec2844ab3049e380998f8ba48fed78f5c5837
+  data.tar.gz: 252d5abb68af3199c73850337aac6d6ce2c6e379a9fd5f2bea1656447da29995
 SHA512:
-  metadata.gz: cb521dc265ec3a517ebda7b8b6e60b5471b1411bd8f04d6be72098e95177e32af06267bc9a2e2881699d0f7f317c3bf1ef77b6613d9657df6ac7347affa80cf9
-  data.tar.gz: 981b0955f21d2260d794cc1946ed560fa70d0e429b5c0bc97d2c9c5b29b396af471cd8d6460929fa451913ad44f7d9992c9b8c0d8a6cd6a7035c338147161138
+  metadata.gz: 635066f96fb6713a4719ac6fc2a4338dd967b7ca990c9d2c1e644ca05a749be4932f9a07277a42da5340530f0291d7a2bd06edcfdaf89cdcda844339ede6b4fa
+  data.tar.gz: 324d987c404a4dd0069d48c30866c6b854719eec91e3051321396ecf457b160dd16dfc29d47427c4e4a7193fc5d82e721f89013ae692ca9cc4642bb005503cb8

data/README.md

@@ -16,7 +16,7 @@ _ElasticsearchRecord is a ActiveRecord adapter and provides similar functionalit
 
 **PLEASE NOTE:**
 
-- This is the `main`-branch, which supports rails **7.2** _(see section 'Rails_Versions' for supported versions)_
+- This is the `main`-branch, which supports rails **8.0** _(see section 'Rails_Versions' for supported versions)_
 - supports ActiveRecord ~> 7.2 + Elasticsearch >= 7.17
 - added features up to Elasticsearch `8.17.1` _(tested against `8.19.14`)_
 - _ES|QL_ queries _(`TYPE_ESQL` / the `esql.query` gate)_ require **Elasticsearch >= 8.11**, where the feature became
@@ -28,15 +28,23 @@ _ElasticsearchRecord is a ActiveRecord adapter and provides similar functionalit
 
 Supported rails versions:
 
+### Rails 8.0:
+_(since gem version 4.0)_
+
+https://github.com/ruby-smart/elasticsearch_record/tree/rails-8-0-stable
+
+[![rails-7-1-stable](https://img.shields.io/badge/rails-8.0.stable-orange.svg)](https://github.com/ruby-smart/elasticsearch_record/tree/rails-8-0-stable)
+
+
 ### Rails 7.2:
-_(since gem version 2.1)_
+_(since gem version 3.0)_
 
 https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-2-stable
 
 [![rails-7-1-stable](https://img.shields.io/badge/rails-7.2.stable-orange.svg)](https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-2-stable)
 
 ### Rails 7.1:
-_(since gem version 1.8)_
+_(since gem version 2.0)_
 
 https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-1-stable
 

data/docs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [4.0.0] - 2026-09-08
+* [add] **BREAKING**: requires `activerecord ~> 8.0.0`
+* [add] `ElasticsearchRecord::Result#indexed_rows` - rails 8.0 instantiates records through this method instead of iterating the result set itself.
+* [ref] `ElasticsearchAdapter#log` resolves the instrumenter through `#instrumenter` instead of the former `@instrumenter` ivar
+* [ref] `ActiveRecord::ConnectionAdapters::Elasticsearch::SchemaDumper` remove redundant blank lines
+
 ## [3.0.0] - 2026-09-08
 * [add] **BREAKING**: requires `activerecord ~> 7.2.0`
 * [add] `Quoting::ClassMethods#quote_column_name` & `#quote_table_name` - identifier quoting is class-level & mandatory now

data/elasticsearch_record.gemspec

@@ -32,7 +32,7 @@ DESC
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '~> 7.2.0'
+  spec.add_dependency 'activerecord', '~> 8.0.0'
   spec.add_dependency 'elasticsearch', '>= 7.17'
 
   spec.add_development_dependency 'coveralls_reborn', '~> 0.25'

data/lib/active_record/connection_adapters/elasticsearch/schema_dumper.rb

@@ -151,14 +151,12 @@ module ActiveRecord
             end
 
             tbl.puts "  end"
-            tbl.puts
 
             tbl.rewind
             stream.print tbl.read
           rescue => e
             stream.puts "# Could not dump table #{table.inspect} because of following #{e.class}"
             stream.puts "#   #{e.message}"
-            stream.puts
           ensure
             self.table_name = nil
           end

data/lib/active_record/connection_adapters/elasticsearch_adapter.rb

@@ -384,7 +384,9 @@ module ActiveRecord # :nodoc:
       # @raise [Exception] any exception encountered during execution, after translation.
       # @return [void]
       def log(gate, arguments, name = 'QUERY', async: false, statistics: nil, &block)
-        @instrumenter.instrument(
+        # +instrumenter+ instead of the former +@instrumenter+ ivar - the abstract adapter
+        # resolves it per execution context now
+        instrumenter.instrument(
           "query.elasticsearch_record",
           gate: gate,
           name: name,

data/lib/elasticsearch_record/gem_version.rb

@@ -7,7 +7,7 @@ module ElasticsearchRecord
   end
 
   module VERSION
-    MAJOR = 3
+    MAJOR = 4
     MINOR = 0
     TINY  = 0
     PRE   = nil

data/lib/elasticsearch_record/result.rb

@@ -172,6 +172,16 @@ module ElasticsearchRecord
       n ? computed_results.last(n) : computed_results.last
     end
 
+    # Returns the rows to instantiate records from - ActiveRecord resolves them through this
+    # method instead of iterating the result set itself.
+    # Each element is a Hash keyed by column / metadata name and therefore already provides the
+    # read surface of +ActiveRecord::Result::IndexedRow+ (+key?+, +[]+, +fetch+, +keys+, ...).
+    # used by +ActiveRecord+
+    # @return [Array<Hash>]
+    def indexed_rows # :nodoc:
+      computed_results
+    end
+
     # used by ActiveRecord
     def cancel # :nodoc:
       self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_record
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tobias Gonsior
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement