pgtk 0.32.0 → 0.32.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2071a0941e2455164373e80f84f9cd536fd7bc82d216ded50b109c01e56e8b04
-  data.tar.gz: 9261c128b18ccb53a941fba5e880021571a40d973e8cd1294d3c9a7bd3ff9cab
+  metadata.gz: 99d205db0612071b4a609acd0cc94bea3c032742cf3bacbe37aa05c8213a88f3
+  data.tar.gz: f9ba543f04eb5639d276472ab2cc8a5ab0c9a714a22f8b042d1b6d63d2b5b51b
 SHA512:
-  metadata.gz: b17ff29e64a14aefdd0df18e6bb7c998d484cedffda0669adf15c6ff068c37591e34ee0769182f91718ab4f9e508bbdf34c577cd094c9c96d172fe338d270cf2
-  data.tar.gz: c93fc458236e81969a54fe57f4988b2f23a2f541a4c0d7fbf7849c51c0b98f67c7c5b659458de2b06da3ca47ccd0b713abc8f2f4102c43ac897456249e4e1693
+  metadata.gz: 3a3e45f7f09b28830164913bc952d6835f3deeab8f6e02f984a9364d694ea3eca82dd6924da8d3378317e46db55997c82834804eb342a140b3646ee73f56ab0d
+  data.tar.gz: f5f76023aee057117b9e03fece17928a76c628e8371d3e94d6cccff0ad5a86695585aae0b7f5350653f7ecfa31aee93c2ba3f68088518e94716bc5183ab4f5db

data/lib/pgtk/stash.rb

@@ -222,7 +222,8 @@ class Pgtk::Stash
     affected = (tables + tables.flat_map { |t| @cascades&.fetch(t, []) || [] }).uniq
     @entrance.with_write_lock do
       affected.each do |t|
-        @stash[:table_mod][t] = now
+        old = @stash[:table_mod][t]
+        @stash[:table_mod][t] = old && old > now ? old : now
         @stash[:tables][t]&.each do |q|
           @stash[:queries][q]&.each_key do |key|
             @stash[:queries][q][key][:stale] = now
@@ -237,18 +238,17 @@ class Pgtk::Stash
     key = params.join(SEPARATOR)
     ret = @stash.dig(:queries, pure, key, :ret)
     if ret.nil? || @stash.dig(:queries, pure, key, :stale)
-      mark = @stash.dig(:queries, pure, key, :stale)
       tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|;|$)/).flatten
       tables.uniq!
       marks = tables.to_h { |t| [t, @stash[:table_mod][t]] }
       ret = @pool.exec(pure, params, result)
-      cache(pure, key, params, result, ret, mark, tables, marks) unless pure.include?(' NOW() ')
+      cache(pure, key, params, result, ret, tables, marks) unless pure.include?(' NOW() ')
     end
     bump(pure, key) if @stash.dig(:queries, pure, key)
     ret
   end
 
-  def cache(pure, key, params, result, ret, mark, tables, marks)
+  def cache(pure, key, params, result, ret, tables, marks)
     raise(ArgumentError, "No tables at #{pure.inspect}") if tables.empty?
     @entrance.with_write_lock do
       tables.each do |t|
@@ -257,10 +257,15 @@ class Pgtk::Stash
       end
       @stash[:queries][pure] ||= {}
       existing = @stash[:queries][pure][key]
-      stale = existing && existing[:stale]
       stillborn = tables.any? { |t| (cur = @stash[:table_mod][t]) && cur != marks[t] }
       entry = { ret:, params:, result:, used: Time.now }
-      entry[:stale] = stale == mark ? Time.now : stale if (stale && stale != mark) || stillborn
+      entry[:stale] =
+        if existing && existing[:stale]
+          existing[:stale]
+        elsif stillborn
+          Time.now
+        end
+      entry.delete(:stale) if entry[:stale].nil?
       @stash[:queries][pure][key] = entry
     end
   end

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

metadata

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