pgtk 0.32.4 → 0.32.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72cdeed11d9faa8c9097c01256603b2ce77a507b936c983ab623b9e1d6e7d364
-  data.tar.gz: ab60b5670e87009e1eb47983bd8d729eb403d78a9c6a20c82ea14d70d4a7d18f
+  metadata.gz: b1997e1fa9261d1881e5df4495a43723ea737ad754806bc9908a986c4e782fa6
+  data.tar.gz: 51b31ffb42b6eb9d2ea625c82be4664384bc190d2c1187ab642cb7cbeaaeb9ab
 SHA512:
-  metadata.gz: 691ea0c8b5ca6002b72ab4b66487b3dbf489feaedbc8e80cc772fe69cfc1ad966fa836e13298b561cadb38c75290ed8a533a389751a7d6b0454da23b87afcb74
-  data.tar.gz: 8a04b05ad839b935ac3f8e5362bb957eb64e8e70e1b963c5713a7c7755f8184e6c1e8c806a4d03467bba80e3ce5af0cf9c1a1a50c4d73f11e79d46dc9569fc2f
+  metadata.gz: f6245814e1907f27948dd369e8ff00cf584e759c04c7b22befac1c4da3de828ef6192f8d3510fe6760b04cdbab871045a7963ed54c00cd1d64b982b2ccfb483d
+  data.tar.gz: 5f97bf03bf00fc4e4da554b1807896474d4221748ebacc3cbda22da56e6d55e3067dd5e277082c7a4184aabe4617df9ece91e6dfaaec718f2530f7acc4410664

data/Gemfile.lock

@@ -69,7 +69,7 @@ GEM
     nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
     os (1.1.4)
-    parallel (2.0.1)
+    parallel (2.1.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
@@ -81,7 +81,7 @@ GEM
     pg (1.6.3-x86_64-linux)
     pg (1.6.3-x86_64-linux-musl)
     prism (1.9.0)
-    qbash (0.8.3)
+    qbash (0.8.4)
       backtrace (> 0)
       elapsed (> 0)
       loog (> 0)
@@ -108,7 +108,7 @@ GEM
     rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-elegant (0.0.20)
+    rubocop-elegant (0.5.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.75)
     rubocop-minitest (0.39.1)

data/lib/pgtk/impatient/too_slow.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../pgtk'
+
+class Pgtk::Impatient; end
+
+# Raised by Pgtk::Impatient#exec when the query takes longer than the
+# configured timeout. The deadline is enforced server-side via
+# +SET LOCAL statement_timeout+, so the underlying +PG::QueryCanceled+
+# is translated into this error for the caller.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Impatient::TooSlow < StandardError; end

data/lib/pgtk/impatient.rb

@@ -58,9 +58,6 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Impatient
-  # If timed out
-  class TooSlow < StandardError; end
-
   # Constructor.
   #
   # @param [Pgtk::Pool] pool The pool to decorate
@@ -118,14 +115,16 @@ class Pgtk::Impatient
         t.exec(sql, *args)
       end
     rescue PG::QueryCanceled
-      raise(TooSlow, [
-        'SQL query',
-        ("with #{args.count} argument#{'s' if args.count > 1}" unless args.empty?),
-        'was terminated after',
-        start.ago,
-        'of waiting:',
-        sql.ellipsized(50).inspect
-      ].compact.join(' '))
+      raise(
+        TooSlow, [
+          'SQL query',
+          ("with #{args.count} argument#{'s' if args.count > 1}" unless args.empty?),
+          'was terminated after',
+          start.ago,
+          'of waiting:',
+          sql.ellipsized(50).inspect
+        ].compact.join(' ')
+      )
     end
   end
 
@@ -146,3 +145,5 @@ class Pgtk::Impatient
     end
   end
 end
+
+require_relative 'impatient/too_slow'

data/lib/pgtk/liquibase_task.rb

@@ -127,14 +127,15 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
     password = yml['pgsql']['password']
     host = yml.dig('pgsql', 'host')
     Dir.chdir(File.dirname(@schema)) do
-      out =
+      File.write(
+        @schema,
         if (local && @docker != :always) || @docker == :never
           pgdump(yml, host, password)
         else
           host = donce_host if OS.mac? && ['localhost', '127.0.0.1'].include?(host)
           dockerdump(yml, host, password)
         end
-      File.write(@schema, out)
+      )
     end
   end
 

data/lib/pgtk/liquicheck_task/must_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../pgtk'
+
+class Pgtk::LiquicheckTask; end
+
+# Internal error raised by Pgtk::LiquicheckTask validation helpers and
+# captured per-file by the +on+ helper to accumulate readable diagnostics.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::LiquicheckTask::MustError < StandardError
+end

data/lib/pgtk/liquicheck_task.rb

@@ -110,8 +110,6 @@ class Pgtk::LiquicheckTask < Rake::TaskLib
   def confirm(prop, regex, msg)
     raise(MustError, msg) unless prop.match?(regex)
   end
-
-  class MustError < StandardError
-  end
-  private_constant :MustError
 end
+
+require_relative 'liquicheck_task/must_error'

data/lib/pgtk/pgsql_task.rb

@@ -51,18 +51,18 @@ class Pgtk::PgsqlTask < Rake::TaskLib
 
   def run
     local = detect(:local)
-    docker = detect(:docker)
-    preflight(local, docker)
+    preflight(local, detect(:docker))
     home = File.expand_path(@dir)
     FileUtils.rm_rf(home) if @fresh
     raise(ArgumentError, "Directory/file #{home} is present, use fresh=true") if File.exist?(home)
-    stdout = @quiet ? nil : $stdout
     port = acquire
-    place = launch(local, home, stdout, port)
-    save(port)
-    return if @quiet
-    puts("PostgreSQL has been started #{place}, port #{port}")
-    puts("YAML config saved to #{@yaml}")
+    launch(local, home, @quiet ? nil : $stdout, port).then do |place|
+      save(port)
+      unless @quiet
+        puts("PostgreSQL has been started #{place}, port #{port}")
+        puts("YAML config saved to #{@yaml}")
+      end
+    end
   end
 
   def preflight(local, docker)
@@ -87,11 +87,9 @@ class Pgtk::PgsqlTask < Rake::TaskLib
 
   def launch(local, home, stdout, port)
     if (local && @docker != :always) || @docker == :never
-      pid = localize(home, stdout, port)
-      "in process ##{pid}"
+      "in process ##{localize(home, stdout, port)}"
     else
-      container = dockerize(home, stdout, port)
-      "in container #{container}"
+      "in container #{dockerize(home, stdout, port)}"
     end
   end
 
@@ -122,21 +120,19 @@ class Pgtk::PgsqlTask < Rake::TaskLib
 
   def dockerize(home, stdout, port)
     FileUtils.mkdir_p(home)
-    out =
-      qbash(
-        'docker',
-        'run',
-        "--publish #{Shellwords.escape("#{port}:5432")}",
-        "-e POSTGRES_USER=#{Shellwords.escape(@user)}",
-        "-e POSTGRES_PASSWORD=#{Shellwords.escape(@password)}",
-        "-e POSTGRES_DB=#{Shellwords.escape(@dbname)}",
-        '--detach',
-        '--rm',
-        'postgres:18.1',
-        @config.map { |k, v| "-c #{Shellwords.escape("#{k}=#{v}")}" },
-        stdout:
-      )
-    container = out.scan(/[a-f0-9]+\Z/).first
+    container = qbash(
+      'docker',
+      'run',
+      "--publish #{Shellwords.escape("#{port}:5432")}",
+      "-e POSTGRES_USER=#{Shellwords.escape(@user)}",
+      "-e POSTGRES_PASSWORD=#{Shellwords.escape(@password)}",
+      "-e POSTGRES_DB=#{Shellwords.escape(@dbname)}",
+      '--detach',
+      '--rm',
+      'postgres:18.1',
+      @config.map { |k, v| "-c #{Shellwords.escape("#{k}=#{v}")}" },
+      stdout:
+    ).scan(/[a-f0-9]+\Z/).first
     File.write(File.join(home, 'docker-container'), container)
     at_exit do
       if qbash(

data/lib/pgtk/pool/busy.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../pgtk'
+
+class Pgtk::Pool; end
+
+# Raised when no connection becomes available from the pool within
+# the configured timeout. Indicates that all connections are currently
+# taken by other threads and none was returned in time.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Pool::Busy < StandardError; end

data/lib/pgtk/pool/iterable_queue.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../pgtk'
+require_relative 'busy'
+
+class Pgtk::Pool; end
+
+# Thread-safe queue implementation that supports iteration.
+# Unlike Ruby's Queue class, this implementation allows safe iteration
+# over all elements while maintaining thread safety for concurrent access.
+#
+# This class is used internally by Pool to store database connections
+# and provide the ability to iterate over them for inspection purposes.
+#
+# The queue is bounded by size. When an item is taken out, it remains in
+# the internal array but is marked as "taken". When returned, it's placed
+# back in its original slot and marked as available.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Pool::IterableQueue
+  def initialize(size, timeout)
+    @size = size
+    @timeout = timeout
+    @items = []
+    @taken = []
+    @free = []
+    @mutex = Mutex.new
+    @condition = ConditionVariable.new
+  end
+
+  def push(item)
+    @mutex.synchronize do
+      if @items.size < @size
+        @items << item
+        @taken << false
+        @free << (@items.size - 1)
+      else
+        index = @items.index(item)
+        if index.nil?
+          index = @taken.index(true)
+          raise(StandardError, 'No taken slot found') if index.nil?
+          @items[index] = item
+        end
+        @taken[index] = false
+        @free << index
+      end
+      @condition.signal
+    end
+  end
+
+  def pop
+    @mutex.synchronize do
+      deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
+      while @free.empty?
+        remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if remaining <= 0
+          raise(Pgtk::Pool::Busy, "No free connection appeared in the pool after #{@timeout}s of waiting")
+        end
+        @condition.wait(@mutex, remaining)
+      end
+      index = @free.shift
+      @taken[index] = true
+      @items[index]
+    end
+  end
+
+  def size
+    @mutex.synchronize do
+      @items.size
+    end
+  end
+
+  def map(&)
+    @mutex.synchronize do
+      @items.map(&)
+    end
+  end
+end

data/lib/pgtk/pool/txn.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'tago'
+require_relative '../../pgtk'
+
+class Pgtk::Pool; end
+
+# A temporary class to execute a single SQL request.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Pool::Txn
+  def initialize(conn, log)
+    @conn = conn
+    @log = log
+  end
+
+  # Exec a single parameterized command.
+  # @param [String] query The SQL query with params inside (possibly)
+  # @param [Array] args List of arguments
+  # @param [Integer] result Should be 0 for text results, 1 for binary
+  # @yield [Hash] Rows
+  def exec(query, args = [], result = 0)
+    start = Time.now
+    sql = query.is_a?(Array) ? query.join(' ') : query
+    @conn.instance_variable_set(:@pgtk_last_query, sql)
+    @conn.instance_variable_set(:@pgtk_started_at, start)
+    begin
+      out =
+        if args.empty?
+          @conn.exec(sql) do |res|
+            if block_given?
+              yield(res)
+            else
+              res.each.to_a
+            end
+          end
+        else
+          @conn.exec_params(sql, args, result) do |res|
+            if block_given?
+              yield(res)
+            else
+              res.each.to_a
+            end
+          end
+        end
+    rescue StandardError => e
+      @log.error("#{sql} -> #{e.message}")
+      raise(e)
+    end
+    if (Time.now - start) < 1
+      @log.debug("#{sql} >> #{start.ago} / #{@conn.object_id}")
+    else
+      @log.info("#{sql} >> #{start.ago}")
+    end
+    out
+  end
+end

data/lib/pgtk/pool.rb

@@ -50,11 +50,6 @@ require_relative 'wire'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Pool
-  # Raised when no connection becomes available from the pool within
-  # the configured timeout. Indicates that all connections are currently
-  # taken by other threads and none was returned in time.
-  class Busy < StandardError; end
-
   # Constructor.
   #
   # The +idle+ option guards against the cold-slot SSL desync that bites
@@ -198,9 +193,7 @@ class Pgtk::Pool
       t = Txn.new(c, @log)
       t.exec('START TRANSACTION')
       begin
-        r = yield(t)
-        t.exec('COMMIT')
-        r
+        yield(t).tap { t.exec('COMMIT') }
       ensure
         if c.transaction_status != PG::Constants::PQTRANS_IDLE
           begin
@@ -213,124 +206,6 @@ class Pgtk::Pool
     end
   end
 
-  # Thread-safe queue implementation that supports iteration.
-  # Unlike Ruby's Queue class, this implementation allows safe iteration
-  # over all elements while maintaining thread safety for concurrent access.
-  #
-  # This class is used internally by Pool to store database connections
-  # and provide the ability to iterate over them for inspection purposes.
-  #
-  # The queue is bounded by size. When an item is taken out, it remains in
-  # the internal array but is marked as "taken". When returned, it's placed
-  # back in its original slot and marked as available.
-  class IterableQueue
-    def initialize(size, timeout)
-      @size = size
-      @timeout = timeout
-      @items = []
-      @taken = []
-      @free = []
-      @mutex = Mutex.new
-      @condition = ConditionVariable.new
-    end
-
-    def push(item)
-      @mutex.synchronize do
-        if @items.size < @size
-          @items << item
-          @taken << false
-          @free << (@items.size - 1)
-        else
-          index = @items.index(item)
-          if index.nil?
-            index = @taken.index(true)
-            raise(StandardError, 'No taken slot found') if index.nil?
-            @items[index] = item
-          end
-          @taken[index] = false
-          @free << index
-        end
-        @condition.signal
-      end
-    end
-
-    def pop
-      @mutex.synchronize do
-        deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
-        while @free.empty?
-          remaining = deadline - Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          raise(Busy, "No free connection appeared in the pool after #{@timeout}s of waiting") if remaining <= 0
-          @condition.wait(@mutex, remaining)
-        end
-        index = @free.shift
-        @taken[index] = true
-        @items[index]
-      end
-    end
-
-    def size
-      @mutex.synchronize do
-        @items.size
-      end
-    end
-
-    def map(&)
-      @mutex.synchronize do
-        @items.map(&)
-      end
-    end
-  end
-
-  # A temporary class to execute a single SQL request.
-  class Txn
-    def initialize(conn, log)
-      @conn = conn
-      @log = log
-    end
-
-    # Exec a single parameterized command.
-    # @param [String] query The SQL query with params inside (possibly)
-    # @param [Array] args List of arguments
-    # @param [Integer] result Should be 0 for text results, 1 for binary
-    # @yield [Hash] Rows
-    def exec(query, args = [], result = 0)
-      start = Time.now
-      sql = query.is_a?(Array) ? query.join(' ') : query
-      @conn.instance_variable_set(:@pgtk_last_query, sql)
-      @conn.instance_variable_set(:@pgtk_started_at, start)
-      begin
-        out =
-          if args.empty?
-            @conn.exec(sql) do |res|
-              if block_given?
-                yield(res)
-              else
-                res.each.to_a
-              end
-            end
-          else
-            @conn.exec_params(sql, args, result) do |res|
-              if block_given?
-                yield(res)
-              else
-                res.each.to_a
-              end
-            end
-          end
-      rescue StandardError => e
-        @log.error("#{sql} -> #{e.message}")
-        raise(e)
-      end
-      lag = Time.now - start
-      if lag < 1
-        @log.debug("#{sql} >> #{start.ago} / #{@conn.object_id}")
-      else
-        @log.info("#{sql} >> #{start.ago}")
-      end
-      out
-    end
-  end
-
   private
 
   def connect
@@ -371,9 +246,9 @@ class Pgtk::Pool
   end
 
   def stale(conn)
-    return nil if @idle.nil?
+    return if @idle.nil?
     last = conn.instance_variable_get(:@pgtk_last_used)
-    return nil if last.nil? || Time.now - last < @idle
+    return if last.nil? || Time.now - last < @idle
     begin
       conn.exec('SELECT 1')
       nil
@@ -383,19 +258,23 @@ class Pgtk::Pool
   end
 
   def info(conn)
-    pipelines = { PG::Constants::PQ_PIPELINE_ON => 'ON', PG::Constants::PQ_PIPELINE_OFF => 'OFF',
-                  PG::Constants::PQ_PIPELINE_ABORTED => 'ABORTED' }
-    statuses = { PG::Constants::CONNECTION_OK => 'OK', PG::Constants::CONNECTION_BAD => 'BAD' }
-    transactions = { PG::Constants::PQTRANS_IDLE => 'IDLE', PG::Constants::PQTRANS_ACTIVE => 'ACTIVE',
-                     PG::Constants::PQTRANS_INTRANS => 'INTRANS', PG::Constants::PQTRANS_INERROR => 'INERROR',
-                     PG::Constants::PQTRANS_UNKNOWN => 'UNKNOWN' }
     conn.instance_variable_set(:@pgtk_pid, conn.backend_pid)
     parts = [
       '    ',
       "##{conn.backend_pid}",
-      pipelines.fetch(conn.pipeline_status, "pipeline_status=#{conn.pipeline_status}"),
-      statuses.fetch(conn.status, "status=#{conn.status}"),
-      transactions.fetch(conn.transaction_status, "transaction_status=#{conn.transaction_status}")
+      {
+        PG::Constants::PQ_PIPELINE_ON => 'ON', PG::Constants::PQ_PIPELINE_OFF => 'OFF',
+        PG::Constants::PQ_PIPELINE_ABORTED => 'ABORTED'
+      }.fetch(conn.pipeline_status, "pipeline_status=#{conn.pipeline_status}"),
+      { PG::Constants::CONNECTION_OK => 'OK', PG::Constants::CONNECTION_BAD => 'BAD' }.fetch(
+        conn.status,
+        "status=#{conn.status}"
+      ),
+      {
+        PG::Constants::PQTRANS_IDLE => 'IDLE', PG::Constants::PQTRANS_ACTIVE => 'ACTIVE',
+        PG::Constants::PQTRANS_INTRANS => 'INTRANS', PG::Constants::PQTRANS_INERROR => 'INERROR',
+        PG::Constants::PQTRANS_UNKNOWN => 'UNKNOWN'
+      }.fetch(conn.transaction_status, "transaction_status=#{conn.transaction_status}")
     ]
     if conn.transaction_status != PG::Constants::PQTRANS_IDLE
       started = conn.instance_variable_get(:@pgtk_started_at)
@@ -434,3 +313,7 @@ class Pgtk::Pool
     @wire.connection
   end
 end
+
+require_relative 'pool/busy'
+require_relative 'pool/iterable_queue'
+require_relative 'pool/txn'

data/lib/pgtk/retry/exhausted.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require_relative '../../pgtk'
+
+class Pgtk::Retry; end
+
+# Raised when all retry attempts have been exhausted. The original
+# exception that caused the last failure is available via #cause,
+# so its message and stack trace are preserved for debugging.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Retry::Exhausted < StandardError; end

data/lib/pgtk/retry.rb

@@ -49,11 +49,6 @@ require_relative 'impatient'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Retry
-  # Raised when all retry attempts have been exhausted. The original
-  # exception that caused the last failure is available via #cause,
-  # so its message and stack trace are preserved for debugging.
-  class Exhausted < StandardError; end
-
   BACKOFFS = [0.05, 0.2, 1.0].freeze
 
   # Constructor.
@@ -122,3 +117,5 @@ class Pgtk::Retry
     @pool.transaction(&)
   end
 end
+
+require_relative 'retry/exhausted'

data/lib/pgtk/spy.rb

@@ -82,10 +82,8 @@ class Pgtk::Spy
   # @param [String] sql The SQL query with params inside (possibly)
   # @return [Array] Result rows
   def exec(sql, *)
-    start = Time.now
-    ret = @pool.exec(sql, *)
-    @block&.call(sql.is_a?(Array) ? sql.join(' ') : sql, Time.now - start)
-    ret
+    @block&.call(sql.is_a?(Array) ? sql.join(' ') : sql, Time.now - Time.now)
+    @pool.exec(sql, *)
   end
 
   # Run a transaction with spying on each SQL query.

data/lib/pgtk/stash.rb

@@ -109,8 +109,7 @@ class Pgtk::Stash
   # @return [String] Multi-line text representation of the current cache state
   def dump
     @entrance.with_read_lock do
-      qq = queries
-      body(qq)
+      body(queries)
     end
   end
 
@@ -227,22 +226,20 @@ class Pgtk::Stash
       affected.each { |t| @stash[:table_inflight][t] = (@stash[:table_inflight][t] || 0) + 1 }
     end
     begin
-      ret = @pool.exec(pure, params, result)
-      now = Time.now
-      @entrance.with_write_lock do
-        affected.each do |t|
-          @stash[:table_inflight][t] -= 1
-          old = @stash[:table_mod][t]
-          stamp = old && old > now ? old : now
-          @stash[:table_mod][t] = stamp
-          @stash[:tables][t]&.each do |q|
-            @stash[:queries][q]&.each_key do |key|
-              @stash[:queries][q][key][:stale] = stamp
+      @pool.exec(pure, params, result).tap do
+        now = Time.now
+        @entrance.with_write_lock do
+          affected.each do |t|
+            @stash[:table_inflight][t] -= 1
+            @stash[:table_mod][t] = (@stash[:table_mod][t] || 0) + 1
+            @stash[:tables][t]&.each do |q|
+              @stash[:queries][q]&.each_key do |key|
+                @stash[:queries][q][key][:stale] = now
+              end
             end
           end
         end
       end
-      ret
     rescue StandardError
       @entrance.with_write_lock do
         affected.each { |t| @stash[:table_inflight][t] -= 1 }
@@ -306,8 +303,6 @@ class Pgtk::Stash
 
   # Discover ON DELETE CASCADE / ON UPDATE CASCADE foreign keys so that a
   # modify on the parent table also invalidates cached queries on children.
-  #
-  # @return [nil]
   def cascade!
     direct = Hash.new { |h, k| h[k] = [] }
     @pool.exec(<<~SQL).each { |r| direct[r['parent']] << r['child'] }
@@ -324,7 +319,6 @@ class Pgtk::Stash
         AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
     SQL
     @cascades = direct.keys.to_h { |p| [p, transitive(p, direct, []).uniq] }
-    nil
   end
 
   def transitive(parent, direct, seen)

data/lib/pgtk/version.rb

@@ -10,5 +10,5 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 module Pgtk
-  VERSION = '0.32.4' unless defined?(VERSION)
+  VERSION = '0.32.5' unless defined?(VERSION)
 end

data/lib/pgtk/wire/direct.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'pg'
+require_relative '../../pgtk'
+
+module Pgtk::Wire; end
+
+# Simple wire with details.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Direct
+  # Constructor.
+  #
+  # @param [String] host Host name of the PostgreSQL server
+  # @param [Integer] port Port number of the PostgreSQL server
+  # @param [String] dbname Database name
+  # @param [String] user Username
+  # @param [String] password Password
+  # @param [Hash] opts Extra options forwarded to +PG.connect+ (e.g. +sslmode+,
+  #   +connect_timeout+, +keepalives+, +keepalives_idle+, +application_name+)
+  def initialize(host:, port:, dbname:, user:, password:, **opts)
+    raise(ArgumentError, "The host can't be nil") if host.nil?
+    @host = host
+    raise(ArgumentError, "The port can't be nil") if port.nil?
+    @port = port
+    @dbname = dbname
+    @user = user
+    @password = password
+    @opts = opts
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    PG.connect(dbname: @dbname, host: @host, port: @port, user: @user, password: @password, **@opts)
+  end
+end

data/lib/pgtk/wire/env.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'cgi'
+require 'uri'
+require_relative '../../pgtk'
+require_relative 'direct'
+
+module Pgtk::Wire; end
+
+# Using ENV variable.
+#
+# The value of the variable should be in this format:
+#
+#   postgres://user:password@host:port/dbname
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Env
+  # Constructor.
+  #
+  # @param [String] var The name of the environment variable with the connection URL
+  # @param [Hash] opts Extra options forwarded to +PG.connect+ (e.g. +sslmode+,
+  #   +connect_timeout+, +keepalives+, +keepalives_idle+, +application_name+).
+  #   Explicit kwargs win over options carried in the URL query string on conflict.
+  def initialize(var = 'DATABASE_URL', **opts)
+    raise(ArgumentError, "The name of the environment variable can't be nil") if var.nil?
+    @value = ENV.fetch(var, nil)
+    raise(ArgumentError, "The environment variable #{@value.inspect} is not set") if @value.nil?
+    @opts = opts
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    uri = URI(@value)
+    Pgtk::Wire::Direct.new(
+      host: CGI.unescape(uri.host),
+      port: uri.port || 5432,
+      dbname: CGI.unescape(uri.path[1..]),
+      user: CGI.unescape(uri.userinfo.split(':')[0]),
+      password: CGI.unescape(uri.userinfo.split(':')[1]),
+      **(uri.query ? URI.decode_www_form(uri.query).to_h.transform_keys(&:to_sym) : {}).merge(@opts)
+    ).connection
+  end
+end

data/lib/pgtk/wire/yaml.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+# SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
+# SPDX-License-Identifier: MIT
+
+require 'yaml'
+require_relative '../../pgtk'
+require_relative 'direct'
+
+module Pgtk::Wire; end
+
+# Using configuration from YAML file.
+#
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
+# License:: MIT
+class Pgtk::Wire::Yaml
+  # Constructor.
+  #
+  # @param [String] file Path to the YAML configuration file
+  # @param [String] node The root node name in the YAML file containing PostgreSQL configuration
+  def initialize(file, node = 'pgsql')
+    raise(ArgumentError, "The name of the file can't be nil") if file.nil?
+    @file = file
+    raise(ArgumentError, "The name of the node in the YAML file can't be nil") if node.nil?
+    @node = node
+  end
+
+  # Create a new connection to PostgreSQL server.
+  def connection
+    raise(ArgumentError, "The file #{@file.inspect} not found") unless File.exist?(@file)
+    cfg = ::YAML.load_file(@file)
+    raise(ArgumentError, "The node '#{@node}' not found in YAML file #{@file.inspect}") unless cfg[@node]
+    Pgtk::Wire::Direct.new(
+      host: cfg[@node]['host'],
+      port: cfg[@node]['port'],
+      dbname: cfg[@node]['dbname'],
+      user: cfg[@node]['user'],
+      password: cfg[@node]['password']
+    ).connection
+  end
+end

data/lib/pgtk/wire.rb

@@ -3,10 +3,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-require 'cgi'
-require 'pg'
-require 'uri'
-require 'yaml'
 require_relative '../pgtk'
 
 # Wires.
@@ -14,103 +10,8 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
 # License:: MIT
 module Pgtk::Wire
-  # Simple wire with details.
-  # Author:: Yegor Bugayenko (yegor256@gmail.com)
-  # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
-  # License:: MIT
-  class Direct
-    # Constructor.
-    #
-    # @param [String] host Host name of the PostgreSQL server
-    # @param [Integer] port Port number of the PostgreSQL server
-    # @param [String] dbname Database name
-    # @param [String] user Username
-    # @param [String] password Password
-    # @param [Hash] opts Extra options forwarded to +PG.connect+ (e.g. +sslmode+,
-    #   +connect_timeout+, +keepalives+, +keepalives_idle+, +application_name+)
-    def initialize(host:, port:, dbname:, user:, password:, **opts)
-      raise(ArgumentError, "The host can't be nil") if host.nil?
-      @host = host
-      raise(ArgumentError, "The port can't be nil") if port.nil?
-      @port = port
-      @dbname = dbname
-      @user = user
-      @password = password
-      @opts = opts
-    end
-
-    # Create a new connection to PostgreSQL server.
-    def connection
-      PG.connect(dbname: @dbname, host: @host, port: @port, user: @user, password: @password, **@opts)
-    end
-  end
-
-  # Using ENV variable.
-  #
-  # The value of the variable should be in this format:
-  #
-  #   postgres://user:password@host:port/dbname
-  #
-  # Author:: Yegor Bugayenko (yegor256@gmail.com)
-  # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
-  # License:: MIT
-  class Env
-    # Constructor.
-    #
-    # @param [String] var The name of the environment variable with the connection URL
-    # @param [Hash] opts Extra options forwarded to +PG.connect+ (e.g. +sslmode+,
-    #   +connect_timeout+, +keepalives+, +keepalives_idle+, +application_name+).
-    #   Explicit kwargs win over options carried in the URL query string on conflict.
-    def initialize(var = 'DATABASE_URL', **opts)
-      raise(ArgumentError, "The name of the environment variable can't be nil") if var.nil?
-      @value = ENV.fetch(var, nil)
-      raise(ArgumentError, "The environment variable #{@value.inspect} is not set") if @value.nil?
-      @opts = opts
-    end
-
-    # Create a new connection to PostgreSQL server.
-    def connection
-      uri = URI(@value)
-      extras = uri.query ? URI.decode_www_form(uri.query).to_h.transform_keys(&:to_sym) : {}
-      Pgtk::Wire::Direct.new(
-        host: CGI.unescape(uri.host),
-        port: uri.port || 5432,
-        dbname: CGI.unescape(uri.path[1..]),
-        user: CGI.unescape(uri.userinfo.split(':')[0]),
-        password: CGI.unescape(uri.userinfo.split(':')[1]),
-        **extras.merge(@opts)
-      ).connection
-    end
-  end
-
-  # Using configuration from YAML file.
-  # Author:: Yegor Bugayenko (yegor256@gmail.com)
-  # Copyright:: Copyright (c) 2019-2026 Yegor Bugayenko
-  # License:: MIT
-  class Yaml
-    # Constructor.
-    #
-    # @param [String] file Path to the YAML configuration file
-    # @param [String] node The root node name in the YAML file containing PostgreSQL configuration
-    def initialize(file, node = 'pgsql')
-      raise(ArgumentError, "The name of the file can't be nil") if file.nil?
-      @file = file
-      raise(ArgumentError, "The name of the node in the YAML file can't be nil") if node.nil?
-      @node = node
-    end
-
-    # Create a new connection to PostgreSQL server.
-    def connection
-      raise(ArgumentError, "The file #{@file.inspect} not found") unless File.exist?(@file)
-      cfg = YAML.load_file(@file)
-      raise(ArgumentError, "The node '#{@node}' not found in YAML file #{@file.inspect}") unless cfg[@node]
-      Pgtk::Wire::Direct.new(
-        host: cfg[@node]['host'],
-        port: cfg[@node]['port'],
-        dbname: cfg[@node]['dbname'],
-        user: cfg[@node]['user'],
-        password: cfg[@node]['password']
-      ).connection
-    end
-  end
 end
+
+require_relative 'wire/direct'
+require_relative 'wire/env'
+require_relative 'wire/yaml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.32.4
+  version: 0.32.5
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -197,15 +197,24 @@ files:
 - cucumber.yml
 - lib/pgtk.rb
 - lib/pgtk/impatient.rb
+- lib/pgtk/impatient/too_slow.rb
 - lib/pgtk/liquibase_task.rb
 - lib/pgtk/liquicheck_task.rb
+- lib/pgtk/liquicheck_task/must_error.rb
 - lib/pgtk/pgsql_task.rb
 - lib/pgtk/pool.rb
+- lib/pgtk/pool/busy.rb
+- lib/pgtk/pool/iterable_queue.rb
+- lib/pgtk/pool/txn.rb
 - lib/pgtk/retry.rb
+- lib/pgtk/retry/exhausted.rb
 - lib/pgtk/spy.rb
 - lib/pgtk/stash.rb
 - lib/pgtk/version.rb
 - lib/pgtk/wire.rb
+- lib/pgtk/wire/direct.rb
+- lib/pgtk/wire/env.rb
+- lib/pgtk/wire/yaml.rb
 - pgtk.gemspec
 - resources/pom.xml
 - test-resources/2019/01-test.xml