wal 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936740af0935d80d35c3d1c4cc92bde29c6a7df587cb0c25d16b7183bdba0009
-  data.tar.gz: 80b759a323c4e9617c2e0c0258dcf48f51e25582b8238a4b58bf3b00b31cf1de
+  metadata.gz: 25baa32e6f2d21ec2e2e4d2f1d1e6cbfa923b50bbb83aef360e3915548ad294f
+  data.tar.gz: 70c3b57c2256c7313893c3333e18f7c0e0f3d10bc9c976fe93629779312b32e2
 SHA512:
-  metadata.gz: 743d33f09a35783ef50e398597aa53ac159125873874a952b26b0995f8192ae76b950d23ed1d98b97e4c7473b15fe6fc412133a449d0cfd79b1d93982088a5e1
-  data.tar.gz: 466a0008e372b725aa5723e3a46af578cb6603e816a4bd4e9e0dbaabfbc6a0ca9bcf72e3d69661e1e083d815940747993e4dbd6eca09da8b17b80d6e65d0ed49
+  metadata.gz: 00e5fd5953df779aaaead0554987a0441c2a441c0be987489e4b1e50c4e838b3bef659c7168a64ed1a1f9e42c003169621c925e2c77e9631ec75d8729c3238c2
+  data.tar.gz: 2ab200a8bcfcc61ca06baf60fc0d5d2a43af8b2660a5b8713a428016b403d47298ad11354f02d4fe650346f9de2b8a4078ba47bce99135de69f0474ea9b9e9e1

data/lib/wal/record_watcher.rb

@@ -244,13 +244,13 @@ module Wal
             t.bigint :lsn, null: false
             t.column :action, :string, null: false
             t.string :table_name, null: false
-            t.bigint :primary_key
+            t.text :primary_key_data
             t.jsonb :old, null: false, default: {}
             t.jsonb :new, null: false, default: {}
             t.jsonb :context, null: false, default: {}
           end
 
-          unique_index = %i[table_name primary_key]
+          unique_index = %i[table_name primary_key_data]
 
           base_class.connection.add_index table_name, unique_index, unique: true
 
@@ -303,9 +303,10 @@ module Wal
       end
 
       def on_delete(event)
-        case @table.where(table_name: event.full_table_name, primary_key: event.primary_key).pluck(:action, :old).first
+        pk_data = serialize_primary_key(event.primary_key)
+        case @table.where(table_name: event.full_table_name, primary_key_data: pk_data).pluck(:action, :old).first
         in ["insert", _]
-          @table.where(table_name: event.full_table_name, primary_key: event.primary_key).delete_all
+          @table.where(table_name: event.full_table_name, primary_key_data: pk_data).delete_all
         in ["update", old]
           @table.upsert(serialize(event).merge(old:))
         in ["delete", _]
@@ -321,12 +322,23 @@ module Wal
         self.class.base_active_record_class || ::ActiveRecord::Base
       end
 
+      def serialize_primary_key(pk)
+        return nil if pk.nil?
+        Array(pk).to_json
+      end
+
+      def deserialize_primary_key(pk_data)
+        return nil if pk_data.nil?
+        values = JSON.parse(pk_data)
+        values.size == 1 ? values.first : values
+      end
+
       def serialize(event)
         serialized = {
           transaction_id: event.transaction_id,
           lsn: event.lsn,
           table_name: event.full_table_name,
-          primary_key: event.primary_key,
+          primary_key_data: serialize_primary_key(event.primary_key),
           context: event.context,
         }
         case event
@@ -348,7 +360,7 @@ module Wal
           lsn: persisted_event.lsn,
           schema: schema || "public",
           table: table,
-          primary_key: persisted_event.primary_key,
+          primary_key: deserialize_primary_key(persisted_event.primary_key_data),
           context: persisted_event.context,
         }
         case persisted_event.action

data/lib/wal/replicator.rb

@@ -12,6 +12,7 @@ module Wal
       @db_config = db_config
       @replication_slot = replication_slot
       @use_temporary_slot = use_temporary_slot
+      @primary_key_cache = {}
     end
 
     def replicate_forever(watcher, publications:)
@@ -25,6 +26,8 @@ module Wal
       @watch_conn&.stop_replication
       @watch_conn&.close
       @watch_conn = nil
+      @metadata_conn&.close
+      @metadata_conn = nil
     end
 
     def replicate(watcher, publications:)
@@ -37,6 +40,8 @@ module Wal
         replication: "database",
       )
 
+      @metadata_conn = connect_metadata
+
       begin
         @watch_conn.query(<<~SQL)
           CREATE_REPLICATION_SLOT #{@replication_slot} #{@use_temporary_slot ? "TEMPORARY" : ""} LOGICAL "pgoutput"
@@ -53,8 +58,7 @@ module Wal
         case msg
         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"] : [],
+            primary_key_columns: fetch_primary_key_columns(namespace, name),
             schema: namespace,
             name:,
             columns: columns.map { |col| Column.new(oid: col.oid, name: col.name) },
@@ -156,6 +160,52 @@ module Wal
       end
     end
 
+    private
+
+    def connect_metadata
+      PG.connect(
+        dbname: @db_config[:database],
+        host: @db_config[:host],
+        user: @db_config[:username],
+        password: @db_config[:password].presence,
+        port: @db_config[:port].presence,
+      )
+    end
+
+    def fetch_primary_key_columns(schema, table_name)
+      result = @metadata_conn.exec_params(<<~SQL, [schema, table_name]).to_a.map { |row| row["attname"] }
+        SELECT a.attname
+        FROM pg_constraint c
+        JOIN pg_class t ON c.conrelid = t.oid
+        JOIN pg_namespace n ON t.relnamespace = n.oid
+        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(c.conkey)
+        WHERE n.nspname = $1 AND t.relname = $2 AND c.contype = 'p'
+        ORDER BY array_position(c.conkey, a.attnum)
+      SQL
+
+      return result if result.size > 0
+
+      # Fallback to unique index columns
+      result = @metadata_conn.exec_params(<<~SQL, [schema, table_name]).to_a
+        SELECT a.attname, i.indexrelid::bigint
+        FROM pg_index i
+        JOIN pg_class t ON i.indrelid = t.oid
+        JOIN pg_namespace n ON t.relnamespace = n.oid
+        JOIN unnest(i.indkey) WITH ORDINALITY AS k(attnum, ord) ON true
+        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
+        WHERE n.nspname = $1 AND t.relname = $2 AND i.indisunique = true
+        ORDER BY i.indisprimary DESC, i.indexrelid, k.ord
+      SQL
+
+      result
+        .filter { |row| row["indexrelid"] == result.first["indexrelid"] }
+        .map { |row| row["attname"] } if result.size > 0
+
+    rescue PG::ConnectionBad
+      @metadata_conn = connect_metadata
+      retry
+    end
+
     class Column < Data.define(:name, :oid)
       BOOLEAN_DECODER = PG::TextDecoder::Boolean.new
       BYTEA_DECODER = PG::TextDecoder::Bytea.new
@@ -334,7 +384,7 @@ module Wal
       end
     end
 
-    class Table < Data.define(:schema, :name, :primary_key_colums, :columns)
+    class Table < Data.define(:schema, :name, :primary_key_columns, :columns)
       def full_table_name
         case schema
         in "public"
@@ -345,21 +395,21 @@ module Wal
       end
 
       def primary_key(decoded_row)
-        case primary_key_colums
-        in [key]
-          case decoded_row[key]
-          in Integer => id
-            id
-          in String => id
-            id
+        return nil if primary_key_columns.empty?
+
+        values = primary_key_columns.filter_map do |col_name|
+          value = decoded_row[col_name]
+          case value
+          when Integer, String
+            value
           else
-            # Only supporting string and integer primary keys for now
             nil
           end
-        else
-          # Not supporting coumpound primary keys
-          nil
         end
+
+        return nil if values.size != primary_key_columns.size
+
+        values.size == 1 ? values.first : values
       end
 
       def decode_row(values)

data/lib/wal/version.rb

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

data/rbi/wal.rbi

@@ -7,7 +7,7 @@ module Wal
       UpdateEvent,
       DeleteEvent,
     ) }
-  VERSION = "0.0.27"
+  VERSION = "0.0.28"
 
   class << self
     sig { returns(T.class_of(Logger)) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wal
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2026-01-14 00:00:00.000000000 Z
+date: 2026-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg