pgtk 0.32.1 → 0.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d205db0612071b4a609acd0cc94bea3c032742cf3bacbe37aa05c8213a88f3
-  data.tar.gz: f9ba543f04eb5639d276472ab2cc8a5ab0c9a714a22f8b042d1b6d63d2b5b51b
+  metadata.gz: 88d74c18619134011d6187d976ef4b2156e1d5e629399ce8accf9962458e011f
+  data.tar.gz: 76cfad9774a3c1872ea8204112b441bdf92f5b34fce1845356e7cf37496e21d8
 SHA512:
-  metadata.gz: 3a3e45f7f09b28830164913bc952d6835f3deeab8f6e02f984a9364d694ea3eca82dd6924da8d3378317e46db55997c82834804eb342a140b3646ee73f56ab0d
-  data.tar.gz: f5f76023aee057117b9e03fece17928a76c628e8371d3e94d6cccff0ad5a86695585aae0b7f5350653f7ecfa31aee93c2ba3f68088518e94716bc5183ab4f5db
+  metadata.gz: 1c4d9b98f94558363813c59d0a55a6a60a40ceefa7c25e9e831aa588175b90c8ee65f41e0c9b0bf89c52f0823ceffc80381ad741dad2d12e8a81c368880b36b0
+  data.tar.gz: 16995fbc6540edcd37982b69b0b3222d8bb5d9b4094ba5477500d3250795c672282ecc1611443bb1357f675cf5534d115d0742b13d9c42f30abc0b77c198e7cf

data/Gemfile.lock

@@ -35,7 +35,7 @@ GEM
       tago (~> 0.1)
     ellipsized (0.3.0)
     joined (0.4.0)
-    json (2.19.4)
+    json (2.19.5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -52,21 +52,21 @@ GEM
       minitest (>= 5.0, < 7)
       ruby-progressbar
     minitest-stub-const (0.6)
-    nokogiri (1.19.2-aarch64-linux-gnu)
+    nokogiri (1.19.3-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-aarch64-linux-musl)
+    nokogiri (1.19.3-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-gnu)
+    nokogiri (1.19.3-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm-linux-musl)
+    nokogiri (1.19.3-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.19.2-arm64-darwin)
+    nokogiri (1.19.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-darwin)
+    nokogiri (1.19.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-gnu)
+    nokogiri (1.19.3-x86_64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.19.2-x86_64-linux-musl)
+    nokogiri (1.19.3-x86_64-linux-musl)
       racc (~> 1.4)
     os (1.1.4)
     parallel (2.0.1)
@@ -94,7 +94,7 @@ GEM
       tago (~> 0.0)
     regexp_parser (2.12.0)
     rexml (3.4.4)
-    rubocop (1.86.1)
+    rubocop (1.86.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

data/lib/pgtk/stash.rb

@@ -32,12 +32,16 @@ class Pgtk::Stash
   MODS = %w[INSERT DELETE UPDATE LOCK VACUUM TRANSACTION COMMIT ROLLBACK REINDEX TRUNCATE CREATE ALTER DROP SET].freeze
   MODS_RE = Regexp.new("(^|\\s)(#{MODS.join('|')})(\\s|$)")
 
+  IDENT = '[a-z_][a-z0-9_]*'
+
   ALTS = ['UPDATE', 'INSERT INTO', 'DELETE FROM', 'TRUNCATE', 'ALTER TABLE', 'DROP TABLE'].freeze
-  ALTS_RE = Regexp.new("(?<=^|\\s)(?:#{ALTS.join('|')})\\s([a-z]+)(?=[^a-z]|$)")
+  ALTS_RE = Regexp.new("(?<=^|\\s)(?:#{ALTS.join('|')})\\s(#{IDENT})(?=[^a-z0-9_]|$)")
+
+  READS_RE = Regexp.new("(?<=^|\\s)(?:FROM|JOIN)\\s(#{IDENT})(?=\\s|;|$)")
 
   SEPARATOR = ' --%*@#~($-- '
 
-  private_constant :MODS, :ALTS, :MODS_RE, :ALTS_RE, :SEPARATOR
+  private_constant :MODS, :ALTS, :IDENT, :MODS_RE, :ALTS_RE, :READS_RE, :SEPARATOR
 
   # Initialize a new Stash with query caching.
   #
@@ -223,10 +227,11 @@ class Pgtk::Stash
     @entrance.with_write_lock do
       affected.each do |t|
         old = @stash[:table_mod][t]
-        @stash[:table_mod][t] = old && old > now ? old : now
+        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] = now
+            @stash[:queries][q][key][:stale] = stamp
           end
         end
       end
@@ -238,7 +243,7 @@ class Pgtk::Stash
     key = params.join(SEPARATOR)
     ret = @stash.dig(:queries, pure, key, :ret)
     if ret.nil? || @stash.dig(:queries, pure, key, :stale)
-      tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|;|$)/).flatten
+      tables = pure.scan(READS_RE).flatten
       tables.uniq!
       marks = tables.to_h { |t| [t, @stash[:table_mod][t]] }
       ret = @pool.exec(pure, params, result)

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.1' unless defined?(VERSION)
+  VERSION = '0.32.3' unless defined?(VERSION)
 end

data/resources/pom.xml

@@ -11,7 +11,7 @@
   <packaging>pom</packaging>
   <properties>
     <postgresql.version>42.7.11</postgresql.version>
-    <liquibase.version>5.0.2</liquibase.version>
+    <liquibase.version>5.0.3</liquibase.version>
   </properties>
   <dependencies>
     <dependency>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.32.3
 platform: ruby
 authors:
 - Yegor Bugayenko