pgtk 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b04cd90c1011ad093997ba7f21cf0136104a7b4fb4de8d842c21794d3cf90ee
-  data.tar.gz: 2c042b596ccebaaffb4f0597d3211ed53c9b02918e0daf400c0f8706135f0854
+  metadata.gz: f86b9a969a2e41e480e4596035128c5ac1f260eeaa4dfb0625a88316d5c34f5d
+  data.tar.gz: d6b9dfe1dd5717f2884ba63d72b87696ddc0331983527dbb530f74a469961af6
 SHA512:
-  metadata.gz: cc9383ef551950dc82b2c825c11cc797965d38a29c2e4f1569b112035ea9ecf019e2437c6c50718fe001ff1bb8da0320da3d6b73fc305ce4ad3ab3d691bcea48
-  data.tar.gz: e72d1e3321a6326d9e8afa66b819e4ceee68d4dd0d5708c27c73df584b5979ea02708070d0c185c333177f430f6925693a3c700aad1658d4dee2e9ad3bdaa63f
+  metadata.gz: 7f7433c8b02fae500929e2e62929469eae1511d958fb85d8d7a6ca56fe9010467bac3759b6f77155ec4e4d86f92b532e8f7c5bf57c83f4c6a7ce99caebc63b9d
+  data.tar.gz: ef3a0849da8ac6678a4957868618b6c6350c86fc255285e49efd6ed3cc8dbc5503765a54abed9387d60a90e0d1c1571dd5f35e4f2daad4e8c9b5ada8e141b1d5

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,6 +52,9 @@ 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
@@ -74,8 +78,19 @@ 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)
+    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.16.3'
 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

@@ -25,6 +25,16 @@ class TestImpatient < Pgtk::Test
     end
   end
 
+  def test_interrupts
+    fake_pool do |pool|
+      assert_raises(Pgtk::Impatient::TooSlow) do
+        Pgtk::Impatient.new(pool, 0.1).exec(
+          'SELECT COUNT(*) FROM generate_series(1, 10000000) AS a'
+        )
+      end
+    end
+  end
+
   def test_doesnt_interrupt
     fake_pool do |pool|
       id = Pgtk::Impatient.new(pool).exec(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 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.