pgtk 0.32.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2071a0941e2455164373e80f84f9cd536fd7bc82d216ded50b109c01e56e8b04
-  data.tar.gz: 9261c128b18ccb53a941fba5e880021571a40d973e8cd1294d3c9a7bd3ff9cab
+  metadata.gz: b48e3fb20daadf888fd4bbf448b1cd3463ec8205030cb33f05041cac725050fb
+  data.tar.gz: deba6c857216fc73285e4a68535a6aff8ead236849c470977e6904178497dc27
 SHA512:
-  metadata.gz: b17ff29e64a14aefdd0df18e6bb7c998d484cedffda0669adf15c6ff068c37591e34ee0769182f91718ab4f9e508bbdf34c577cd094c9c96d172fe338d270cf2
-  data.tar.gz: c93fc458236e81969a54fe57f4988b2f23a2f541a4c0d7fbf7849c51c0b98f67c7c5b659458de2b06da3ca47ccd0b713abc8f2f4102c43ac897456249e4e1693
+  metadata.gz: dcf47d0d6145eba4cea340dbdc69bba939c84afad4da5a7aa9af2026cfc36d4b7a0dc29528e1a5cf5ed73ed45afaaaf1b1b64b6c52e36346c7a879cf8f13e77c
+  data.tar.gz: ea608bf12ae7334187830312d04d6954dc7f6071d49b9e6796a4a2b5b6fbbe219a836445ba208873f95d16bb31c7c9d866cf0fb20c1af92fa7ffbbd9d8b128ad

data/lib/pgtk/stash.rb

@@ -222,10 +222,12 @@ 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]
+        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
@@ -237,18 +239,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 +258,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.2' 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.2
 platform: ruby
 authors:
 - Yegor Bugayenko