elasticsearch_record 1.5.3 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 238cf0f5e82cb385fc6d0f4e7f0416192f1cf65134b9726de16149be5fe6dc6b
-  data.tar.gz: 002b7d91869f2c0a9f03729c9c2c0db3719abfa9d523925cfeaf5bacf101e563
+  metadata.gz: 92676fe7f2327036588c1d2e3cb6756cabbc2365ee8984196f1ef1c4a23d8448
+  data.tar.gz: 8c1f329957f4a1909181dde9e9c781a86a41188ee7337a73614eb8d893cae482
 SHA512:
-  metadata.gz: b58fc1dbdd310c1e5c8c47bb54398a4300042c063afd6a49543a5c6b2a270f2ffe7fb168b357ff1da5cb738ab602550bbf8a1297d4464089c5c0d8809a4e3a8c
-  data.tar.gz: 10be3f8fa2ea798bf58f2187ee7ea23099545ddad32036642e3b16d5e48cde7ccbabaff2bc68bc0baa2c71c41409de14abebedd11d6b0bcbe026c0e8200f0db2
+  metadata.gz: 9cb4514641f1f26d922f5cb941a677c5cff568641ddcf7243a914481707a982440b6a8967e74734d7900c00c6441128ef69c29a5c3774455df018206932e1b85
+  data.tar.gz: 004b62c74a4b4878c2e0a982a91217beee695a8e58d4509bba4cbd8f7664fdd0a4658cfd8533e1ff5a409f5fee6bce613d46f398ac067ed474324d65ad43406c

data/.yardopts

@@ -1,6 +1,6 @@
 --embed-mixins
 --markup=markdown
---files docs/*.*
+--files docs/*
 --plugin relative_markdown_links
 --plugin activesupport-concern
 --exclude lib/elasticsearch_record/patches

data/README.md

@@ -4,7 +4,7 @@
 [![Documentation](https://img.shields.io/badge/docs-rdoc.info-blue.svg)](http://rubydoc.info/gems/elasticsearch_record)
 
 [![Gem Version](https://badge.fury.io/rb/elasticsearch_record.svg)](https://badge.fury.io/rb/elasticsearch_record)
-[![License](https://img.shields.io/github/license/ruby-smart/elasticsearch_record)](docs/LICENSE.txt)
+[![License](https://img.shields.io/github/license/ruby-smart/elasticsearch_record)](docs/LICENSE)
 
 ActiveRecord adapter for Elasticsearch
 
@@ -14,8 +14,28 @@ _ElasticsearchRecord is a ActiveRecord adapter and provides similar functionalit
 
 **PLEASE NOTE:**
 
-- Specs & documentation are still missing, but will follow.
-- Currently supports ActiveRecord ~> 7.0 + Elasticsearch >= 7.17
+- This is the `rails-7-0-stable`-branch, which only supports rails **7.0** _(see section 'Rails_Versions' for supported versions)_
+- supports ActiveRecord ~> 7.0 + Elasticsearch >= 7.17
+
+-----
+
+## Rails versions
+
+Supported rails versions:
+
+### Rails 7.1:
+_(since gem version 1.8)_
+
+https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-1-stable
+
+[![rails-7-1-stable](https://img.shields.io/badge/rails-7.1.stable-orange.svg)](https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-1-stable)
+
+### Rails 7.0:
+_(until gem version 1.7)_
+
+https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-0-stable
+
+[![rails-7-0-stable](https://img.shields.io/badge/rails-7.0.stable-orange.svg)](https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-0-stable)
 
 -----
 
@@ -24,7 +44,11 @@ _ElasticsearchRecord is a ActiveRecord adapter and provides similar functionalit
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'elasticsearch_record'
+gem 'elasticsearch_record', '~> 1.7'
+
+# alternative
+gem 'elasticsearch_record', git: 'https://github.com/ruby-smart/elasticsearch_record', branch: 'rails-7-0-stable'
+
 ```
 
 And then execute:
@@ -53,6 +77,22 @@ Or install it yourself as:
   * logs Elasticsearch API-calls
   * shows Runtime in logs
 
+## Notice
+Since ActiveRecord does not have any configuration option to support transactions and 
+Elasticsearch does **NOT** support transactions, it may be risky to ignore them.
+
+As a default, transactions are 'silently swallowed' to not break any existing applications...
+
+To raise an exception while using transactions on a ElasticsearchRecord model, the following flag can be enabled.
+However enabling this flag will surely fail transactional tests _(prevent this with 'use_transactional_tests=false')_
+
+```ruby
+# config/initializers/elasticsearch_record.yml
+
+# enable transactional exceptions
+ElasticsearchRecord.error_on_transaction = true
+```
+
 ## Setup
 
 ### a) Update your **database.yml** and add a elasticsearch connection:
@@ -219,11 +259,25 @@ total = scope.total
 # > 3335
 ```
 
+### Available core query methods
+
+- find_by_sql
+- find_by_query
+- find_by_esql
+- esql
+- msearch
+- search
+
+_see simple documentation about these methods @ {ElasticsearchRecord::Querying rubydoc}_
+
+_(also see @ [github](https://github.com/ruby-smart/elasticsearch_record/blob/main/lib/elasticsearch_record/querying.rb) )_
+
 ### Available query/relation chain methods
 - kind 
 - configure
 - aggregate
 - refresh
+- timeout
 - query
 - filter
 - must_not
@@ -235,7 +289,9 @@ total = scope.total
 - aggs_only!
 - total_only!
 
-_see simple documentation about these methods @ [rubydoc](https://rubydoc.info/gems/elasticsearch_record/ElasticsearchRecord/Relation/QueryMethods)_
+_see simple documentation about these methods @ {ElasticsearchRecord::Relation::QueryMethods rubydoc}_
+
+_(also see @ [github](https://github.com/ruby-smart/elasticsearch_record/blob/main/lib/elasticsearch_record/relation/query_methods.rb) )_
 
 ### Available calculation methods
 - percentiles
@@ -245,9 +301,16 @@ _see simple documentation about these methods @ [rubydoc](https://rubydoc.info/g
 - minimum
 - maximum
 - sum
+- boxplot
+- stats
+- string_stats
+- matrix_stats
+- median_absolute_deviation
 - calculate
 
-_see simple documentation about these methods @ [rubydoc](https://rubydoc.info/gems/elasticsearch_record/ElasticsearchRecord/Relation/CalculationMethods)_
+_see simple documentation about these methods @ {ElasticsearchRecord::Relation::CalculationMethods rubydoc}_
+
+_(also see @ [github](https://github.com/ruby-smart/elasticsearch_record/blob/main/lib/elasticsearch_record/relation/calculation_methods.rb) )_
 
 ### Available result methods
 - aggregations
@@ -260,8 +323,11 @@ _see simple documentation about these methods @ [rubydoc](https://rubydoc.info/g
 - composite
 - point_in_time
 - pit_results
+- pit_delete
 
-_see simple documentation about these methods @ [rubydoc](https://rubydoc.info/gems/elasticsearch_record/ElasticsearchRecord/Relation/ResultMethods)_
+_see simple documentation about these methods @ {ElasticsearchRecord::Relation::ResultMethods rubydoc}_
+
+_(also see @ [github](https://github.com/ruby-smart/elasticsearch_record/blob/main/lib/elasticsearch_record/relation/result_methods.rb) )_
 
 ### Additional methods 
 - to_query
@@ -366,13 +432,26 @@ SearchUser.api.mappings
 SearchUser.api.insert([{name: 'Hans', age: 34}, {name: 'Peter', age: 22}])
 ```
 
+### dangerous methods
 * open!
 * close!
 * refresh!
 * block!
 * unblock!
+
+### dangerous methods with args
+* create!(...)
+* clone!(...)
+* rename!(...)
+* backup!(...)
+* restore!(...)
+* reindex!(...)
+
+### dangerous methods with confirm parameter
 * drop!(confirm: true)
 * truncate!(confirm: true)
+
+### table methods
 * mappings
 * metas
 * settings
@@ -380,17 +459,19 @@ SearchUser.api.insert([{name: 'Hans', age: 34}, {name: 'Peter', age: 22}])
 * state
 * schema
 * exists?
-* alias_exists?
-* setting_exists?
-* mapping_exists?
-* meta_exists?
-
-Fast insert, update, delete raw data
-* index
-* insert
-* update
-* delete
-* bulk
+
+### plain methods
+* alias_exists?(...)
+* setting_exists?(...)
+* mapping_exists?(...)
+* meta_exists?(...)
+
+### Fast insert, update, delete raw data
+* index(...)
+* insert(...)
+* update(...)
+* delete(...)
+* bulk(...)
 
 -----
 
@@ -436,6 +517,9 @@ Access these methods through the model's connection or within any `Migration`.
 - create_table
 - change_table
 - rename_table
+- reindex_table
+- backup_table
+- restore_table
 
 ### table actions:
 - change_meta
@@ -584,7 +668,7 @@ This project is intended to be a safe, welcoming space for collaboration, and co
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
-A copy of the [LICENSE](docs/LICENSE.txt) can be found @ the docs.
+A copy of the [LICENSE](docs/LICENSE) can be found @ the docs.
 
 ## Code of Conduct
 

data/docs/CHANGELOG.md

@@ -1,5 +1,37 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [1.7.0] - 2024-01-09
+* [add] `ElasticsearchRecord::Relation#boxplot` calculation method
+* [add] `ElasticsearchRecord::Relation#stats` calculation method
+* [add] `ElasticsearchRecord::Relation#string_stats` calculation method
+* [add] `ElasticsearchRecord::Relation#matrix_stats` calculation method
+* [add] `ElasticsearchRecord::Relation#median_absolute_deviation` calculation method
+* [add] `ElasticsearchRecord::Base#esql` + `ElasticsearchRecord::Base#find_by_esql` to support `ES|QL` queries
+* [add] new repository branch `rails-7-0-stable` to support different rails versions
+* [ref] minor code optimizations & documentation changes
+
+## [1.6.0] - 2023-08-11
+* [add] `ElasticsearchRecord::Base#undelegate_id_attribute_with` method to support a temporary 'undelegation' (used to create a new record)
+* [add] `ElasticsearchRecord::Relation#timeout` to directly provide the timeout-parameter to the query
+* [add] `ElasticsearchRecord.error_on_transaction`-flag to throw transactional errors (default: `false`) - this will now **IGNORE** all transactions
+* [add] `ElasticsearchRecord::ModelApi` create!, clone!, rename!, backup!, restore! & reindex!-methods
+* [add] `ElasticsearchRecord::Relation#pit_delete` which executes a delete query in a 'point_in_time' scope.
+* [add] `ActiveRecord::ConnectionAdapters::Elasticsearch::TableStatements#backup_table` to create a backup (snapshot) of the entire table (index)
+* [add] `ActiveRecord::ConnectionAdapters::Elasticsearch::TableStatements#restore_table` to restore a entire table (index)
+* [add] `ActiveRecord::ConnectionAdapters::Elasticsearch::TableStatements#reindex_table` to copy documents from source to destination
+* [ref] `ElasticsearchRecord::Base.delegate_id_attribute` now supports instance writer
+* [ref] `ElasticsearchRecord::Relation#pit_results` adds `ids_only`-parameter to now support a simple return of the records-ids...
+* [fix] Relation `#last`-method will raise an transport exception if cluster setting '**indices.id_field_data.enabled**' is disabled (now checks for `access_id_fielddata?`)
+* [fix] ElasticsearchRecord-connection settings does not support `username` key
+* [fix] ElasticsearchRecord-connection settings does not support `port` key
+* [fix] `_id`-Attribute is erroneously defined as 'virtual' attribute - but is required for insert statements.
+* [fix] unsupported **SAVEPOINT** transactions throws exceptions _(especially in tests)_
+* [fix] `ElasticsearchRecord::ModelApi#bulk` does not recognize `'_id' / :_id` attribute
+* [fix] `ElasticsearchRecord::ModelApi#bulk` does not correctly build the data-hash for `update`-operation _(missing 'doc'-node)_
+* [ref] simplify `ElasticsearchRecord::Base#searchable_column_names`
+* [fix] creating a new record does not recognize a manually provided `_id`-attribute
+* [fix] creating a new record with active `delegate_id_attribute`-flag does not update the records `_id`.
+
 ## [1.5.3] - 2023-07-14
 * [fix] `ElasticsearchRecord::Relation#where!` on nested, provided `:none` key
 * [ref] minor code tweaks and comment updates
@@ -13,10 +45,10 @@
 
 ## [1.5.0] - 2023-07-10
 * [add] additional `ElasticsearchRecord::ModelApi` methods **drop!** & **truncate!**, which have to be called with a `confirm:true` parameter
-* [add] `.ElasticsearchRecord::Base.delegate_query_nil_limit` to automatically delegate a relations `limit(nil)`-call to the **max_result_window** _(set to 10.000 as default)_
+* [add] `ElasticsearchRecord::Base.delegate_query_nil_limit` to automatically delegate a relations `limit(nil)`-call to the **max_result_window** _(set to 10.000 as default)_
 * [add] `ActiveRecord::ConnectionAdapters::Elasticsearch::SchemaStatements#access_shard_doc?` which checks, if the **PIT**-shard_doc order is available
 * [add] support for **_shard_doc** as a default order for `ElasticsearchRecord::Relation#pit_results`
-* [ref] `.ElasticsearchRecord::Base.relay_id_attribute` to a more coherent name: `delegate_id_attribute` 
+* [ref] `ElasticsearchRecord::Base.relay_id_attribute` to a more coherent name: `delegate_id_attribute` 
 * [ref] `ElasticsearchRecord::Relation#ordered_relation` to optimize already ordered relations
 * [ref] gemspecs to support different versions of Elasticsearch
 * [ref] improved README

data/docs/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2022 Ruby Smart
+Copyright (c) 2024 Ruby Smart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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

@@ -116,7 +116,7 @@ module ActiveRecord
           #   Defaults to false.
           # @param [String] table_name
           # @param [Boolean] if_exists
-          # @return [Array] acknowledged status
+          # @return [Boolean] acknowledged status
           def drop_table(table_name, if_exists: false, **)
             schema_cache.clear_data_source_cache!(table_name)
             api(:indices, :delete, { index: table_name, ignore: (if_exists ? 404 : nil) }, 'DROP TABLE').dig('acknowledged')
@@ -148,11 +148,12 @@ module ActiveRecord
             end
           end
 
-          # clones an entire table (index) to the provided +target_name+.
+          # clones an entire table (index) with its docs to the provided +target_name+.
           # During cloning, the table will be automatically 'write'-blocked.
           # @param [String] table_name
           # @param [String] target_name
           # @param [Hash] options
+          # @return [Boolean] acknowledged status
           def clone_table(table_name, target_name, **options)
             # create new definition
             definition = clone_table_definition(table_name, target_name, **extract_table_options!(options))
@@ -168,6 +169,54 @@ module ActiveRecord
             definition.exec!
           end
 
+          # creates a backup (snapshot) of the entire table (index) from provided +table_name+.
+          # The backup will be closed, to prevent read/write access.
+          # The +target_name+ will be auto-generated, if not provided.
+          #
+          # @example
+          #   backup_table('screenshots', to: 'screenshots-backup-v1')
+          #
+          # @param [String] table_name
+          # @param [String] to - target_name
+          # @param [Boolean] close - closes backup after creation (default: true)
+          # @return [String] backup_name
+          def backup_table(table_name, to: nil, close: true)
+            to ||= "#{table_name}-snapshot-#{Time.now.strftime('%s%3N')}"
+            raise ArgumentError, "unable to backup '#{table_name}' to already existing target '#{to}'!" if table_exists?(to)
+
+            clone_table(table_name, to)
+            close_table(to) if close
+
+            to
+          end
+
+          # restores a entire table (index) from provided +target_name+.
+          # The +table_name+ will be dropped, if exists.
+          # The +from+ will persist, if not provided +drop_backup:true+.
+          #
+          # @example
+          #   restore_table('screenshots', from: 'screenshots-backup-v1')
+          #
+          # @param [String] table_name
+          # @param [String] from
+          # @param [String (frozen)] timeout - renaming timout (default: '30s')
+          # @param [Boolean] open - opens restored backup after creation (default: true)
+          # @return [Boolean] acknowledged status
+          def restore_table(table_name, from:, timeout: nil, open: true, drop_backup: false)
+            raise ArgumentError, "unable to restore from missing target '#{from}'!" unless table_exists?(from)
+            drop_table(table_name, if_exists: true)
+
+            # choose best strategy
+            if drop_backup
+              rename_table(from, table_name, timeout: timeout)
+            else
+              clone_table(from, table_name)
+            end
+
+            # open, if provided
+            open_table(from) if open
+          end
+
           # renames a table (index) by executing multiple steps:
           # - clone table
           # - wait for 'green' state
@@ -178,11 +227,11 @@ module ActiveRecord
           # @param [String] target_name
           # @param [String (frozen)] timeout (default: '30s')
           # @param [Hash] options - additional 'clone' options (like settings, alias, ...)
-          def rename_table(table_name, target_name, timeout: '30s', **options)
+          def rename_table(table_name, target_name, timeout: nil, **options)
             schema_cache.clear_data_source_cache!(table_name)
 
             clone_table(table_name, target_name, **options)
-            cluster_health(index: target_name, wait_for_status: 'green', timeout: timeout)
+            cluster_health(index: target_name, wait_for_status: 'green', timeout: timeout.presence || '30s')
             drop_table(table_name)
           end
 
@@ -255,6 +304,15 @@ module ActiveRecord
             definition.exec!
           end
 
+          # Copies documents from a source to a destination.
+          # @param [String] table_name
+          # @param [String] target_name
+          # @param [Hash] options
+          # @return [Hash] reindex stats
+          def reindex_table(table_name, target_name, **options)
+            api(:core, :reindex, { body: { source: { index: table_name }, dest: { index: target_name } } }.merge(options), 'REINDEX TABLE')
+          end
+
           # -- mapping -------------------------------------------------------------------------------------------------
 
           def add_mapping(table_name, name, type, **options, &block)

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Elasticsearch
+      module Transactions
+        extend ActiveSupport::Concern
+
+        def transaction(*)
+          # since ActiveRecord does not have any configuration option to support transactions,
+          # this will be always false
+          # return super if supports_transactions?
+          #
+          # So, transactions are silently swallowed...
+          yield
+        end
+
+        # Begins the transaction (and turns off auto-committing).
+        def begin_db_transaction(*)
+          _throw_transaction_exception!(:begin_db_transaction)
+        end
+
+        # Commits the transaction (and turns on auto-committing).
+        def commit_db_transaction(*)
+          _throw_transaction_exception!(:commit_db_transaction)
+        end
+
+        # rollback transaction
+        def exec_rollback_db_transaction(*)
+          _throw_transaction_exception!(:exec_rollback_db_transaction)
+        end
+
+        def create_savepoint(*)
+          _throw_transaction_exception!(:create_savepoint)
+        end
+
+        def exec_rollback_to_savepoint(*)
+          _throw_transaction_exception!(:exec_rollback_to_savepoint)
+        end
+
+        def release_savepoint(*)
+          _throw_transaction_exception!(:release_savepoint)
+        end
+
+        private
+
+        def _throw_transaction_exception!(method_name)
+          return unless ElasticsearchRecord.error_on_transaction
+          raise NotImplementedError, "'##{method_name}' is not supported by Elasticsearch.\nTry to prevent transactions or set the 'ElasticsearchRecord.error_on_transaction' to false!"
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,6 @@
 module ActiveRecord
   module ConnectionAdapters
     module Elasticsearch
-
-      class UnsupportedImplementationError < StandardError
-        def initialize(method_name)
-          super "Unsupported implementation of method: #{method_name}."
-        end
-      end
-
       module UnsupportedImplementation
         extend ActiveSupport::Concern
 

data/lib/active_record/connection_adapters/elasticsearch_adapter.rb

@@ -13,6 +13,7 @@ require 'active_record/connection_adapters/elasticsearch/schema_dumper'
 require 'active_record/connection_adapters/elasticsearch/schema_statements'
 require 'active_record/connection_adapters/elasticsearch/type'
 require 'active_record/connection_adapters/elasticsearch/table_statements'
+require 'active_record/connection_adapters/elasticsearch/transactions'
 
 require 'arel/visitors/elasticsearch'
 require 'arel/collectors/elasticsearch_query'
@@ -25,6 +26,12 @@ module ActiveRecord # :nodoc:
     def elasticsearch_connection(config)
       config          = config.symbolize_keys
 
+      # move 'username' to 'user'
+      config[:user]  = config.delete(:username) if config[:username]
+
+      # append 'port' to 'host'
+      config[:host]  += ":#{config.delete(:port)}" if config[:port] && config[:host]
+
       # move 'host' to 'hosts'
       config[:hosts]  = config.delete(:host) if config[:host]
 
@@ -45,7 +52,7 @@ module ActiveRecord # :nodoc:
 
       # defines the Elasticsearch 'base' structure, which is always included but cannot be resolved through mappings ...
       BASE_STRUCTURE = [
-        { 'name' => '_id', 'type' => 'keyword', 'virtual' => true, 'enabled' => true, 'meta' => { 'primary_key' => 'true' } },
+        { 'name' => '_id', 'type' => 'keyword', 'meta' => { 'primary_key' => 'true' } },
         { 'name' => '_index', 'type' => 'keyword', 'virtual' => true },
         { 'name' => '_score', 'type' => 'float', 'virtual' => true },
         { 'name' => '_type', 'type' => 'keyword', 'virtual' => true },
@@ -57,6 +64,7 @@ module ActiveRecord # :nodoc:
       include Elasticsearch::DatabaseStatements
       include Elasticsearch::SchemaStatements
       include Elasticsearch::TableStatements
+      include Elasticsearch::Transactions
 
       class << self
         def base_structure_keys
@@ -69,7 +77,7 @@ module ActiveRecord # :nodoc:
           client.ping unless config[:ping] == false
           client
         rescue ::Elastic::Transport::Transport::Errors::Unauthorized
-          raise ActiveRecord::DatabaseConnectionError.username_error(config[:username])
+          raise ActiveRecord::DatabaseConnectionError.username_error(config[:user])
         rescue ::Elastic::Transport::Transport::ServerError => error
           raise ::ActiveRecord::ConnectionNotEstablished, error.message
         end
@@ -135,7 +143,7 @@ module ActiveRecord # :nodoc:
 
       # define native types - which will be used for schema-dumping
       NATIVE_DATABASE_TYPES = {
-        primary_key: { name: 'long' },
+        primary_key: { name: 'long' }, # maybe this hae to changed to 'keyword'
         string:      { name: 'keyword' },
         blob:        { name: 'binary' },
         datetime:    { name: 'date' },
@@ -172,6 +180,12 @@ module ActiveRecord # :nodoc:
         @config[:migrations_paths] || ['db/migrate_elasticsearch']
       end
 
+      # Does this adapter support transactions in general?
+      # HINT: This is +NOT* an official setting and only introduced to ElasticsearchRecord
+      def supports_transactions?
+        false
+      end
+
       # Does this adapter support explain?
       def supports_explain?
         false

data/lib/arel/collectors/elasticsearch_query.rb

@@ -28,6 +28,9 @@ module Arel # :nodoc: all
         when :refresh
           # change the refresh state
           @refresh = args[0]
+        when :timeout
+          # change the timeout
+          @timeout = args[0]
         when :index
           # change the index name
           @index = args[0]

data/lib/elasticsearch_record/core.rb

@@ -8,7 +8,7 @@ module ElasticsearchRecord
       # this through +_read_attribute(:id)+.
       # To also have the ability of accessing this attribute through the default, this flag can be enabled.
       # @attribute! Boolean
-      class_attribute :delegate_id_attribute, instance_writer: false, default: false
+      class_attribute :delegate_id_attribute, default: false
 
       # Elasticsearch's default value for queries without a +size+ is forced to +10+.
       # To provide a similar behaviour as SQL, this can be automatically set to the +max_result_window+ value.
@@ -45,7 +45,7 @@ module ElasticsearchRecord
 
     # overwrite to provide a Elasticsearch version of returning a 'primary_key' was attribute.
     # Elasticsearch uses the static +_id+ column as primary_key, but also supports an additional +id+ column.
-    # To provide functionality of returning the +id_Was+ attribute, this method must also support it
+    # To provide functionality of returning the +id_was+ attribute, this method must also support it
     # with enabled +delegate_id_attribute+.
     def id_was
       delegate_id_attribute? && has_attribute?('id') ? attribute_was('id') : super
@@ -69,6 +69,19 @@ module ElasticsearchRecord
       super
     end
 
+    # resets a possible active +delegate_id_attribute?+ to false during block execution.
+    # Unfortunately this is required, since a lot of rails-code forces 'accessors' on the primary_key-field through the
+    # +id+-getter & setter methods. This will then fail to set the doc-_id and instead set the +id+-attribute ...
+    def undelegate_id_attribute_with(&block)
+      return block.call unless self.delegate_id_attribute?
+
+      self.delegate_id_attribute = false
+      result = block.call
+      self.delegate_id_attribute = true
+
+      result
+    end
+
     module PrependClassMethods
       # returns the table_name.
       # Has to be prepended to provide automated compatibility to other gems.

data/lib/elasticsearch_record/gem_version.rb

@@ -8,8 +8,8 @@ module ElasticsearchRecord
 
   module VERSION
     MAJOR = 1
-    MINOR = 5
-    TINY  = 3
+    MINOR = 7
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/elasticsearch_record/instrumentation/log_subscriber.rb

@@ -46,7 +46,7 @@ module ElasticsearchRecord
 
         # final coloring
         name  = color(name, name_color(payload[:name]), true)
-        query = color(query, gate_color(payload[:gate]), true) if colorize_logging
+        query = color(query, gate_color(payload[:gate], payload[:name]), true) if colorize_logging
 
         debug "  #{name} #{query.presence || '-/-'}"
       end
@@ -61,7 +61,7 @@ module ElasticsearchRecord
         end
       end
 
-      def gate_color(gate)
+      def gate_color(gate, name)
         case gate
           # SELECTS
         when 'core.get', 'core.mget', 'core.search', 'core.msearch', 'core.count', 'core.exists', 'sql.query'
@@ -77,7 +77,11 @@ module ElasticsearchRecord
           YELLOW
           # MIXINS
         when /indices\.\w+/, 'core.bulk', 'core.index'
-          WHITE
+          if name.end_with?('Pit Delete')
+            RED
+          else
+            WHITE
+          end
         else
           MAGENTA
         end