pgtk 0.16.2 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b04cd90c1011ad093997ba7f21cf0136104a7b4fb4de8d842c21794d3cf90ee
-  data.tar.gz: 2c042b596ccebaaffb4f0597d3211ed53c9b02918e0daf400c0f8706135f0854
+  metadata.gz: 8a1ac7d09cdc700a6fa51f239d1f14564f14f9cee56773a933e7e7d310291b1a
+  data.tar.gz: 8bcce91182b85e2a592cd3031048b9687b56c7be0587eda199b1c97df944f630
 SHA512:
-  metadata.gz: cc9383ef551950dc82b2c825c11cc797965d38a29c2e4f1569b112035ea9ecf019e2437c6c50718fe001ff1bb8da0320da3d6b73fc305ce4ad3ab3d691bcea48
-  data.tar.gz: e72d1e3321a6326d9e8afa66b819e4ceee68d4dd0d5708c27c73df584b5979ea02708070d0c185c333177f430f6925693a3c700aad1658d4dee2e9ad3bdaa63f
+  metadata.gz: '018f2c1cc65ca5b64f27609e4934f47163dcd8c4e582508e995dd332992b18f652de8fef63a9f5d86af969ce306796d2e2db0f490072933ab7a38cd91d02cfa0'
+  data.tar.gz: 16c2631220d3cdad2aef2132213a79c922aae79edad0d34b9b7003bd5eec62977cbf9f3febb20a99b17612e77c074e64b7305078903b76e156e27bb90bfbb69c

data/Gemfile.lock

@@ -10,6 +10,7 @@ PATH
       pg (~> 1.1)
       qbash (> 0)
       random-port (> 0)
+      tago (> 0)
 
 GEM
   remote: https://rubygems.org/
@@ -24,7 +25,7 @@ GEM
     elapsed (0.0.1)
       loog (> 0)
       tago (> 0)
-    joined (0.1.0)
+    joined (0.2.0)
     json (2.12.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)

data/lib/pgtk/impatient.rb

@@ -3,6 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2025 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
+require 'tago'
 require 'timeout'
 require_relative '../pgtk'
 
@@ -51,13 +52,18 @@ require_relative '../pgtk'
 # Copyright:: Copyright (c) 2019-2025 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Impatient
+  # If timed out
+  class TooSlow < StandardError; end
+
   # Constructor.
   #
   # @param [Pgtk::Pool] pool The pool to decorate
   # @param [Integer] timeout Timeout in seconds for each SQL query
-  def initialize(pool, timeout = 1)
+  # @param [Array<Regex>] off List of regex to exclude queries from checking
+  def initialize(pool, timeout, *off)
     @pool = pool
     @timeout = timeout
+    @off = off
   end
 
   # Get the version of PostgreSQL server.
@@ -74,8 +80,20 @@ class Pgtk::Impatient
   # @return [Array] Result rows
   # @raise [Timeout::Error] If the query takes too long
   def exec(sql, *args)
-    Timeout.timeout(@timeout) do
-      @pool.exec(sql, *args)
+    return @pool.exec(sql, *args) if @off.any? { |re| re.match?(sql) }
+    start = Time.now
+    begin
+      Timeout.timeout(@timeout) do
+        @pool.exec(sql, *args)
+      end
+    rescue Timeout::Error
+      raise TooSlow, [
+        'SQL query',
+        ("with #{args.count} arguments" unless args.empty?),
+        'stopped after',
+        start.ago,
+        'of waiting'
+      ].compact.join(' ')
     end
   end
 

data/lib/pgtk/pool.rb

@@ -5,6 +5,7 @@
 
 require 'pg'
 require 'loog'
+require 'tago'
 require_relative '../pgtk'
 require_relative 'wire'
 
@@ -203,9 +204,9 @@ class Pgtk::Pool
       end
       lag = Time.now - start
       if lag < 1
-        @log.debug("#{sql}: #{(lag * 1000).round}ms / #{@conn.object_id}")
+        @log.debug("#{sql}: #{start.ago} / #{@conn.object_id}")
       else
-        @log.info("#{sql}: #{format('%.02f', lag)}s")
+        @log.info("#{sql}: #{start.ago}")
       end
       out
     end

data/lib/pgtk/version.rb

@@ -11,5 +11,5 @@ require_relative '../pgtk'
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.16.2'
+  VERSION = '0.17.0'
 end

data/pgtk.gemspec

@@ -34,5 +34,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'pg', '~>1.1'
   s.add_dependency 'qbash', '>0'
   s.add_dependency 'random-port', '>0'
+  s.add_dependency 'tago', '>0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/test_impatient.rb

@@ -20,14 +20,32 @@ require_relative '../lib/pgtk/impatient'
 class TestImpatient < Pgtk::Test
   def test_takes_version
     fake_pool do |pool|
-      v = Pgtk::Impatient.new(pool).version
+      v = Pgtk::Impatient.new(pool, 1).version
       refute_nil(v)
     end
   end
 
+  def test_interrupts
+    fake_pool do |pool|
+      assert_raises(Pgtk::Impatient::TooSlow) do
+        Pgtk::Impatient.new(pool, 0.01).exec(
+          'SELECT COUNT(*) FROM generate_series(1, 1000000) AS a'
+        )
+      end
+    end
+  end
+
+  def test_skips_by_regex
+    fake_pool do |pool|
+      Pgtk::Impatient.new(pool, 0.01, /^SELECT.*$/).exec(
+        'SELECT COUNT(*) FROM generate_series(1, 1000000) AS a'
+      )
+    end
+  end
+
   def test_doesnt_interrupt
     fake_pool do |pool|
-      id = Pgtk::Impatient.new(pool).exec(
+      id = Pgtk::Impatient.new(pool, 1).exec(
         'INSERT INTO book (title) VALUES ($1) RETURNING id',
         ['1984']
       ).first['id'].to_i
@@ -37,7 +55,7 @@ class TestImpatient < Pgtk::Test
 
   def test_doesnt_interrupt_in_transaction
     fake_pool do |pool|
-      Pgtk::Impatient.new(pool).transaction do |t|
+      Pgtk::Impatient.new(pool, 1).transaction do |t|
         id = t.exec(
           'INSERT INTO book (title) VALUES ($1) RETURNING id',
           ['1984']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.17.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -121,6 +121,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This small Ruby gem helps you integrate PostgreSQL with your Ruby web
   app, through Liquibase. It also adds a simple connection pool and query processor,
   to make SQL manipulation simpler.