waldit 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b76edf8a202620aff6e09391009e6c00ae0f26a404d1b81741c5cd3e339db66
-  data.tar.gz: f0c7582d6af476ecf536aa4e96846eea620b8c3bd5c215c240d9e68056ade643
+  metadata.gz: f5c8f24220664dba4cbdda331668fff84cfdf94fa0bc12eb0632613cc83e65c0
+  data.tar.gz: ad904cc5fa30b2a7de5a5b9844242be0a7fb568695106035956996f84e889731
 SHA512:
-  metadata.gz: 5aee8ef8ff8c9f0b6fc636b866a9fe72a08c1ba98e507df1b7d3771339130808c04c9fb32345a07a12416967d386be92bdfe3bfd1f3215dc723f337baf06278b
-  data.tar.gz: e5f139662394131f2bfbe1af5ac3df85fa7b6202756ec67c02f0e679d11c78e2a62ecdb3a5bb188fa20a25ddee23699824266831f86b09e3284c0ad2584e9d6b
+  metadata.gz: 9fe4ef8b61035be5b3be5a531e3db9f4bf2b12bf419e00655694a378f2020a627a2f98d497ab9c4db79ca48129f23209a6685f0ae2a513c8c97110b81142cb6b
+  data.tar.gz: 495601d9aed573a7e2bde43f8a1a85d33209aca29485868c540a9b1fe729092fcb2a7a491c7553ef6544a89909fe278ae6e275d48a705a73ed2ed35fc0109389

data/lib/waldit/record.rb

@@ -2,8 +2,22 @@
 
 module Waldit
   module Record
+    def new
+      return self[:new] if self[:new]
+
+      (self[:diff] || {}).transform_values { |_old, new| new }
+    end
+
+    def old
+      return self[:old] if self[:old]
+
+      (self[:diff] || {}).transform_values { |old, _new| old }
+    end
+
     def diff
-      (old.keys | new.keys).reduce({}.with_indifferent_access) do |diff, key|
+      return self[:diff] if self[:diff]
+
+      (old.keys | new.keys).reduce({}) do |diff, key|
         old[key] != new[key] ? diff.merge(key => [old[key], new[key]]) : diff
       end
     end

data/lib/waldit/sidekiq.rb

@@ -17,8 +17,13 @@ module Waldit
       include ::Sidekiq::ServerMiddleware
 
       def call(job_instance, job, queue, &block)
-        context = deserialize_context(job) || {}
-        Waldit.with_context(context.merge(background_job: job_instance.class.to_s), &block)
+        background_job = case job["class"]
+        in "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
+          job["args"][0]["job_class"]
+        in klass
+          klass
+        end
+        Waldit.with_context((deserialize_context(job) || {}).merge(background_job:), &block)
       end
 
       private

data/lib/waldit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Waldit
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/waldit/watcher.rb

@@ -34,6 +34,7 @@ module Waldit
     def on_transaction_events(events)
       record.transaction do
         @connection = record.connection.raw_connection
+        tables = Set.new
         insert_prepared = false
         update_prepared = false
         delete_prepared = false
@@ -43,7 +44,34 @@ module Waldit
           when CommitTransactionEvent
             record.where(transaction_id: event.transaction_id).update_all(commited_at: event.timestamp)
 
+            changes = [:old, :new, :diff]
+              .map { |diff| [diff, tables.filter { |table| Waldit.store_changes.call(table).include? diff }] }
+              .to_h
+
+            log_new = (changes[:new] || []).map { |table| "'#{table}'" }.join(",")
+            log_old = (changes[:old] || []).map { |table| "'#{table}'" }.join(",")
+            log_diff = (changes[:diff] || []).map { |table| "'#{table}'" }.join(",")
+
+            record.where(transaction_id: event.transaction_id, action: "update").update_all(<<~SQL)
+              new = CASE WHEN table_name = ANY (ARRAY[#{log_new}]::varchar[]) THEN new ELSE null END,
+              old = CASE WHEN table_name = ANY (ARRAY[#{log_old}]::varchar[]) THEN old ELSE null END,
+              diff =
+                CASE WHEN table_name = ANY (ARRAY[#{log_diff}]::varchar[]) THEN (
+                  SELECT
+                    jsonb_object_agg(
+                      coalesce(old_kv.key, new_kv.key),
+                      jsonb_build_array(old_kv.value, new_kv.value)
+                    )
+                  FROM jsonb_each(old) AS old_kv
+                  FULL OUTER JOIN jsonb_each(new) AS new_kv ON old_kv.key = new_kv.key
+                  WHERE old_kv.value IS DISTINCT FROM new_kv.value
+                )
+                ELSE null
+                END
+            SQL
+
           when InsertEvent
+            tables << event.table
             unless insert_prepared
               prepare_insert
               insert_prepared = true
@@ -51,6 +79,7 @@ module Waldit
             audit_event(event)
 
           when UpdateEvent
+            tables << event.table
             unless update_prepared
               prepare_update
               update_prepared = true
@@ -58,6 +87,7 @@ module Waldit
             audit_event(event)
 
           when DeleteEvent
+            tables << event.table
             unless delete_prepared
               prepare_delete
               prepare_delete_cleanup
@@ -111,8 +141,8 @@ module Waldit
 
     def prepare_delete
       @connection.prepare("waldit_delete", <<~SQL)
-        INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, old, new)
-        VALUES ($1, $2, $3, $4, 'delete'::waldit_action, $5, $6, '{}'::jsonb)
+        INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, old)
+        VALUES ($1, $2, $3, $4, 'delete'::waldit_action, $5, $6)
         ON CONFLICT (table_name, primary_key, transaction_id)
         DO UPDATE SET old = #{record.table_name}.old
       SQL

data/lib/waldit.rb

@@ -21,6 +21,21 @@ module Waldit
       end
     end
 
+    attr_reader :store_changes
+
+    def store_changes=(changes)
+      case changes
+      when Symbol
+        changes = [changes].to_set
+        @store_changes = -> table { changes }
+      when Array
+        changes = changes.map(&:to_sym).to_set
+        @store_changes = -> table { changes }
+      else
+        @store_changes = changes
+      end
+    end
+
     attr_accessor :ignored_columns
     attr_accessor :max_transaction_size
     attr_accessor :model
@@ -36,6 +51,8 @@ module Waldit
 
     config.watched_tables = -> table { table != "waldit" }
 
+    config.store_changes = -> table { %i[old new diff] }
+
     config.ignored_columns = -> table { %w[created_at updated_at] }
 
     config.max_transaction_size = 10_000

data/rbi/waldit.rbi

@@ -2,7 +2,7 @@
 module Waldit
   extend T::Sig
   extend Waldit::Context
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 
   class << self
     sig { returns(String) }
@@ -11,6 +11,9 @@ module Waldit
     sig { returns(T.proc.params(table: String).returns(T::Boolean)) }
     attr_reader :watched_tables
 
+    sig { returns(T.proc.params(table: String).returns(T::Array[Symbol])) }
+    attr_reader :store_changes
+
     sig { returns(T.proc.params(table: String).returns(T::Array[String])) }
     attr_accessor :ignored_columns
 
@@ -24,6 +27,9 @@ module Waldit
   sig { params(tables: T.any(T::Array[String], T.proc.params(table: String).returns(T::Boolean))).void }
   def self.watched_tables=(tables); end
 
+  sig { params(changes: T.any(Symbol, T::Array[Symbol], T.proc.params(table: String).returns(T::Array[Symbol]))).void }
+  def self.store_changes=(changes); end
+
   sig { params(block: T.proc.params(config: T.class_of(Waldit)).void).void }
   def self.configure(&block); end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: waldit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2025-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wal
@@ -71,7 +71,6 @@ files:
 - lib/waldit/version.rb
 - lib/waldit/watcher.rb
 - rbi/waldit.rbi
-- sig/waldit.rbs
 homepage: https://github.com/reu/waldit
 licenses:
 - MIT

data/sig/waldit.rbs

@@ -1,73 +0,0 @@
-# typed: strong
-module Waldit
-  extend Waldit::Context
-
-  def self.watched_tables=: () -> String
-                          | () -> ^(String table) -> bool
-                          | () -> ^(String table) -> ::Array[String]
-                          | () -> Integer
-                          | () -> singleton(ActiveRecord::Base)
-                          | (::Array[String] | ^(String table) -> bool tables) -> void
-
-  def self.configure: () { (singleton(Waldit) config) -> void } -> void
-end
-
-Waldit::VERSION: untyped
-
-module Waldit::Context
-  def with_context: [U] (Context context) { () -> U } -> U
-
-  def context: () -> Context?
-
-  def add_context: (Context added_context) -> void
-
-  def new_context: (?Context context) -> void
-end
-
-Waldit::Waldit::Context::Context: untyped
-
-class Waldit::Railtie < Rails::Railtie
-end
-
-module Waldit::Record
-  extend T::Helpers
-
-  def new: () -> ::Hash[String | Symbol, untyped]
-
-  def old: () -> ::Hash[String | Symbol, untyped]
-
-  def diff: () -> ::Hash[String | Symbol, [ untyped, untyped ]]
-end
-
-module Waldit::Sidekiq
-end
-
-class Waldit::Waldit::Sidekiq::SaveContext
-  include ::Sidekiq::ClientMiddleware
-
-  def call: (untyped job_class, untyped job, untyped queue, untyped redis) -> untyped
-end
-
-class Waldit::Waldit::Sidekiq::LoadContext
-  include ::Sidekiq::ServerMiddleware
-
-  def call: (untyped job_instance, untyped job, untyped queue) { () -> untyped } -> untyped
-
-  def deserialize_context: (untyped job) -> untyped
-end
-
-class Waldit::Watcher < Wal::StreamingWatcher
-  def audit_event: (InsertEvent | UpdateEvent | DeleteEvent event) -> void
-
-  def on_transaction_events: (::Enumerator[Event] events) -> void
-
-  def should_watch_table?: (String table) -> bool
-
-  def valid_context_prefix?: (String prefix) -> bool
-
-  def ignored_columns: (String table) -> ::Array[String]
-
-  def max_transaction_size: () -> Integer
-
-  def record: () -> singleton(ActiveRecord::Base)
-end