wal 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823832e9e8ecbc21c1369c093e21da2f6feefc9d9ef0eb44ec73c38048075322
-  data.tar.gz: 23d82a6e7b0d7630fef5e34fc46db32bfb7786300c9a8b2ebbaad44098a1dc8f
+  metadata.gz: e7cd3acf2bcf902cb1bbc73a89063a6f360b73bacb52e4764900ece3eaa5e08d
+  data.tar.gz: 67cf46933f34837e0d7b9730ff87cee2e785e4057adb9fa519f1e80150513a88
 SHA512:
-  metadata.gz: 3398ab723fab693c7c9ffa653fa7a3f399431b2cf05106dc56127a31240b4d72f158e515a402312553db4729fe8f39937e490a0f338aa9bf94afc7c3984cad22
-  data.tar.gz: cd5d54cb4ca4351ccff83090dbfd78b5d64a17b4119d6c9b49eb1c31da39d1ce6c7cb577f60137f1c88ad6222436b39b85b2ae623e3319c84e57cf44072cae71
+  metadata.gz: a8ecd8b4dde1dfb4867c6532da43714d53662482b86f8a76b5adda396edba042d46cd1d1bdb2ed86590efbfb3f29c8946b37094621176c19690b738939affa97
+  data.tar.gz: ccb32bab9c54f998451f3b10ff1a0895ac06b07f6446ae8aafeb24cc32c10bca2672622790276ac9895b26ca9616a061fad359cf8ac7ac9835366138b248f091

data/LICENSE.txt

@@ -1,21 +1,28 @@
-The MIT License (MIT)
+BSD 3-Clause License
 
-Copyright (c) 2025 Rodrigo Navarro
+Copyright (c) 2025-present, Rodrigo Navarro. All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of wsrv.nl and images.weserv.nl nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/wal/record_watcher.rb

@@ -41,47 +41,46 @@ module Wal
 
     def self.inherited(subclass)
       super
-      @@change_callbacks = Hash.new { |hash, key| hash[key] = [] }
-      @@delete_callbacks = Hash.new { |hash, key| hash[key] = [] }
+      subclass.class_eval do
+        def self.change_callbacks
+          @change_callbacks ||= Hash.new { |hash, key| hash[key] = [] }
+        end
+
+        def self.delete_callbacks
+          @delete_callbacks ||= Hash.new { |hash, key| hash[key] = [] }
+        end
+      end
     end
 
     def self.on_insert(table, &block)
       table = table.is_a?(String) ? table : table.table_name
-      @@change_callbacks[table].push(only: [:create], block: block)
+      change_callbacks[table].push(only: [:create], block: block)
     end
 
     def self.on_update(table, changed: nil, &block)
       table = table.is_a?(String) ? table : table.table_name
-      @@change_callbacks[table].push(only: [:update], changed: changed&.map(&:to_s), block: block)
+      change_callbacks[table].push(only: [:update], changed: changed&.map(&:to_s), block: block)
     end
 
     def self.on_save(table, changed: nil, &block)
       table = table.is_a?(String) ? table : table.table_name
-      @@change_callbacks[table].push(only: [:create, :update], changed: changed&.map(&:to_s), block: block)
+      change_callbacks[table].push(only: [:create, :update], changed: changed&.map(&:to_s), block: block)
     end
 
     def self.on_delete(table, &block)
       table = table.is_a?(String) ? table : table.table_name
-      @@delete_callbacks[table].push(block: block)
-    end
-
-    def self.change_callbacks
-      @@change_callbacks
-    end
-
-    def self.delete_callbacks
-      @@delete_callbacks
+      delete_callbacks[table].push(block: block)
     end
 
     def on_record_changed(event)
       case event
       when InsertEvent
-        @@change_callbacks[event.table]
+        self.class.change_callbacks[event.full_table_name]
           .filter { |callback| callback[:only].include? :create }
           .each { |callback| instance_exec(event, &callback[:block]) }
 
       when UpdateEvent
-        @@change_callbacks[event.table]
+        self.class.change_callbacks[event.full_table_name]
           .filter { |callback| callback[:only].include? :update }
           .each do |callback|
             if (attributes = callback[:changed])
@@ -92,14 +91,14 @@ module Wal
           end
 
       when DeleteEvent
-        @@delete_callbacks[event.table].each do |callback|
+        self.class.delete_callbacks[event.full_table_name].each do |callback|
           instance_exec(event, &callback[:block])
         end
       end
     end
 
     def should_watch_table?(table)
-      (@@change_callbacks.keys | @@delete_callbacks.keys).include? table
+      (self.class.change_callbacks.keys | self.class.delete_callbacks.keys).include? table
     end
 
     # `RecordWatcher` supports three processing strategies:
@@ -184,7 +183,7 @@ module Wal
       def on_update(event)
         if (id = event.primary_key)
           @records ||= {}
-          @records[[event.table, id]] = case (existing_event = @records[[event.table, id]])
+          @records[[event.full_table_name, id]] = case (existing_event = @records[[event.full_table_name, id]])
           when InsertEvent
             # A record inserted on this transaction is being updated, which means it should still reflect as a insert
             # event, we just change the information to reflect the most current data that was just updated.
@@ -204,7 +203,7 @@ module Wal
       def on_delete(event)
         if (id = event.primary_key)
           @records ||= {}
-          @records[[event.table, id]] = case (existing_event = @records[[event.table, id]])
+          @records[[event.full_table_name, id]] = case (existing_event = @records[[event.full_table_name, id]])
           when InsertEvent
             # We are removing a record that was inserted on this transaction, we should not even report this change, as
             # this record never existed outside this transaction anyways.
@@ -304,9 +303,9 @@ module Wal
       end
 
       def on_delete(event)
-        case @table.where(table_name: event.table, primary_key: event.primary_key).pluck(:action, :old).first
+        case @table.where(table_name: event.full_table_name, primary_key: event.primary_key).pluck(:action, :old).first
         in ["insert", _]
-          @table.where(table_name: event.table, primary_key: event.primary_key).delete_all
+          @table.where(table_name: event.full_table_name, primary_key: event.primary_key).delete_all
         in ["update", old]
           @table.upsert(serialize(event).merge(old:))
         in ["delete", _]
@@ -326,7 +325,7 @@ module Wal
         serialized = {
           transaction_id: event.transaction_id,
           lsn: event.lsn,
-          table_name: event.table,
+          table_name: event.full_table_name,
           primary_key: event.primary_key,
           context: event.context,
         }
@@ -343,10 +342,12 @@ module Wal
       end
 
       def deserialize(persisted_event)
+        table, schema = persisted_event.table_name.split(".", 2)
         deserialized = {
           transaction_id: persisted_event.transaction_id,
           lsn: persisted_event.lsn,
-          table: persisted_event.table_name,
+          schema: schema || "public",
+          table: table,
           primary_key: persisted_event.primary_key,
           context: persisted_event.context,
         }

data/lib/wal/replicator.rb

@@ -47,10 +47,11 @@ module Wal
 
       watch_conn.start_pgoutput_replication_slot(@replication_slot, publications, messages: true).filter_map do |msg|
         case msg
-        in XLogData(data: PG::Replication::PGOutput::Relation(oid:, name:, columns:))
+        in XLogData(data: PG::Replication::PGOutput::Relation(oid:, name:, columns:, namespace:))
           tables[oid] = Table.new(
             # TODO: for now we are forcing an id column here, but that is not really correct
             primary_key_colums: columns.any? { |col| col.name == "id" } ? ["id"] : [],
+            schema: namespace,
             name:,
             columns: columns.map do |col|
               Column.new(
@@ -100,7 +101,7 @@ module Wal
 
         in XLogData(lsn:, data: PG::Replication::PGOutput::Insert(oid:, new:))
           table = tables[oid]
-          next unless watcher.should_watch_table? table.name
+          next unless watcher.should_watch_table? table.full_table_name
           new_data = table.decode_row(new)
           record_id = table.primary_key(new_data)
           next unless record_id
@@ -109,6 +110,7 @@ module Wal
             transaction_id:,
             lsn:,
             context:,
+            schema: table.schema,
             table: table.name,
             primary_key: record_id,
             new: new_data,
@@ -116,7 +118,7 @@ module Wal
 
         in XLogData(lsn:, data: PG::Replication::PGOutput::Update(oid:, new:, old:))
           table = tables[oid]
-          next unless watcher.should_watch_table? table.name
+          next unless watcher.should_watch_table? table.full_table_name
           old_data = table.decode_row(old)
           new_data = table.decode_row(new)
           record_id = table.primary_key(new_data)
@@ -126,6 +128,7 @@ module Wal
             transaction_id:,
             lsn:,
             context:,
+            schema: table.schema,
             table: table.name,
             primary_key: record_id,
             old: old_data,
@@ -134,7 +137,7 @@ module Wal
 
         in XLogData(lsn:, data: PG::Replication::PGOutput::Delete(oid:, old:, key:))
           table = tables[oid]
-          next unless watcher.should_watch_table? table.name
+          next unless watcher.should_watch_table? table.full_table_name
           old_data = table.decode_row(old.presence || key)
           record_id = table.primary_key(old_data)
           next unless record_id
@@ -143,6 +146,7 @@ module Wal
             transaction_id:,
             lsn:,
             context:,
+            schema: table.schema,
             table: table.name,
             primary_key: record_id,
             old: old_data,
@@ -160,7 +164,16 @@ module Wal
       end
     end
 
-    class Table < Data.define(:name, :primary_key_colums, :columns)
+    class Table < Data.define(:schema, :name, :primary_key_colums, :columns)
+      def full_table_name
+        case schema
+        in "public"
+          name
+        else
+          "#{schema}.#{name}"
+        end
+      end
+
       def primary_key(decoded_row)
         case primary_key_colums
         in [key]

data/lib/wal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wal
-  VERSION = "0.0.20"
+  VERSION = "0.0.22"
 end

data/lib/wal.rb

@@ -29,6 +29,17 @@ module Wal
   class CommitTransactionEvent < Data.define(:transaction_id, :lsn, :context, :timestamp)
   end
 
+  module TableName
+    def full_table_name
+      case schema
+      in "public"
+        table
+      else
+        "#{schema}.#{table}"
+      end
+    end
+  end
+
   module ChangeEvent
     def diff
       {}
@@ -55,7 +66,8 @@ module Wal
     end
   end
 
-  class InsertEvent < Data.define(:transaction_id, :lsn, :context, :table, :primary_key, :new)
+  class InsertEvent < Data.define(:transaction_id, :lsn, :context, :schema, :table, :primary_key, :new)
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
 
     def diff
@@ -63,7 +75,8 @@ module Wal
     end
   end
 
-  class UpdateEvent < Data.define(:transaction_id, :lsn, :context, :table, :primary_key, :old, :new)
+  class UpdateEvent < Data.define(:transaction_id, :lsn, :context, :schema, :table, :primary_key, :old, :new)
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
 
     def diff
@@ -73,7 +86,8 @@ module Wal
     end
   end
 
-  class DeleteEvent < Data.define(:transaction_id, :lsn, :context, :table, :primary_key, :old)
+  class DeleteEvent < Data.define(:transaction_id, :lsn, :context, :schema, :table, :primary_key, :old)
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
 
     def diff

data/rbi/wal.rbi

@@ -7,7 +7,7 @@ module Wal
       UpdateEvent,
       DeleteEvent,
     ) }
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 
   class << self
     sig { returns(T.class_of(Logger)) }
@@ -37,6 +37,13 @@ module Wal
 
   end
 
+  module TableName
+    extend T::Sig
+
+    sig { returns(String) }
+    def full_table_name; end
+  end
+
   module ChangeEvent
     extend T::Sig
 
@@ -60,10 +67,12 @@ module Wal
     prop :transaction_id, Integer, immutable: true
     prop :lsn, Integer, immutable: true
     prop :context, T::Hash[String, T.untyped], immutable: true
+    prop :schema, String, immutable: true
     prop :table, String, immutable: true
     prop :primary_key, T.untyped, immutable: true
     prop :new, T::Hash[String, T.untyped], immutable: true
 
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
     extend T::Sig
 
@@ -75,11 +84,13 @@ module Wal
     prop :transaction_id, Integer, immutable: true
     prop :lsn, Integer, immutable: true
     prop :context, T::Hash[String, T.untyped], immutable: true
+    prop :schema, String, immutable: true
     prop :table, String, immutable: true
     prop :primary_key, T.untyped, immutable: true
     prop :old, T::Hash[String, T.untyped], immutable: true
     prop :new, T::Hash[String, T.untyped], immutable: true
 
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
     extend T::Sig
 
@@ -91,10 +102,12 @@ module Wal
     prop :transaction_id, Integer, immutable: true
     prop :lsn, Integer, immutable: true
     prop :context, T::Hash[String, T.untyped], immutable: true
+    prop :schema, String, immutable: true
     prop :table, String, immutable: true
     prop :primary_key, T.untyped, immutable: true
     prop :old, T::Hash[String, T.untyped], immutable: true
 
+    include ::Wal::TableName
     include ::Wal::ChangeEvent
     extend T::Sig
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wal
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2025-09-20 00:00:00.000000000 Z
+date: 2025-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -105,7 +105,7 @@ files:
 - lib/wal/watcher.rb
 - rbi/wal.rbi
 licenses:
-- MIT
+- BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/reu/wal
   source_code_uri: https://github.com/reu/wal