pgtk 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a94cc2db34605f428b7f7828f2a4a1e2cec16cd0ed59903ed5cc2244fb2a07
-  data.tar.gz: 96aae151d530dea967c1d1cff85a3192399d31bcf932305aca789e649cfe1b36
+  metadata.gz: 62a786eefdf5750efb4fc874c1d56cabf81925652323df45cf305f7e7cd6db5f
+  data.tar.gz: 9d03860055718f2793aa0805307679240d4bd7765e9ae3310dae849511327134
 SHA512:
-  metadata.gz: 03dafc5a8296523fbe2a47bf88e0f39f8ced19c39d638e432e21023d646ef988baa805544f37ab2dd82291bc2d0686c0b397b1c660cf0e565578356af25940ea
-  data.tar.gz: 5d19a05b050ce1ba15b38405a05ddd61b29d80bef1f9fadbc3e7e5f371d3d6d0ac98b7a47d84a658208b98133218bcdd8f3f3b348f559dc7665c05058e8ce399
+  metadata.gz: 4bea1c503932c6a77edb73272aaaaa015abc36d82fb6d96d06e9576237f42430f6871d22bdb096feccb0f91eebc01fa41ff5cf64b025bbd8b23ec254914b6fab
+  data.tar.gz: 347c2d8171c8ce34390cad9b66c6753f4f40ff1a6f597cfece1284a690d9063951d6fbf9763307a880296161eeac75c3dcadeb54686711424bd87447747e617e

data/.github/workflows/codecov.yml

@@ -6,10 +6,10 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-ruby@v1
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7
       - run: |
@@ -21,5 +21,6 @@ jobs:
       - run: bundle exec rake
       - uses: codecov/codecov-action@v3
         with:
+          token: ${{ secrets.CODECOV_TOKEN }}
           file: coverage/.resultset.json
           fail_ci_if_error: true

data/.github/workflows/pdd.yml

@@ -1,6 +1,6 @@
 ---
 name: pdd
-"on":
+on:
   push:
     branches:
       - master
@@ -9,7 +9,7 @@ name: pdd
       - master
 jobs:
   pdd:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: g4s8/pdd-action@master
+      - uses: actions/checkout@v4
+      - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -16,7 +16,7 @@ jobs:
         ruby: [2.6]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           sudo apt-get update
           sudo apt-get install -y postgresql-14

data/.github/workflows/xcop.yml

@@ -9,9 +9,9 @@ name: xcop
       - master
 jobs:
   xcop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master
         with:
           files: '**/*.xml'

data/.rultor.yml

@@ -1,10 +1,11 @@
 docker:
-  image: yegor256/rultor-image:1.19.0
+  image: yegor256/rultor-image:1.22.0
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
+  sudo chown -R "$(whoami)" /usr/local/rvm
   pdd -f /dev/null
-  sudo bundle install --no-color "--gemfile=$(pwd)/Gemfile"
+  bundle install --no-color "--gemfile=$(pwd)/Gemfile"
 release:
   script: |-
     [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1

data/.simplecov

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2019-2023 Yegor Bugayenko
+Copyright (c) 2019-2024 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

data/Rakefile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -54,7 +54,7 @@ Rake::RDocTask.new do |rdoc|
 end
 
 require 'rubocop/rake_task'
-desc 'Run RuboCop on all directories'
+desc 'Run Rubocop on all directories'
 RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = true
   task.requires << 'rubocop-rspec'
@@ -69,7 +69,7 @@ Xcop::RakeTask.new :xcop do |task|
 end
 
 task :copyright do
-  sh "grep -q -r '#{Date.today.strftime('%Y')}' \
+  sh "grep -q -r '2019-#{Date.today.strftime('%Y')}' \
     --include '*.rb' \
     --include '*.txt' \
     --include 'Rakefile' \

data/lib/pgtk/liquibase_task.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -29,15 +29,17 @@ require_relative '../pgtk'
 
 # Liquibase rake task.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::LiquibaseTask < Rake::TaskLib
-  attr_accessor :name, :master, :yaml, :quiet
+  attr_accessor :name, :master, :yaml, :quiet, :liquibase_version, :postgresql_version
 
   def initialize(*args, &task_block)
     super()
     @name = args.shift || :liquibase
     @quite = false
+    @liquibase_version = '3.2.2'
+    @postgresql_version = '42.7.0'
     desc 'Deploy Liquibase changes to the running PostgreSQL server' unless ::Rake.application.last_description
     task(name, *args) do |_, task_args|
       RakeFileUtils.send(:verbose, true) do
@@ -69,10 +71,15 @@ class Pgtk::LiquibaseTask < Rake::TaskLib
           'mvn verify',
           '--errors',
           '--batch-mode',
+          '--fail-fast',
           @quiet ? '--quiet' : '',
           '--file',
           Shellwords.escape(pom),
           '--define',
+          "liquibase.version=#{@liquibase_version}",
+          '--define',
+          "postgresql.version=#{@postgresql_version}",
+          '--define',
           "liquibase.changeLogFile=#{@master}",
           '--define',
           "liquibase.url=#{Shellwords.escape(yml['pgsql']['url'])}",

data/lib/pgtk/pgsql_task.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -32,7 +32,7 @@ require_relative '../pgtk'
 
 # Pgsql rake task.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::PgsqlTask < Rake::TaskLib
   attr_accessor :name, :dir, :fresh_start, :user, :password, :dbname, :yaml, :quiet, :port

data/lib/pgtk/pool.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,7 +27,7 @@ require_relative 'wire'
 
 # Pool.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Pool
   # Constructor.
@@ -137,14 +137,19 @@ class Pgtk::Pool
     def exec(query, args = [], result = 0)
       start = Time.now
       sql = query.is_a?(Array) ? query.join(' ') : query
-      out = @conn.exec_params(sql, args, result) do |res|
-        if block_given?
-          yield res
-        else
-          rows = []
-          res.each { |r| rows << r }
-          rows
+      begin
+        out = @conn.exec_params(sql, args, result) do |res|
+          if block_given?
+            yield res
+          else
+            rows = []
+            res.each { |r| rows << r }
+            rows
+          end
         end
+      rescue StandardError => e
+        @log.error("#{sql}: #{e.message}")
+        raise e
       end
       lag = Time.now - start
       if lag < 1

data/lib/pgtk/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -24,9 +24,9 @@ require_relative '../pgtk'
 
 # Pgtk version.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 module Pgtk
   # Current version of the library.
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/pgtk/wire.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -27,14 +27,14 @@ require_relative '../pgtk'
 
 # Wires.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 module Pgtk::Wire
 end
 
 # Simple wire with details.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Wire::Direct
   # Constructor.
@@ -59,7 +59,7 @@ end
 
 # Using ENV variable.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Wire::Env
   # Constructor.
@@ -85,7 +85,7 @@ end
 
 # Using configuration from YAML file.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 class Pgtk::Wire::Yaml
   # Constructor.

data/lib/pgtk.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -22,7 +22,7 @@
 
 # Pgtk main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright:: Copyright (c) 2019-2024 Yegor Bugayenko
 # License:: MIT
 module Pgtk
   # Nothing here.

data/pgtk.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/resources/pom.xml

@@ -2,7 +2,7 @@
 <!--
 (The MIT License)
 
-Copyright (c) 2019-2023 Yegor Bugayenko
+Copyright (c) 2019-2024 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal
@@ -26,13 +26,17 @@ SOFTWARE.
   <modelVersion>4.0.0</modelVersion>
   <groupId>pgtk</groupId>
   <artifactId>pgtk</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>0.0.0</version>
   <packaging>pom</packaging>
+  <properties>
+    <postgresql.version>42.7.1</postgresql.version>
+    <liquibase.version>4.25.1</liquibase.version>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
-      <version>42.6.0</version>
+      <version>${postgresql.version}</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>
@@ -41,7 +45,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.liquibase</groupId>
         <artifactId>liquibase-maven-plugin</artifactId>
-        <version>3.2.2</version>
+        <version>${liquibase.version}</version>
         <configuration>
           <driver>org.postgresql.Driver</driver>
           <logging>info</logging>

data/test/test__helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/test/test_liquibase_task.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -47,6 +47,8 @@ class TestLiquibaseTask < Minitest::Test
         t.master = File.join(__dir__, '../test-resources/master.xml')
         t.yaml = ['file-is-absent', File.join(dir, 'cfg.yml'), 'another']
         t.quiet = true
+        t.postgresql_version = '42.7.0'
+        t.liquibase_version = '3.2.2'
       end
       Rake::Task['liquibase2'].invoke
     end

data/test/test_pgsql_task.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal

data/test/test_pool.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2019-2023 Yegor Bugayenko
+# Copyright (c) 2019-2024 Yegor Bugayenko
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the 'Software'), to deal
@@ -53,6 +53,27 @@ class TestPool < Minitest::Test
     end
   end
 
+  def test_logs_sql
+    log = Loog::Buffer.new
+    bootstrap(log: log) do |pool|
+      pool.exec(
+        'INSERT INTO book (title) VALUES ($1)',
+        ['Object Thinking']
+      )
+      assert(log.to_s.include?('INSERT INTO book (title) VALUES ($1)'))
+    end
+  end
+
+  def test_logs_errors
+    log = Loog::Buffer.new
+    bootstrap(log: log) do |pool|
+      assert_raises PG::UndefinedTable do
+        pool.exec('INSERT INTO tableDoesNotExist (a) VALUES (42)')
+      end
+      assert(log.to_s.include?('INSERT INTO tableDoesNotExist'))
+    end
+  end
+
   def test_transaction
     bootstrap do |pool|
       id = pool.transaction do |t|
@@ -116,7 +137,7 @@ class TestPool < Minitest::Test
 
   private
 
-  def bootstrap
+  def bootstrap(log: Loog::VERBOSE)
     Dir.mktmpdir 'test' do |dir|
       id = rand(100..999)
       Pgtk::PgsqlTask.new("pgsql#{id}") do |t|
@@ -136,7 +157,7 @@ class TestPool < Minitest::Test
       Rake::Task["liquibase#{id}"].invoke
       pool = Pgtk::Pool.new(
         Pgtk::Wire::Yaml.new(File.join(dir, 'cfg.yml')),
-        log: Loog::VERBOSE
+        log: log
       )
       pool.start(1)
       yield pool

data/test-resources/2019/01-test.xml

@@ -2,7 +2,7 @@
 <!--
 (The MIT License)
 
-Copyright (c) 2019-2023 Yegor Bugayenko
+Copyright (c) 2019-2024 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

data/test-resources/master.xml

@@ -2,7 +2,7 @@
 <!--
 (The MIT License)
 
-Copyright (c) 2019-2023 Yegor Bugayenko
+Copyright (c) 2019-2024 Yegor Bugayenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the 'Software'), to deal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgtk
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-02 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: backtrace
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: PostgreSQL ToolKit for Ruby apps