pgtk 0.28.1 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ef00bc464354f5067a8346303914924549a69127dd7d089511b432ceb61cb5
-  data.tar.gz: f0714a56d3d31bdc90f6a8b24bd871b4ac2256dabe32be94191afb92e2034f74
+  metadata.gz: d009986ef367b868cc530dde2ba4984390fd9489fc61e39a0ea280494e57b327
+  data.tar.gz: bae12eef5b8477fd361ffb2167ffadd823f65f488fa15cf7828f216fa496a87e
 SHA512:
-  metadata.gz: 186a1581c002df615bef9ddecf615140ee0cfe4abd328f7ea841b891d09ffbb3f08ae058eb534abcb4c7002fd2b903d082e4b1d5a577b4f9d615a3b8ee8bd35d
-  data.tar.gz: efa556d86eea1b11834d8c19f3620abcc17d3567d3db0d9452d20c4cdd56ad59db13b38ecded753f86ca14f2d36fc95e7e2f67d43386246071ff3d65675bede0
+  metadata.gz: a28a8ba102a0f7b19341ac639c2860ae92048c672781e89ce195768f418fdfaf2fc4e2d56e723a270e1af954a8482a141acad4644290bd1e0677cc6d2829d0b0
+  data.tar.gz: 9a75b7c6631915d6e9e066da596ed630dd73ebb1df0ca343510adc3b7dbc749b70b1be42fa5d96227c8fdd0ca7397a826da4026526cb0ee9b1c7fa0923090141

data/Gemfile.lock

@@ -105,7 +105,7 @@ GEM
     threads (0.5.0)
       backtrace (~> 0)
       concurrent-ruby (~> 1.0)
-    timeout (0.4.4)
+    timeout (0.5.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.1.0)
@@ -114,7 +114,7 @@ GEM
       nokogiri (~> 1.10)
       rainbow (~> 3.0)
       slop (~> 4.4)
-    yard (0.9.37)
+    yard (0.9.38)
 
 PLATFORMS
   arm64-darwin-22

data/lib/pgtk/liquibase_task.rb

@@ -28,6 +28,10 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
   # @return [String, Array<String>]
   attr_accessor :yaml
 
+  # Path to PG entire SQL schema file, which will be dumped and overwritten after all migrations
+  # @return [String]
+  attr_accessor :schema
+
   # Whether to suppress output
   # @return [Boolean]
   attr_accessor :quiet
@@ -120,5 +124,22 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
         ]
       )
     end
+    return unless @schema
+    @schema = File.expand_path(@schema)
+    Dir.chdir(File.dirname(@schema)) do
+      qbash(
+        [
+          'pg_dump',
+          "-h #{Shellwords.escape(yml.dig('pgsql', 'host'))}",
+          "-p #{Shellwords.escape(yml.dig('pgsql', 'port'))}",
+          "-U #{Shellwords.escape(yml.dig('pgsql', 'user'))}",
+          "-d #{Shellwords.escape(yml.dig('pgsql', 'dbname'))}",
+          '-n public',
+          '--schema-only',
+          "-f #{Shellwords.escape(@schema)}"
+        ],
+        env: { 'PGPASSWORD' => Shellwords.escape(password) }
+      )
+    end
   end
 end

data/lib/pgtk/stash.rb

@@ -212,7 +212,7 @@ class Pgtk::Stash
       if ret.nil? || @stash.dig(:queries, pure, key, :stale)
         ret = @pool.exec(pure, params, result)
         unless pure.include?(' NOW() ')
-          tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|$)/).map(&:first).uniq
+          tables = pure.scan(/(?<=^|\s)(?:FROM|JOIN) ([a-z_]+)(?=\s|;|$)/).map(&:first).uniq
           raise "No tables at #{pure.inspect}" if tables.empty?
           @entrance.with_write_lock do
             tables.each do |t|
@@ -303,13 +303,16 @@ class Pgtk::Stash
     return unless @refill_interval
     Concurrent::TimerTask.execute(execution_interval: @refill_interval, executor: @tpool) do
       qq =
-        @stash[:queries]
-        .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
-        .select { _1[2] }
-        .sort_by { -_1[1] }
-        .map { |a| a[0] }
+        @entrance.with_write_lock do
+          @stash[:queries]
+            .map { |k, v| [k, v.values.sum { |vv| vv[:popularity] }, v.values.any? { |vv| vv[:stale] }] }
+        end
+      qq =
+        qq.select { _1[2] }
+          .sort_by { -_1[1] }
+          .map { _1[0] }
       qq.each do |q|
-        @stash[:queries][q].each_key do |k|
+        @entrance.with_write_lock { @stash[:queries][q].keys }.each do |k|
           next unless @stash[:queries][q][k][:stale]
           next if @stash[:queries][q][k][:stale] > Time.now - @refill_delay
           next if @tpool.queue_length >= @max_queue_length

data/lib/pgtk/version.rb

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

metadata

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