waldit 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c671c6e356548b94a0848e8f17e79634e8239113c685995305258c355388ef
-  data.tar.gz: d3bcc95f82f3230c5a8b50ec7917a74466166685a9685a8715769246e39bda71
+  metadata.gz: 6c66dca1c2f51bdaa3f85e6f3f13930536e9352e6d5958f8b8eab140a108cab4
+  data.tar.gz: 43d8b34c506b98f5213372e624ab35d19f586570c47cf3abc5e692ec85ead638
 SHA512:
-  metadata.gz: 71a0b50f5ee3d46ddf7bdfe11242d7ac29e1fff2826c0ca63195401a377e39f1066d664c0b268d34a696c2568884b8adada0ed0a99c85cf039be1a018b1ce4a9
-  data.tar.gz: 87a8ce52ffe1f414d6c529f552bf9deecdbe303fe98be9639cd23944929f6b8770484b25560fcd4a9b76ea78eb31fd92f669478f2c00f9f57e4073251e315917
+  metadata.gz: 261e9f0b9bf6948c6fa6ac2f2bfd3dc2baf15541aa7ef18818b9aef76af08925427cf90a195bc32008c17bd674991687ac24cb1fe95b65d7cef08574c57aee08
+  data.tar.gz: 3a3dbf1982be4498d393f6ff10ce5be88835c34cdc0272be8d692db1ed5886ff66af1ea41f3e2f1dd79eab24a1ddf2d695c1a93ae74b38117d54de38e85695a0

data/lib/waldit/record.rb

@@ -4,11 +4,10 @@ module Waldit
   module Record
     def self.included(base)
       base.class_eval do
-        default_scope { order(:committed_at) }
-        scope :from_table, -> table { where(table_name: table) }
+        scope :from_table, -> table { order(:committed_at).where(table_name: table) }
         scope :from_model, -> model { from_table(model.table_name) }
         scope :for, -> record { from_model(record.class).where(primary_key: record.id) }
-        scope :with_context, -> ctx { where("context @> ?", ctx.to_json) }
+        scope :with_context, -> ctx { order(:committed_at).where("context @> ?", ctx.to_json) }
       end
     end
 

data/lib/waldit/version.rb

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

data/lib/waldit/watcher.rb

@@ -35,72 +35,58 @@ module Waldit
       end
     end
 
+    def initialize(*)
+      super
+      initialize_connection
+      @retry = false
+    end
+
     def on_transaction_events(events)
-      record.transaction do
-        @connection = record.connection.raw_connection
+      @connection.transaction do
         tables = Set.new
-        insert_prepared = false
-        update_prepared = false
-        delete_prepared = false
 
         events.each do |event|
           case event
           when CommitTransactionEvent
-            record.where(transaction_id: event.transaction_id).update_all(committed_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
+            log_new = (changes[:new] || []).map { |table| "#{table}" }.join(",")
+            log_old = (changes[:old] || []).map { |table| "#{table}" }.join(",")
+            log_diff = (changes[:diff] || []).map { |table| "#{table}" }.join(",")
+
+            @connection.exec_prepared("waldit_finish", [
+              event.transaction_id,
+              event.timestamp,
+              "{#{log_new}}",
+              "{#{log_old}}",
+              "{#{log_diff}}",
+            ])
+
+            # We sucessful retried a connection, let's reset our retry state
+            @retry = false
 
           when InsertEvent
             tables << event.table
-            unless insert_prepared
-              prepare_insert
-              insert_prepared = true
-            end
             audit_event(event)
 
           when UpdateEvent
             tables << event.table
-            unless update_prepared
-              prepare_update
-              update_prepared = true
-            end
             audit_event(event)
 
           when DeleteEvent
             tables << event.table
-            unless delete_prepared
-              prepare_delete
-              prepare_delete_cleanup
-              delete_prepared = true
-            end
             audit_event(event)
           end
         end
       end
+    rescue PG::ConnectionBad
+      raise if @retry
+      # Let's try to fetch a new connection and reprocess the transaction
+      initialize_connection
+      @retry = true
+      retry
     end
 
     def should_watch_table?(table)
@@ -125,6 +111,15 @@ module Waldit
 
     private
 
+    def initialize_connection
+      @connection = record.connection.raw_connection
+      prepare_insert
+      prepare_update
+      prepare_delete
+      prepare_delete_cleanup
+      prepare_finish
+    end
+
     def prepare_insert
       @connection.prepare("waldit_insert", <<~SQL)
         INSERT INTO #{record.table_name} (transaction_id, lsn, table_name, primary_key, action, context, new)
@@ -132,6 +127,7 @@ module Waldit
         ON CONFLICT (table_name, primary_key, transaction_id)
         DO UPDATE SET new = #{record.table_name}.new
       SQL
+    rescue PG::DuplicatePstatement
     end
 
     def prepare_update
@@ -141,6 +137,7 @@ module Waldit
         ON CONFLICT (table_name, primary_key, transaction_id)
         DO UPDATE SET new = excluded.new
       SQL
+    rescue PG::DuplicatePstatement
     end
 
     def prepare_delete
@@ -150,6 +147,7 @@ module Waldit
         ON CONFLICT (table_name, primary_key, transaction_id)
         DO UPDATE SET old = #{record.table_name}.old
       SQL
+    rescue PG::DuplicatePstatement
     end
 
     def prepare_delete_cleanup
@@ -162,6 +160,32 @@ module Waldit
           AND action IN ('insert'::waldit_action, 'update'::waldit_action)
         RETURNING action, old
       SQL
+    rescue PG::DuplicatePstatement
+    end
+
+    def prepare_finish
+      @connection.prepare("waldit_finish", <<~SQL)
+        UPDATE #{record.table_name}
+        SET
+          committed_at = $2,
+          new = CASE WHEN table_name = ANY ($3::varchar[]) THEN new ELSE null END,
+          old = CASE WHEN table_name = ANY ($4::varchar[]) THEN old ELSE null END,
+          diff =
+            CASE WHEN table_name = ANY ($5::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
+        WHERE transaction_id = $1
+      SQL
+    rescue PG::DuplicatePstatement
     end
   end
 end

data/rbi/waldit.rbi

@@ -2,7 +2,7 @@
 module Waldit
   extend T::Sig
   extend Waldit::Context
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 
   class << self
     sig { returns(String) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: waldit
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wal