prick 0.21.0 → 0.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8713e1196f35cc6086d3bb32164b6c79fb5e2d73c4e5d8530b9977bf48c4415
-  data.tar.gz: 8dde0df50e768126b505bd45163546eeca635c715a4a278ce9b1b6f3ed84c721
+  metadata.gz: 45486f141eabdfa21f47abbe77a587a30602edb1bb5b2bb99d1dc1e263f7fe9e
+  data.tar.gz: e6b9f2bf98cc0f316108f56bf608f65b1247cb7e8ca4e1d40b15f0d0de69df01
 SHA512:
-  metadata.gz: a0341de3eb0bf6db60039aab1c4dd215a0e211bc468674281b6f9ab36ba3ddf35615d89a39029dc9cb06688d786797d929d78e6ceab56d3d2d0511b9ab30780f
-  data.tar.gz: 4096b8941033430de62e392620059b6b7d4a9638499f3fe5fb28ab5e59f08a8ef7b47d05b6a1d8ad77d1b02f3e8b66e22cc1d5923cb770cae06bda9c8a380408
+  metadata.gz: 9e809ccc697d019e259d73b0700f0c79555fc6d47699c12f96285bf62c236b03531d52f1fbb48c973b9bcac00cc382ad8d415f96e54790a69cc4e7e9198e13b6
+  data.tar.gz: 6292aec4350d08659e2333c9ed9a0e23876b9c85b74aaebea730ab4628ea10985bb38136d881481cc27935b79bba7ddcf2fbe3026bac0ad5fab8431ba433db80

data/lib/builder/batch.rb

@@ -9,7 +9,7 @@ module Prick
       def kind() @nodes.first&.kind end
       attr_reader :nodes
 
-      def initialize(builder) 
+      def initialize(builder)
         @builder = builder
         @nodes = [] 
       end
@@ -32,6 +32,7 @@ module Prick
         super {
           begin
             sql = []
+            # A SQL batch allows the first node to be an executable
             if nodes.first.is_a?(ExeNode)
               time "Execute script" do
                 sql = [nodes.first.source]

data/lib/builder/node.rb

@@ -37,6 +37,7 @@ module Prick
         @parent, @phase, @kind, @path = parent, phase, kind, path
         @args = args&.empty? ? nil : args
         @schema = nil
+        @source = nil
         @source_lines = nil
       end
 
@@ -138,6 +139,10 @@ module Prick
         begin
           pipe.puts [conn.name, conn.user]
           sql = pipe.wait
+        rescue Command::Error => ex
+          message = "prick: Error executing '#{to_s}'\n" + ex.stderr.map { |l| "   #{l}" }.join("\n")
+          raise Prick::Error.new(message)
+          
         rescue Errno::EPIPE
           raise Prick::Error, "Pipe fail in #{path} called from #{parent.path}\n" + 
                               "Tip: Read username/database from standard input"

data/lib/builder/parser.rb

@@ -95,7 +95,8 @@ module Prick
           entry.size == 1 or raise Error, "sql and module are single-line values"
           key, value = entry.first
           case key
-            when "sql"; InlineNode.new(unit, phase, unit.path, value)
+            when "sql"
+              InlineNode.new(unit, phase, unit.path, value)
             when "call" 
               args = value.split(/\s+/)
               args.size >= 3 or raise "Illegal number of arguments: #{value}"

data/lib/local/command.rb

@@ -171,7 +171,8 @@ module Command
     end
   end
 
-  # Exit status of the last command
+  # Exit status of the last command. FIXME: This is not usable because the
+  # methods raise an exception if the command exited with anything but 0
   def status() @status end
 
   # Stored exception when #command is called with :fail true

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.21.0"
+  VERSION = "0.21.2"
 end

data/lib/subcommand/prick-build.rb

@@ -35,8 +35,10 @@ module Prick::SubCommand
               # database
               refresh_schemas = conn.schema.list
 
-              # Find existing keep-schemas
-              keep_schemas = builder.keep_schemas.select { |s| conn.schema.exist?(s) }
+              # Find existing keep-schemas (but exclude target schema)
+              keep_schemas = builder.keep_schemas.select { |s| 
+                conn.schema.exist?(s) && (schema.nil? || schema != s)
+              }
 
               # Remove keep-schemas from list of schemas
               refresh_schemas -= keep_schemas

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.2
 platform: ruby
 authors:
 - Claus Rasmussen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-20 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -215,7 +215,7 @@ files:
 homepage: http://www.nowhere.com/
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -230,8 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.18
+signing_key:
 specification_version: 4
 summary: A release control and management system for postgresql
 test_files: []